Changeset 438

Timestamp:

10/28/08 14:52:36

Author:

nate

Message:

• Fixed receipts table to allow the storage of the value of the "Other ..." option.
  

Files:

• trunk/phpbms/modules/bms/install/createtables.sql (modified) (1 diff)
• trunk/phpbms/modules/bms/install/tablecolumns.sql (modified) (1 diff)
• trunk/phpbms/modules/bms/install/updatev0.98.sql (modified) (1 diff)

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

@@ -309 +309 @@
-  `readytopost` tinyint(3) unsigned NOT NULL default '0',
-  `posted` tinyint(3) unsigned NOT NULL default '0',
-unsigned 
+
-  `ccnumber` varchar(64) default NULL,
-  `ccexpiration` varchar(10) default NULL,

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

@@ -69 +69 @@
-INSERT INTO `tablecolumns` (`tabledefid`, `name`, `column`, `align`, `footerquery`, `displayorder`, `sortorder`, `wrap`, `size`, `format`, `roleid`) VALUES (304,'RTP','receipts.readytopost','center','',1,'',0,'','boolean',0);
-INSERT INTO `tablecolumns` (`tabledefid`, `name`, `column`, `align`, `footerquery`, `displayorder`, `sortorder`, `wrap`, `size`, `format`, `roleid`) VALUES (304,'amount','receipts.amount','right','sum(receipts.amount)',6,'',0,'','currency',0);
-paymentmethods.name
+IF(receipts.paymentmethodid = '-1',concat( concat("Other... (", receipts.paymentother), ")"), paymentmethods.name)
-INSERT INTO `tablecolumns` (`tabledefid`, `name`, `column`, `align`, `footerquery`, `displayorder`, `sortorder`, `wrap`, `size`, `format`, `roleid`) VALUES (304,'date','receipts.receiptdate','left','',3,'',0,'','date',0);
-INSERT INTO `tablecolumns` (`tabledefid`, `name`, `column`, `align`, `footerquery`, `displayorder`, `sortorder`, `wrap`, `size`, `format`, `roleid`) VALUES (304,'status','receipts.status','left','',2,'',0,'',NULL,0);

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

@@ -47 +47 @@
-UPDATE `tablefindoptions` SET `search`= 'clients.firstname=dclients.firstname AND clients.lastname=dclients.lastname AND addresses.postalcode = daddresses.postalcode AND clients.lastname != \'\' AND clients.firstname != \'\' AND addresses.postalcode != \'\' AND clients.id<>dclients.ID' WHERE `name` = 'match names and postal code' AND `tabledefid` = '18';
-UPDATE `tablefindoptions` SET `search`= 'addresses.address1=daddresses.address1 AND clients.id<>dclients.id' WHERE `name` = 'match addresses' AND `tabledefid` = '18';
+ALTER TABLE `receipts` MODIFY COLUMN `paymentmethodid` INTEGER NOT NULL DEFAULT 0;
+UPDATE `tablecolumns` SET `column`='IF(receipts.paymentmethodid = '-1',concat( concat("Other... (", receipts.paymentother), ")"), paymentmethods.name)' WHERE `tabledefid` = '304' AND `name` = 'payment';