Changeset 701 for trunk/phpbms/modules/bms/include/receipts.php

Timestamp:

01/01/10 14:34:39 (2 years ago)

Author:

nate

Message:

• Removed references to 'deposits' and replaced them with references to 'credits' (in relation to ar items and receipts).
• Made sure that the type field for aritems should be able to take 'credit' but not 'deposit', and the update will change the references from deposit to credit (this time on the database side).
• Fixed bugs with generateuuids.php and with the load open items button on the receipts add-edit.

Files:

• trunk/phpbms/modules/bms/include/receipts.php (modified) (7 diffs)

trunk/phpbms/modules/bms/include/receipts.php

@@ -55 +55 @@
                                         `receiptitems`.`discount`,
                                         `receiptitems`.`taxadjustment`,
-                                        IF(`aritems`.`type` = 'credit', 'deposit', `aritems`.`type`) AS `type`,
+                                        `aritems`.`type`,
                                         `aritems`.`relatedid`,
                                         `aritems`.`itemdate`,
@@ -98 +98 @@
                                         $dueDate = " ";
 
-                                if($therecord["type"] == "deposit" && $therecord["relatedid"] == $receiptid){
+                                if($therecord["type"] == "credit" && $therecord["relatedid"] == $receiptid){
                                         $therecord["relatedid"] = "";
                                         $therecord["amount"] = 0;
@@ -149 +149 @@
                         $this->db->query($deletestatement);
 
-                        //remove any ar deposits created by ths receipt
+                        //remove any ar credits created by ths receipt
                         $deletestatement = "DELETE FROM aritems WHERE relatedid = '".mysql_real_escape_string($receiptid)."' AND `type` = 'credit'";
                         $this->db->query($deletestatement);
@@ -155 +155 @@
                         foreach($itemlist as $itemRecord){
 
-                                //if no ar uuid, or the deposit is from this record, we need to create the ar item
-                                if(!$itemRecord["aritemid"] || ($itemRecord["relatedid"] == $receiptid && $itemRecord["type"] == "deposit") ){
+                                //if no ar uuid, or the credit is from this record, we need to create the ar item
+                                if(!$itemRecord["aritemid"] || ($itemRecord["relatedid"] == $receiptid && $itemRecord["type"] == "credit") ){
 
                                         $arrecord = array();
@@ -638 +638 @@
                                         aritems
                                 WHERE
-                                        `type` = 'deposit'
+                                        `type` = 'credit'
                                         AND (".str_replace("uuid", "relatedid", $newWhere).")";
 
@@ -827 +827 @@
                                                 aritems.status,
                                                 aritems.relatedid,
-                                                IF(`aritems`.`type` = 'credit', 'deposit', `aritems`.`type`) AS `type`
+                                                `aritems`.`type`
                                         FROM
                                                 `receiptitems` INNER JOIN `aritems` ON `receiptitems`.`aritemid` = `aritems`.`uuid`
@@ -838 +838 @@
                                 while($itemrecord = $this->db->fetchArray($itemsresult)){
 
-                                        if($itemrecord["relatedid"] == $therecord["uuid"] && $itemrecord["type"] == "deposit")
+                                        if($itemrecord["relatedid"] == $therecord["uuid"] && $itemrecord["type"] == "credit")
                                                 $paid = $itemrecord["paid"];
                                         else