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

[*] PDF : PDF is now rendered by TCPDF throught HTML template

Browse Source
This commit is contained in:
fBrignoli
2011-11-17 17:15:23 +00:00
parent 73e98a4f56
commit fddc403a09
33 changed files with 1917 additions and 213 deletions
Download Patch File Download Diff File Expand all files Collapse all files
install-dev/sql/db.sql
+14 -3
View File
@@ -1028,7 +1028,9 @@ CREATE TABLE `PREFIX_orders` (
CREATE TABLE IF NOT EXISTS `PREFIX_order_detail_tax` (
`id_order_detail` int(11) NOT NULL,
`id_tax` int(11) NOT NULL
`id_tax` int(11) NOT NULL,
`unit_amount` DECIMAL( 10,6 ) NOT NULL default '0.00',
`total_amount` DECIMAL( 10, 6 ) NOT NULL default '0.00'
) ENGINE=ENGINE_TYPE DEFAULT CHARSET=utf8;
CREATE TABLE `PREFIX_order_detail` (
@@ -1052,15 +1054,23 @@ CREATE TABLE `PREFIX_order_detail` (
`product_reference` varchar(32) default NULL,
`product_supplier_reference` varchar(32) default NULL,
`product_weight` float NOT NULL,
`tax_computation_method` tinyint(1) unsigned NOT NULL default '0',
`tax_name` varchar(16) NOT NULL,
`tax_rate` DECIMAL(10,3) NOT NULL DEFAULT '0.000',
`tax_computation_method` tinyint(1) unsigned NOT NULL default '0',
`ecotax` decimal(21,6) NOT NULL default '0.00',
`ecotax_tax_rate` DECIMAL(5,3) NOT NULL DEFAULT '0.000',
`discount_quantity_applied` TINYINT(1) NOT NULL DEFAULT 0,
`download_hash` varchar(255) default NULL,
`download_nb` int(10) unsigned default '0',
`download_deadline` datetime default '0000-00-00 00:00:00',
`total_price_tax_incl` DECIMAL(20, 6) NOT NULL default '0.000000',
`total_price_tax_excl` DECIMAL(20, 6) NOT NULL default '0.000000',
`unit_price_tax_incl` DECIMAL(20, 6) NOT NULL default '0.000000',
`unit_price_tax_excl` DECIMAL(20, 6) NOT NULL default '0.000000',
`total_shipping_price_tax_incl` DECIMAL(20, 6) NOT NULL default '0.000000',
`total_shipping_price_tax_excl` DECIMAL(20, 6) NOT NULL default '0.000000',
`purchase_supplier_price` DECIMAL(20, 6) NOT NULL default '0.000000',
`original_product_price` DECIMAL(20, 6) NOT NULL default '0.000000',
PRIMARY KEY (`id_order_detail`),
KEY `order_detail_order` (`id_order`),
KEY `product_id` (`product_id`),
@@ -1068,6 +1078,7 @@ CREATE TABLE `PREFIX_order_detail` (
KEY `id_order_id_order_detail` (`id_order`, `id_order_detail`)
) ENGINE=ENGINE_TYPE DEFAULT CHARSET=utf8;
CREATE TABLE `PREFIX_order_cart_rule` (
`id_order_cart_rule` int(10) unsigned NOT NULL auto_increment,
`id_order` int(10) unsigned NOT NULL,
@@ -2011,7 +2022,7 @@ CREATE TABLE `PREFIX_stock` (
`usable_quantity` INT(11) UNSIGNED NOT NULL,
`price_te` DECIMAL(20,6) DEFAULT '0.000000',
PRIMARY KEY (`id_stock`),
KEY `id_warehouse` (`id_warehouse`),
KEY `id_warehouse` (`id_warehouse`),
KEY `id_product` (`id_product`),
KEY `id_product_attribute` (`id_product_attribute`)
) ENGINE=ENGINE_TYPE DEFAULT CHARSET=utf8;
install-dev/sql/upgrade/1.5.0.1.sql
+5 -4
View File
@@ -150,10 +150,6 @@ ALTER TABLE `PREFIX_tax` ADD `deleted` INT NOT NULL AFTER `active`;
/* PHP:update_order_detail_taxes(); */;
ALTER TABLE `PREFIX_order_detail`
DROP `tax_name`,
DROP `tax_rate`;
CREATE TABLE `PREFIX_customer_message_sync_imap` (
`md5_header` varbinary(32) NOT NULL,
KEY `md5_header_index` (`md5_header`(4))
@@ -485,6 +481,11 @@ UPDATE `PREFIX_hook` SET `name` = 'actionAttributeDelete' WHERE `name` = 'afterD
UPDATE `PREFIX_hook` SET `name` = 'actionAttributeSave' WHERE `name` = 'afterSaveAttribute';
UPDATE `PREFIX_hook` SET `name` = 'actionTaxManager' WHERE `name` = 'taxManager';
ALTER TABLE `PREFIX_order_detail_tax`
ADD `unit_amount` DECIMAL( 10, 6 ) NOT NULL AFTER `id_tax` ,
ADD `total_amount` DECIMAL( 10, 6 ) NOT NULL AFTER `unit_amount`;
ALTER TABLE `PREFIX_specific_price` ADD `id_product_attribute` INT UNSIGNED NOT NULL AFTER `id_product`;
ALTER TABLE `PREFIX_specific_price` DROP INDEX `id_product`;
ALTER TABLE `PREFIX_specific_price` ADD INDEX `id_product` (`id_product`, `id_product_attribute`, `id_shop`, `id_currency`, `id_country`, `id_group`, `from_quantity`, `from`, `to`);