dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

// add delivery slip

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11693 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
aFolletete
2011-12-22 21:21:41 +00:00
parent 3b22a2d2e6
commit 45cc1929d4
13 changed files with 172 additions and 99 deletions
Download Patch File Download Diff File Expand all files Collapse all files
install-dev/sql/db.sql
+2
View File
@@ -1069,6 +1069,8 @@ CREATE TABLE `PREFIX_order_invoice` (
`id_order_invoice` int(11) NOT NULL AUTO_INCREMENT,
`id_order` int(11) NOT NULL,
`number` int(11) NOT NULL,
`delivery_number` int(11) NOT NULL,
`delivery_date` datetime,
`total_discount_tax_excl` decimal(17,2) NOT NULL DEFAULT '0.00',
`total_discount_tax_incl` decimal(17,2) NOT NULL DEFAULT '0.00',
`total_paid_tax_excl` decimal(17,2) NOT NULL DEFAULT '0.00',
install-dev/sql/upgrade/1.5.0.2.sql
+3 -1
View File
@@ -312,7 +312,6 @@ ADD `total_shipping_price_tax_excl` DECIMAL(20, 6) NOT NULL AFTER `total_shippi
ADD `purchase_supplier_price` DECIMAL(20, 6) NOT NULL AFTER `total_shipping_price_tax_excl`,
ADD `original_product_price` DECIMAL(20, 6) NOT NULL AFTER `purchase_supplier_price`;
ALTER TABLE `PREFIX_orders`
ADD `total_discount_tax_excl` decimal(17,2) NOT NULL AFTER `total_discounts`,
ADD `total_discount_tax_incl` decimal(17,2) NOT NULL AFTER `total_discount_tax_excl`,
@@ -351,6 +350,9 @@ CREATE TABLE IF NOT EXISTS `PREFIX_linksmenutop_lang` (
INDEX ( `id_link` , `id_lang`, `id_shop`)
) ENGINE=ENGINE_TYPE DEFAULT CHARSET=utf8;
ALTER TABLE `PREFIX_order_invoice` ADD `delivery_number` int(0) NOT NULL DEFAULT '0' AFTER `number`;
ALTER TABLE `PREFIX_order_invoice` ADD `delivery_date` datetime AFTER `delivery_number`;
INSERT INTO `PREFIX_order_invoice` (`id_order`, `number`, `total_discount_tax_excl`, `total_discount_tax_incl`, `total_paid_tax_excl`, `total_paid_tax_incl`, `total_products`, `total_products_wt`, `total_shipping_tax_excl`, `total_shipping_tax_incl`, `total_wrapping_tax_excl`, `total_wrapping_tax_incl`, `note`, `date_add`) (
SELECT `id_order`, `invoice_number`, `total_discount_tax_excl`, `total_discount_tax_incl`, `total_paid_tax_excl`, `total_paid_tax_incl`, `total_products`, `total_products_wt`, `total_shipping_tax_excl`, `total_shipping_tax_incl`, `total_wrapping_tax_excl`, `total_wrapping_tax_incl`, '', `invoice_date`
FROM `PREFIX_orders`