From d614dd34f3de72be471240c42735e07844b9f75c Mon Sep 17 00:00:00 2001 From: Bernat Date: Mon, 11 Feb 2019 10:13:58 +0100 Subject: [PATCH] #9809 update model and fixtures --- back/models/company.json | 27 +++++++++++++++------------ services/db/install/dump/fixtures.sql | 12 ++++++------ 2 files changed, 21 insertions(+), 18 deletions(-) diff --git a/back/models/company.json b/back/models/company.json index d3700bad6..86965d829 100644 --- a/back/models/company.json +++ b/back/models/company.json @@ -3,18 +3,21 @@ "description": "Companies", "base": "VnModel", "options": { - "mysql": { - "table": "company" - } + "mysql": { + "table": "company" + } }, "properties": { - "id": { - "id": true, - "type": "Number", - "description": "Identifier" - }, - "code": { - "type": "String" - } + "id": { + "id": true, + "type": "Number", + "description": "Identifier" + }, + "code": { + "type": "String" + }, + "expired": { + "type": "date" + } } - } \ No newline at end of file +} \ No newline at end of file diff --git a/services/db/install/dump/fixtures.sql b/services/db/install/dump/fixtures.sql index 3ac85aa3f..eb3e8af79 100644 --- a/services/db/install/dump/fixtures.sql +++ b/services/db/install/dump/fixtures.sql @@ -328,13 +328,13 @@ INSERT INTO `vn`.`bankEntity`(`id`, `countryFk`, `name`, `bic`) VALUES ( 241, 442, 'ES111122333344111122221111', 128); - INSERT INTO `vn`.`company`(`id`, `code`, `supplierAccountFk`, `workerManagerFk`, `companyCode`, `sage200Company`) + INSERT INTO `vn`.`company`(`id`, `code`, `supplierAccountFk`, `workerManagerFk`, `companyCode`, `sage200Company`, `expired`) VALUES - ( 69 , 'CCs', NULL, 30, NULL, 0), - ( 442 , 'VNL', 241, 30, 2 , 1), - ( 567 , 'VNH', NULL, 30, NULL, 4), - ( 791 , 'FTH', NULL, 30, NULL, 3), - ( 1381, 'ORN', NULL, 30, NULL, 7); + ( 69 , 'CCs', NULL, 30, NULL, 0, NULL), + ( 442 , 'VNL', 241, 30, 2 , 1, NULL), + ( 567 , 'VNH', NULL, 30, NULL, 4, NULL), + ( 791 , 'FTH', NULL, 30, NULL, 3, '2015-11-30'), + ( 1381, 'ORN', NULL, 30, NULL, 7, NULL); INSERT INTO `vn`.`invoiceOut`(`id`,`ref`, `serial`, `amount`, `issued`,`clientFk`, `created`, `companyFk`, `dued`, `booked`, `bankFk`, `pdf`) VALUES