TheCoreDev/sterivein
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'tax'

Browse Source
This commit is contained in:
Etienne Roudeix
2013-10-23 08:49:24 +02:00
parent e824907854 fb66f5a021
commit 3c69e38a3b
30 changed files with 3131 additions and 517 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
install/insert.sql
View File

@@ -1197,29 +1197,29 @@ INSERT INTO `order_status_i18n` (`id`, `locale`, `title`, `description`, `chapo`
generated with command : php Thelia thelia:generate-resources --output sql
*/
INSERT INTO resource (`id`, `code`, `created_at`, `updated_at`) VALUES
(NULL, 'admin.address', NOW(), NOW()),
(NULL, 'admin.configuration.admin', NOW(), NOW()),
(NULL, 'admin.configuration.area', NOW(), NOW()),
(NULL, 'admin.configuration.attribute', NOW(), NOW()),
(NULL, 'admin.category', NOW(), NOW()),
(NULL, 'admin.configuration', NOW(), NOW()),
(NULL, 'admin.content', NOW(), NOW()),
(NULL, 'admin.configuration.country', NOW(), NOW()),
(NULL, 'admin.coupon', NOW(), NOW()),
(NULL, 'admin.configuration.currency', NOW(), NOW()),
(NULL, 'admin.customer', NOW(), NOW()),
(NULL, 'admin.configuration.feature', NOW(), NOW()),
(NULL, 'admin.folder', NOW(), NOW()),
(NULL, 'admin.configuration.language', NOW(), NOW()),
(NULL, 'admin.configuration.mailing-system', NOW(), NOW()),
(NULL, 'admin.configuration.message', NOW(), NOW()),
(NULL, 'admin.configuration.module', NOW(), NOW()),
(NULL, 'admin.order', NOW(), NOW()),
(NULL, 'admin.product', NOW(), NOW()),
(NULL, 'admin.configuration.profile', NOW(), NOW()),
(NULL, 'admin.configuration.shipping-zone', NOW(), NOW()),
(NULL, 'admin.configuration.tax', NOW(), NOW()),
(NULL, 'admin.configuration.template', NOW(), NOW());
(1, 'admin.address', NOW(), NOW()),
(2, 'admin.configuration.admin', NOW(), NOW()),
(3, 'admin.configuration.area', NOW(), NOW()),
(4, 'admin.configuration.attribute', NOW(), NOW()),
(5, 'admin.category', NOW(), NOW()),
(6, 'admin.configuration', NOW(), NOW()),
(7, 'admin.content', NOW(), NOW()),
(8, 'admin.configuration.country', NOW(), NOW()),
(9, 'admin.coupon', NOW(), NOW()),
(10, 'admin.configuration.currency', NOW(), NOW()),
(11, 'admin.customer', NOW(), NOW()),
(12, 'admin.configuration.feature', NOW(), NOW()),
(13, 'admin.folder', NOW(), NOW()),
(14, 'admin.configuration.language', NOW(), NOW()),
(15, 'admin.configuration.mailing-system', NOW(), NOW()),
(16, 'admin.configuration.message', NOW(), NOW()),
(17, 'admin.configuration.module', NOW(), NOW()),
(18, 'admin.order', NOW(), NOW()),
(19, 'admin.product', NOW(), NOW()),
(20, 'admin.configuration.profile', NOW(), NOW()),
(21, 'admin.configuration.shipping-zone', NOW(), NOW()),
(22, 'admin.configuration.tax', NOW(), NOW()),
(23, 'admin.configuration.template', NOW(), NOW());
/**
generated with command : php Thelia thelia:generate-resources --output sql-i18n

15
install/thelia.sql
View File

@@ -999,14 +999,13 @@ DROP TABLE IF EXISTS `profile_resource`;
CREATE TABLE `profile_resource`
(
`id` INTEGER NOT NULL AUTO_INCREMENT,
`profile_id` INTEGER NOT NULL,
`resource_id` INTEGER NOT NULL,
`access` INTEGER DEFAULT 0 NOT NULL,
`created_at` DATETIME,
`updated_at` DATETIME,
PRIMARY KEY (`id`,`profile_id`,`resource_id`),
INDEX `id_profile_resource_profile_id` (`profile_id`),
PRIMARY KEY (`profile_id`,`resource_id`),
INDEX `idx_profile_resource_profile_id` (`profile_id`),
INDEX `idx_profile_resource_resource_id` (`resource_id`),
CONSTRAINT `fk_profile_resource_profile_id`
FOREIGN KEY (`profile_id`)
@@ -1028,13 +1027,12 @@ DROP TABLE IF EXISTS `profile_module`;
CREATE TABLE `profile_module`
(
`id` INTEGER NOT NULL AUTO_INCREMENT,
`profile_id` INTEGER NOT NULL,
`module_id` INTEGER,
`access` TINYINT DEFAULT 0,
`module_id` INTEGER NOT NULL,
`access` INTEGER DEFAULT 0 NOT NULL,
`created_at` DATETIME,
`updated_at` DATETIME,
PRIMARY KEY (`id`),
PRIMARY KEY (`profile_id`,`module_id`),
INDEX `idx_profile_module_profile_id` (`profile_id`),
INDEX `idx_profile_module_module_id` (`module_id`),
CONSTRAINT `fk_profile_module_profile_id`
@@ -1593,9 +1591,6 @@ CREATE TABLE `newsletter`
`email` VARCHAR(255) NOT NULL,
`firstname` VARCHAR(255),
`lastname` VARCHAR(255),
`locale` VARCHAR(45),
`created_at` DATETIME,
`updated_at` DATETIME,
PRIMARY KEY (`id`)
) ENGINE=InnoDB;