X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;ds=sidebyside;f=sql%2Falter2.5.sql;h=1511ff1123b49565094629456dde9a352aba4aff;hb=8eb8e44cb90ab144f0849d1ecd2153175b619786;hp=c92046e05c9ee3daaf5ce9159121a8342b5aa77e;hpb=3178545262f658085cb8a250a2195246e05c8213;p=fa-stable.git

diff --git a/sql/alter2.5.sql b/sql/alter2.5.sql
index c92046e0..1511ff11 100644
--- a/sql/alter2.5.sql
+++ b/sql/alter2.5.sql
@@ -24,3 +24,38 @@ UPDATE `0_trans_tax_details` tax
  SET tax.tax_group_id = IFNULL(supp.tax_group_id, cust.tax_group_id);
 
 ALTER TABLE `0_tax_groups` ADD COLUMN `tax_area` tinyint(1) NOT NULL DEFAULT '0' AFTER `name`;
+
+# shipment options
+ALTER TABLE `0_stock_master` ADD COLUMN `shipper_id` INT(11) NOT NULL DEFAULT '0' AFTER `vat_category`;
+
+INSERT INTO `0_stock_category` (`description`, `dflt_tax_type`, `dflt_units`, `dflt_mb_flag`, `dflt_sales_act`, `dflt_cogs_act`, `dflt_no_sale`)
+	VALUES (@shipping_cat_description, @shipping_tax_type, @shipping_units, 'T', @shipping_sales_act, @shipping_cogs_act, '1');
+
+SET @shipment_cat=LAST_INSERT_ID();
+
+INSERT INTO `0_stock_master` (`stock_id`, `tax_type_id`, `description`, `units`, `mb_flag`, `sales_account`, `no_sale`, `no_purchase`, `vat_category`, `category_id`, `shipper_id`, `inactive`)
+	SELECT shipper.shipper_name, @shipping_tax_type, shipper.shipper_name, @shipping_units, 'T', @shipping_sales_act, 1, 1, 0, @shipment_cat, shipper.shipper_id, shipper.inactive
+		FROM `0_shippers` shipper;
+
+ALTER TABLE `0_sales_orders` CHANGE COLUMN `ship_via` `ship_via` varchar(20) NOT NULL DEFAULT '';
+
+UPDATE `0_sales_orders` ord
+	LEFT JOIN `0_shippers` ship ON  ord.ship_via=ship.shipper_id
+	LEFT JOIN `0_stock_master` stock ON stock.shipper_id=ship.shipper_id
+	SET ord.ship_via=stock.stock_id;
+
+ALTER TABLE `0_debtor_trans` CHANGE COLUMN `ship_via` `ship_via` varchar(20) NOT NULL DEFAULT '';
+
+UPDATE `0_debtor_trans` trans
+	LEFT JOIN `0_shippers` ship ON  trans.ship_via=ship.shipper_id
+	LEFT JOIN `0_stock_master` stock ON stock.shipper_id=ship.shipper_id
+	SET trans.ship_via=stock.stock_id;
+
+ALTER TABLE `0_cust_branch` CHANGE COLUMN `default_ship_via` `default_ship_via` varchar(20) NOT NULL DEFAULT '';
+
+UPDATE `0_cust_branch` branch
+	LEFT JOIN `0_shippers` ship ON  branch.default_ship_via=ship.shipper_id
+	LEFT JOIN `0_stock_master` stock ON stock.shipper_id=ship.shipper_id
+	SET branch.default_ship_via=stock.stock_id;
+
+ALTER TABLE `0_tax_group_items` DROP COLUMN `tax_shipping`;