Changeset 722 for trunk/phpbms/modules

Timestamp:

01/06/10 17:35:36 (2 years ago)

Author:

brieb

Message:

• Fixed recurring invoices not copying line items over correctly
• Fixed default values for orders when it comes to shipping, payment, tax and discount as they now use UUIDs

Location:

trunk/phpbms/modules

Files:

• bms/install/settings.sql (modified) (1 diff)
• bms/install/updatev0.98.sql (modified) (1 diff)
• recurringinvoices/scheduler_recurr.php (modified) (3 diffs)

trunk/phpbms/modules/bms/install/settings.sql

@@ -2 +2 @@
 INSERT INTO `settings` (`name`, `value`) VALUES ('shipping_postalcode','87124');
 INSERT INTO `settings` (`name`, `value`) VALUES ('invoice_default_printinstruc','Thank You For Your Order.');
-INSERT INTO `settings` (`name`, `value`) VALUES ('default_payment','0');
-INSERT INTO `settings` (`name`, `value`) VALUES ('default_shipping','0');
-INSERT INTO `settings` (`name`, `value`) VALUES ('default_discount','0');
-INSERT INTO `settings` (`name`, `value`) VALUES ('default_taxarea','0');
+INSERT INTO `settings` (`name`, `value`) VALUES ('default_payment','');
+INSERT INTO `settings` (`name`, `value`) VALUES ('default_shipping','');
+INSERT INTO `settings` (`name`, `value`) VALUES ('default_discount','');
+INSERT INTO `settings` (`name`, `value`) VALUES ('default_taxarea','');
 INSERT INTO `settings` (`name`, `value`) VALUES ('default_hascredit','0');
 INSERT INTO `settings` (`name`, `value`) VALUES ('default_creditlimit','0');

trunk/phpbms/modules/bms/install/updatev0.98.sql

@@ -848 +848 @@
 INSERT INTO `widgets` (`uuid`, `type`, `title`, `file`, `roleid`, `moduleid`, `default`, `createdby`, `creationdate`, `modifiedby`, `modifieddate`) VALUES ('wdgt:06a30e04-55ad-75da-7bd6-0c4203210ac8', 'little', 'Accounts Receivable Statistics', '../bms/widgets/arstats/class.php', 'role:c9439c3c-499b-7bcc-ee14-fec5bfcf5fc2', 'mod:0aa9cca0-7388-0eae-81b9-9935f9d127cc', '1', 1, NOW(), 1, NOW());
 --end widgets INSERT--
+UPDATE `settings` SET `value` ='' WHERE `name` = 'default_payment' OR `name` = 'default_shipping' OR `name` = 'default_discount' OR `name` = 'default_taxarea';

trunk/phpbms/modules/recurringinvoices/scheduler_recurr.php

@@ -209 +209 @@
 
                 $fieldList = array();
+
                 foreach($therecord as $name=>$value){
                         switch($name){
@@ -293 +294 @@
                 $theid = $this->db->insertId();
 
-                $this->copyLineItems($therecord["uuid"],$theid);
-                $this->insertHistory($theid,$therecord["statusid"],$therecord["statusdate"],$therecord["assignedtoid"]);
+                $this->copyLineItems($therecord["id"], $theid);
+
+                $this->insertHistory($therecord["uuid"], $therecord["statusid"], $therecord["statusdate"], $therecord["assignedtoid"]);
 
                 $this->updateReccurence($therecord["recurrid"],$therecord["firstrepeat"]);
@@ -323 +325 @@
 
                                         case "invoiceid":
-                                                $therecord[$name] = "'".$newInvoiceID."'";
+                                                $therecord[$name] = $newInvoiceID;
                                                 $fieldlist[] = $name;
                                                 break;