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

Merge branch 'dispatch_modules' into development

Browse Source
This commit is contained in:
vAugagneur
2013-02-04 18:20:24 +01:00
parent c2162a274f 0de5c242ca
commit b23aa76d6b
22 changed files with 767 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files
install-dev/data/db_structure.sql
+9
View File
@@ -2433,6 +2433,15 @@ CREATE TABLE `PREFIX_module_preference` (
UNIQUE KEY `employee_module` (`id_employee`, `module`)
) ENGINE=ENGINE_TYPE DEFAULT CHARSET=utf8;
CREATE TABLE `PREFIX_tab_module_preference` (
`id_tab_module_preference` int(11) NOT NULL auto_increment,
`id_employee` int(11) NOT NULL,
`id_tab` int(11) NOT NULL,
`module` varchar(255) NOT NULL,
PRIMARY KEY (`id_tab_module_preference`),
UNIQUE KEY `employee_module` (`id_employee`, `id_tab`, `module`)
) 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,
install-dev/upgrade/sql/1.5.4.0.sql
+8
View File
@@ -10,3 +10,11 @@ UPDATE `PREFIX_customer` c, `PREFIX_orders` o SET c.id_lang = o.id_lang WHERE c.
UPDATE `PREFIX_quick_access` SET `link` = 'index.php?controller=AdminCartRules&addcart_rule' WHERE `link` = 'index.php?tab=AdminDiscounts&adddiscount';
CREATE TABLE `PREFIX_tab_module_preference` (
`id_tab_module_preference` int(11) NOT NULL auto_increment,
`id_employee` int(11) NOT NULL,
`id_tab` int(11) NOT NULL,
`module` varchar(255) NOT NULL,
PRIMARY KEY (`id_tab_module_preference`),
UNIQUE KEY `employee_module` (`id_employee`, `id_tab`, `module`)
) ENGINE=ENGINE_TYPE DEFAULT CHARSET=utf8;