diff lms.mcnet/modules/receiptadd.php lms.devel/modules/receiptadd.php
4c4
<  * LMS version 1.7-cvs   
---
>  * LMS version 1.7-cvs
24c24
<  *  $Id: receiptadd.php,v 1.8 2005/10/22 20:00:51 alec Exp $
---
>  *  $Id: receiptadd.php,v 1.11 2005/10/17 19:48:31 alec Exp $
26,28d25
< function GetItemUnpaidValue($docid, $itemid)
<         {
<   global $CONFIG, $DB;
30,72d26
<           return $DB->GetOne('SELECT SUM( -value ) FROM cash WHERE docid=? AND itemid=?', array($docid, $itemid));
<         }
< 
< 
< function GetCustomerCovenants($id)
< {
< 	global $CONFIG, $DB;
< 
< 	if(!$id) return NULL;
< 	
< #			GROUP BY a.docid, a.itemid
< 
< 
< 	if($covenantlist = $DB->GetAll('SELECT a.docid AS docid, a.itemid AS itemid, MIN(cdate) AS cdate, 
< 			SUM(-1*a.value)
< 			AS value
< 			FROM cash a 
< 			LEFT JOIN documents d ON (a.docid = d.id)
< 			WHERE d.customerid = ? AND (d.type =1 OR d.type =3) 
< 			AND d.closed=0
<                     	AND a.docid > 0 AND a.itemid > 0
< 			GROUP BY a.docid
< 			HAVING SUM(a.value*-1)> 0 
< 			ORDER BY cdate LIMIT 10', array($id)))
< 	{
< 		foreach($covenantlist as $idx => $row)
< 		{
< 			$record = $DB->GetRow('SELECT cash.id AS id, number, taxes.label AS tax, comment, template
< 					    FROM cash 
< 					    LEFT JOIN documents ON (docid = documents.id)
< 					    LEFT JOIN numberplans ON (numberplanid = numberplans.id)
< 					    LEFT JOIN taxes ON (taxid = taxes.id)
< 					    WHERE docid = ? AND itemid = ? ',
< 					    array($row['docid'], $row['itemid']));
< 		
< 			$record['invoice'] = docnumber($record['number'], $record['template'], $row['cdate']);
< 
< 			$covenantlist[$idx] = array_merge($record, $covenantlist[$idx]);
< 		}
< 		return $covenantlist;
< 	}
< }
< 
106,120d59
< 	case 'additemlist':
< 	
< 		if($marks = $_POST['marks'])
< 			foreach($marks as $id)
< 			{
< 				$row = $DB->GetRow('SELECT docid, itemid, comment FROM cash WHERE id = ?', array($id));
< 				$itemdata['value'] = GetItemUnpaidValue($row['docid'], $row['itemid']);
< 				$itemdata['value'] = str_replace(',','.',$itemdata['value']);
< 				$itemdata['description'] = $row['comment'];
< 				$itemdata['reference'] = $id;
< 				$itemdata['docid'] = $row['docid'];;
< 				$itemdata['posuid'] = (string) getmicrotime();
< 				$contents[] = $itemdata;
< 			}
< 	break;
203d141
< 				$DB->Execute('UPDATE documents SET closed = 1 WHERE id = ?', array($item['docid']));
206,207c144,145
< 				$DB->Execute('INSERT INTO cash (time, type, docid, itemid,  value, comment, userid, customerid)
< 					    VALUES(?, 3, ?, ?, ?, ?, ?, ?)', 
---
> 				$DB->Execute('INSERT INTO cash (time, type, docid, itemid, value, comment, userid, customerid)
> 					    VALUES(?, 1, ?, ?, ?, ?, ?, ?)', 
236,250d173
< if($list = GetCustomerCovenants($customer['id']))
< 	if($contents)
< 		foreach($list as $row)
< 		{
< 			$i = 0;
< 			foreach($contents as $item)
< 				if($row['id'] == $item['reference'])
< 					$i = 1;
< 			if(!$i)
< 				$covenantlist[] = $row;
< 		}
< 	else
< 		$covenantlist = $list;
< 
< 
252d174
< $SMARTY->assign('covenantlist', $covenantlist);