X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=sql%2Falter.sql;h=d477bab73cbc26320794fb2c4bac32a5f830eb01;hb=7e6e0807990447d2977b970c3a0fd28dc9250194;hp=0ce763f6e1f745a14d5382cd48a31c058a97a040;hpb=2c0772b38fe1e37dcb0560998c5907eee92d85c8;p=fa-stable.git

diff --git a/sql/alter.sql b/sql/alter.sql
index 0ce763f6..d477bab7 100644
--- 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`; 
 
@@ -40,6 +35,7 @@ ALTER TABLE `0_tax_types` DROP INDEX `name`, ADD UNIQUE `name` ( `name` , `rate`
 ALTER TABLE `0_tax_group_items` DROP `included_in_price`;
 ALTER TABLE `0_debtor_trans` ADD `ov_freight_tax` DOUBLE DEFAULT '0' NOT NULL AFTER `ov_freight` ;
 ALTER TABLE `0_sales_types` ADD `tax_included` INT( 1 ) DEFAULT '0' NOT NULL AFTER `sales_type` ;
+ALTER TABLE `0_sales_types` ADD `factor` DOUBLE DEFAULT '1' NOT NULL AFTER `tax_included` ;
 
 ALTER TABLE `0_bom` CHANGE `workcentre_added` `workcentre_added` INT( 11 ) NOT NULL DEFAULT '0';
 ALTER TABLE `0_wo_requirements` CHANGE `workcentre` `workcentre` INT( 11 ) NOT NULL DEFAULT '0';
@@ -62,7 +58,8 @@ ALTER TABLE `0_sales_order_details` ADD `id` INTEGER(11) NOT NULL AUTO_INCREMENT
 ALTER TABLE `0_company` ADD `no_item_list` TINYINT(1) NOT NULL DEFAULT '0' AFTER `f_year`;
 ALTER TABLE `0_company` ADD `no_customer_list` TINYINT(1) NOT NULL DEFAULT '0' AFTER `no_item_list`;
 ALTER TABLE `0_company` ADD `no_supplier_list` TINYINT(1) NOT NULL DEFAULT '0' AFTER `no_customer_list`;
-  
+ALTER TABLE `0_company` ADD `base_sales` INT( 11 ) DEFAULT '-1' NOT NULL AFTER `no_supplier_list` ;
+
 ALTER TABLE `0_salesman` ADD `provision` DOUBLE NOT NULL DEFAULT '0' AFTER `salesman_email`;
 ALTER TABLE `0_salesman` ADD `break_pt` DOUBLE NOT NULL DEFAULT '0' AFTER `provision`;
 ALTER TABLE `0_salesman` ADD `provision2` DOUBLE NOT NULL DEFAULT '0' AFTER `break_pt`;