Added update of Units of Measure and converting of deptor_trans records from release...

Removed default insertion of Units of Measure. Not neccessary.

diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 493c51d8303aba3d82d0e6ca9aa05dbede8513cf..e1033c30e2704fe1ec240c08277b041d0ad2c9ec 100644 (file)
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -19,6 +19,12 @@ Legend:
 ! -> Note
 $ -> Affected files
 
+12-Mar-2008 Joe Hung
+ + Added update of Units of Measure and converting of deptor_trans records from release 1.XX
+ - Removed default insertion of Units of Measure. Not neccessary.
+ $ /sql/alter.sql
+   /admin/db/maintenance_db.inc (added support for update)
+
 11-Mar-2008 Janusz Dobrowolski
  + Table of measure moved into new table item_units
  ! Removed $themes[] from config.php, theme list based on directory structure

diff --git a/admin/db/maintenance_db.inc b/admin/db/maintenance_db.inc
index 7520e359979d20759f852b120f471bdcd4ace52b..8ed6b7dffd57dfe6e3bef9b9da68db4984cd7cb6 100644 (file)
--- a/admin/db/maintenance_db.inc
+++ b/admin/db/maintenance_db.inc
@@ -136,6 +136,12 @@ function db_import($filename, $connection)
                        {
                                $data_queries[] = substr($line, 0, strlen($line) - 1);
 
+                       // this line does not, too
+                       }
+                       elseif (strtolower(substr($line,0,6)) == "update")
+                       {
+                               $data_queries[] = substr($line, 0, strlen($line) - 1);
+
                        // this line does not, too
                        }
                        elseif (strtolower(substr($line, 0, 20)) == "drop table if exists")

diff --git a/sql/alter.sql b/sql/alter.sql
index 0ce763f6e1f745a14d5382cd48a31c058a97a040..9d87fc5737f3cdd1edf0379395bf01760a8c5308 100644 (file)
--- a/sql/alter.sql
+++ b/sql/alter.sql
@@ -16,6 +16,7 @@
 -- ALTER TABLE
 -- 
 
+DROP TABLE IF EXISTS `0_item_units`; 
 CREATE TABLE IF NOT EXISTS `0_item_units` (
   `abbr` varchar(20) NOT NULL, 
   `name` varchar(40) NOT NULL, 
@@ -23,15 +24,9 @@ CREATE TABLE IF NOT EXISTS `0_item_units` (
   PRIMARY KEY (`abbr`),
   UNIQUE KEY `name` (`name`)
 ) TYPE = MyISAM;
-INSERT INTO `0_item_units` VALUES ('each', 'Each', '0');
-INSERT INTO `0_item_units` VALUES ('m', 'Meter', '0');
-INSERT INTO `0_item_units` VALUES ('kg', 'Kilogram', '0');
-INSERT INTO `0_item_units` VALUES ('tons', 'Tons', '0');
-INSERT INTO `0_item_units` VALUES ('l', 'Liter', '0');
-INSERT INTO `0_item_units` VALUES ('lbs', 'Pounds', '0');
-INSERT INTO `0_item_units` VALUES ('dozen', 'Dozen', '0');
-INSERT INTO `0_item_units` VALUES ('pack', 'Pack', '0');
-INSERT INTO `0_item_units` VALUES ('hrs', 'Hours', '0');
+
+INSERT INTO `0_item_units` (`abbr`, `name`, `decimals`) SELECT DISTINCT `units`, CONCAT(UPPER(SUBSTRING(`units`, 1, 1)), LOWER(SUBSTRING(`units`, 2))), 0 FROM `0_stock_master` ;
+UPDATE `0_debtor_trans` SET `ov_amount`=-`ov_amount`, `ov_gst`=-`ov_gst`, `ov_freight`=-`ov_freight`, `ov_discount`=-`ov_discount` WHERE `ov_amount` < 0 AND `type` <> 10 AND `type` <> 13 ;
 
 DROP TABLE IF EXISTS `0_form_items`;