[+] Core : products and carriers tax rules are associated to shop

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13586 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
rGaillard
2012-02-24 09:26:18 +00:00
parent 6d87094802
commit 2408b4ac5f
20 changed files with 250 additions and 69 deletions
+16 -1
View File
@@ -1335,7 +1335,6 @@ CREATE TABLE `PREFIX_product` (
`id_product` int(10) unsigned NOT NULL auto_increment,
`id_supplier` int(10) unsigned default NULL,
`id_manufacturer` int(10) unsigned default NULL,
`id_tax_rules_group` int(10) unsigned NOT NULL,
`id_category_default` int(10) unsigned default NULL,
`on_sale` tinyint(1) unsigned NOT NULL default '0',
`online_only` tinyint(1) unsigned NOT NULL default '0',
@@ -2402,3 +2401,19 @@ CREATE TABLE `PREFIX_module_preference` (
PRIMARY KEY (`id_module_preference`),
UNIQUE KEY `employee_module` (`id_employee`, `module`)
) ENGINE=ENGINE_TYPE DEFAULT CHARSET=utf8;
CREATE TABLE `PREFIX_product_tax_rules_group_shop` (
`id_product` INT(11) UNSIGNED NOT NULL,
`id_tax_rules_group` INT(11) UNSIGNED NOT NULL,
`id_shop` INT( 11 ) UNSIGNED NOT NULL,
PRIMARY KEY ( `id_product` , `id_tax_rules_group` , `id_shop` )
) ENGINE=ENGINE_TYPE DEFAULT CHARSET=utf8;
CREATE TABLE `PREFIX_carrier_tax_rules_group_shop` (
`id_carrier` int( 11 ) unsigned NOT NULL,
`id_tax_rules_group` int(11) unsigned NOT NULL,
`id_shop` int(11) unsigned NOT NULL,
PRIMARY KEY (`id_carrier`, `id_tax_rules_group`, `id_shop`)
) ENGINE=ENGINE_TYPE DEFAULT CHARSET=utf8;
+12
View File
@@ -0,0 +1,12 @@
<?xml version="1.0"?>
<entity_carrier_tax_rules_group_shop>
<fields primary="id_carrier,id_tax_rules_group,id_shop">
<field name="id_carrier" relation="carrier"/>
<field name="id_tax_rules_group" relation="tax_rules_group"/>
<field name="id_shop" relation="shop"/>
</fields>
<entities>
<carrier_tax_rules_group_shop id="carrier_tax_rules_group_shop_1_1_1" id_carrier="carrier_1" id_tax_rules_group="tax_rules_group_1" id_shop="shop_1"/>
<carrier_tax_rules_group_shop id="carrier_tax_rules_group_shop_2_1_1" id_carrier="carrier_2" id_tax_rules_group="tax_rules_group_1" id_shop="shop_1"/>
</entities>
</entity_carrier_tax_rules_group_shop>
+17
View File
@@ -0,0 +1,17 @@
<?xml version="1.0"?>
<entity_product_tax_rules_group_shop>
<fields primary="id_product,id_tax_rules_group,id_shop">
<field name="id_product" relation="product"/>
<field name="id_tax_rules_group" relation="tax_rules_group"/>
<field name="id_shop" relation="shop"/>
</fields>
<entities>
<product_tax_rules_group_shop id="product_tax_rules_group_shop_1_1_1" id_product="product_1" id_tax_rules_group="tax_rules_group_1" id_shop="shop_1"/>
<product_tax_rules_group_shop id="product_tax_rules_group_shop_2_1_1" id_product="product_2" id_tax_rules_group="tax_rules_group_1" id_shop="shop_1"/>
<product_tax_rules_group_shop id="product_tax_rules_group_shop_3_1_1" id_product="product_3" id_tax_rules_group="tax_rules_group_1" id_shop="shop_1"/>
<product_tax_rules_group_shop id="product_tax_rules_group_shop_4_1_1" id_product="product_4" id_tax_rules_group="tax_rules_group_1" id_shop="shop_1"/>
<product_tax_rules_group_shop id="product_tax_rules_group_shop_5_1_1" id_product="product_5" id_tax_rules_group="tax_rules_group_1" id_shop="shop_1"/>
<product_tax_rules_group_shop id="product_tax_rules_group_shop_6_1_1" id_product="product_6" id_tax_rules_group="tax_rules_group_1" id_shop="shop_1"/>
<product_tax_rules_group_shop id="product_tax_rules_group_shop_7_1_1" id_product="product_7" id_tax_rules_group="tax_rules_group_1" id_shop="shop_1"/>
</entities>
</entity_product_tax_rules_group_shop>