diff --git a/db/changes/10160-postValentineDay/00-taxClassCode.sql b/db/changes/10160-postValentineDay/00-taxClassCode.sql deleted file mode 100644 index bdc7cb474..000000000 --- a/db/changes/10160-postValentineDay/00-taxClassCode.sql +++ /dev/null @@ -1,23 +0,0 @@ -ALTER TABLE `vn`.`taxClassCode` -DROP FOREIGN KEY `taxClassCode_ibfk_2`, -DROP FOREIGN KEY `taxClassCode_ibfk_1`; -ALTER TABLE `vn`.`taxClassCode` -ADD COLUMN `id` INT NOT NULL AUTO_INCREMENT FIRST, -DROP PRIMARY KEY, -ADD PRIMARY KEY (`id`), -DROP INDEX `iva_codigo_id` ; - -ALTER TABLE `vn`.`taxClassCode` -ADD UNIQUE INDEX `taxClassCode_unique` (`taxClassFk` ASC, `effectived` ASC, `taxCodeFk` ASC) VISIBLE; - -ALTER TABLE `vn`.`taxClassCode` -ADD CONSTRAINT `taxClassCode_taxClassFk` - FOREIGN KEY (`taxClassFk`) - REFERENCES `vn`.`taxClass` (`id`) - ON DELETE RESTRICT - ON UPDATE CASCADE, -ADD CONSTRAINT `taxClassCode_taxCodeFk` - FOREIGN KEY (`taxCodeFk`) - REFERENCES `vn`.`taxCode` (`id`) - ON DELETE RESTRICT - ON UPDATE CASCADE; diff --git a/db/dump/fixtures.sql b/db/dump/fixtures.sql index 80bb37709..d56176713 100644 --- a/db/dump/fixtures.sql +++ b/db/dump/fixtures.sql @@ -687,11 +687,11 @@ INSERT INTO `vn`.`taxClass`(`id`, `description`, `code`) (1, 'Reduced VAT', 'R'), (2, 'General VAT', 'G'); -INSERT INTO `vn`.`taxClassCode`(`id`, `taxClassFk`, `effectived`, `taxCodeFk`) +INSERT INTO `vn`.`taxClassCode`(`taxClassFk`, `effectived`, `taxCodeFk`) VALUES - (1, 1, CURDATE(), 1), - (2, 1, CURDATE(), 21), - (3, 2, CURDATE(), 2); + (1, CURDATE(), 1), + (1, CURDATE(), 21), + (2, CURDATE(), 2); INSERT INTO `vn`.`intrastat`(`id`, `description`, `taxClassFk`, `taxCodeFk`) VALUES diff --git a/modules/item/back/models/tax-class-code.json b/modules/item/back/models/tax-class-code.json index efe6a13db..ef8c529d9 100644 --- a/modules/item/back/models/tax-class-code.json +++ b/modules/item/back/models/tax-class-code.json @@ -7,21 +7,20 @@ } }, "properties": { - "id": { - "type": "number", - "id": true - }, - "effectived": { - "type": "date", - "required": true - }, "taxClassFk": { "type": "number", - "required": true + "required": true, + "id": 1 }, "taxCodeFk": { "type": "number", - "required": true + "required": true, + "id": 2 + }, + "effectived": { + "type": "date", + "required": true, + "id": 3 } }, "relations": { diff --git a/modules/item/front/basic-data/locale/es.yml b/modules/item/front/basic-data/locale/es.yml index 67780557a..07e681770 100644 --- a/modules/item/front/basic-data/locale/es.yml +++ b/modules/item/front/basic-data/locale/es.yml @@ -5,4 +5,6 @@ Full name calculates based on tags 1-3. Is not recommended to change it manually No se recomienda cambiarlo manualmente Is active: Activo Expense: Gasto -Price in kg: Precio en kg \ No newline at end of file +Price in kg: Precio en kg +New intrastat: Nuevo intrastat +Identifier: Identificador \ No newline at end of file