Merge branch 'dev' of https://git.verdnatura.es/salix into dev

This commit is contained in:
gerard 2018-08-02 07:47:44 +02:00
commit b6cc14065e
1 changed files with 14 additions and 37 deletions

View File

@ -433,10 +433,10 @@ INSERT INTO `vn`.`itemCategory`(`id`, `name`, `display`, `color`)
INSERT INTO `vn`.`itemType`(`id`, `code`, `name`, `categoryFk`, `life`,`workerFk`) INSERT INTO `vn`.`itemType`(`id`, `code`, `name`, `categoryFk`, `life`,`workerFk`)
VALUES VALUES
(1, 'CRI', 'Crisantemo' , 2, 15, 5), (1, 'CRI', 'Crisantemo' , 2, 31, 5),
(2, 'ITG', 'Anthurium' , 1, 30, 5), (2, 'ITG', 'Anthurium' , 1, 31, 5),
(3, 'WPN', 'Paniculata' , 2, 30, 5), (3, 'WPN', 'Paniculata' , 2, 31, 5),
(4, 'PRT', 'Delivery ports', 2, 30, 5); (4, 'PRT', 'Delivery ports', 2, 31, 5);
INSERT INTO `vn`.`ink`(`id`, `name`, `picture`, `showOrder`) INSERT INTO `vn`.`ink`(`id`, `name`, `picture`, `showOrder`)
VALUES VALUES
@ -614,30 +614,7 @@ INSERT INTO `vn`.`tag`(`id`,`name`,`isFree`,`isQuantitatif`,`sourceTable`,`unit`
(3, 'Shape', 0, 0, null, null), (3, 'Shape', 0, 0, null, null),
(4, 'Location', 1, 0, null, null), (4, 'Location', 1, 0, null, null),
(5, 'Owner', 1, 1, null, null); (5, 'Owner', 1, 1, null, null);
/*
INSERT INTO `vn`.`itemTag`(`id`,`itemFk`,`tagFk`,`value`,`priority`)
VALUES
(1, 1, 1, 'Yellow', 5),
(2, 1, 2, 'Manipulates time', 4),
(3, 1, 3, 'round', 3),
(4, 1, 4, 'Gamoras hideout', 2),
(5, 1, 5, 'Gamora', 1),
(6, 2, 1, 'Red', 5),
(7, 2, 2, 'Manipulates mind', 4),
(8, 2, 3, 'square', 3),
(9, 2, 4, 'unknown location', 2),
(10, 2, 5, 'Thanos', 1),
(11, 3, 1, 'Green', 5),
(12, 3, 2, 'Save the children', 4),
(13, 3, 3, 'human shape', 3),
(14, 3, 4, 'Stark tower', 2),
(15, 3, 5, 'Tony Stark', 1),
(16, 4, 1, 'Blue', 5),
(17, 4, 2, 'Protect the citizen', 4),
(18, 4, 3, 'human shape', 3),
(19, 4, 4, 'Manhattan', 2),
(20, 4, 5, 'Tony Stark', 1);
*/
INSERT INTO `vn`.`itemTag`(`id`,`itemFk`,`tagFk`,`value`,`priority`) INSERT INTO `vn`.`itemTag`(`id`,`itemFk`,`tagFk`,`value`,`priority`)
VALUES VALUES
(1, 1, 1, 'Yellow', 5), (1, 1, 1, 'Yellow', 5),
@ -717,17 +694,17 @@ INSERT INTO `vn`.`ticketWeekly`(`ticketFk`, `weekDay`)
INSERT INTO `vn`.`travel`(`id`,`shipped`, `landed`, `warehouseInFk`, `warehouseOutFk`, `agencyFk`, `m3`, `kg`) INSERT INTO `vn`.`travel`(`id`,`shipped`, `landed`, `warehouseInFk`, `warehouseOutFk`, `agencyFk`, `m3`, `kg`)
VALUES VALUES
( 1, CURDATE(), CURDATE(), 1, 2, 1, 100.00, 1000), ( 1, DATE_ADD(CURDATE(), INTERVAL -30 DAY) , DATE_ADD(CURDATE(), INTERVAL -30 DAY) , 1, 2, 1, 100.00, 1000),
( 2, CURDATE(), CURDATE(), 1, 2, 1, 150, 2000), ( 2, DATE_ADD(CURDATE(), INTERVAL -30 DAY) , DATE_ADD(CURDATE(), INTERVAL -30 DAY) , 1, 2, 1, 150, 2000),
( 3, CURDATE(), CURDATE(), 1, 2, 1, 0.00, 0.00), ( 3, DATE_ADD(CURDATE(), INTERVAL -30 DAY) , DATE_ADD(CURDATE(), INTERVAL -30 DAY) , 1, 2, 1, 0.00, 0.00),
( 4, CURDATE(), CURDATE(), 1, 2, 1, 50.00, 500); ( 4, DATE_ADD(CURDATE(), INTERVAL -30 DAY) , DATE_ADD(CURDATE(), INTERVAL -30 DAY) , 1, 2, 1, 50.00, 500);
INSERT INTO `vn`.`entry`(`id`, `supplierFk`, `created`, `travelFk`, `companyFk`) INSERT INTO `vn`.`entry`(`id`, `supplierFk`, `created`, `travelFk`, `companyFk`)
VALUES VALUES
( 1, 1, CURDATE(), 1, 442), ( 1, 1, DATE_ADD(CURDATE(), INTERVAL -30 DAY) , 1, 442),
( 2, 2, CURDATE(), 2, 442), ( 2, 2, DATE_ADD(CURDATE(), INTERVAL -30 DAY) , 2, 442),
( 3, 1, CURDATE(), 3, 442), ( 3, 1, DATE_ADD(CURDATE(), INTERVAL -30 DAY) , 3, 442),
( 4, 2, CURDATE(), 4, 69); ( 4, 2, DATE_ADD(CURDATE(), INTERVAL -30 DAY) , 4, 69);
INSERT INTO `vn`.`agencyProvince`(`provinceFk`, `agencyFk`, `zone`, `warehouseFk`) INSERT INTO `vn`.`agencyProvince`(`provinceFk`, `agencyFk`, `zone`, `warehouseFk`)
VALUES VALUES
@ -766,7 +743,7 @@ INSERT INTO `bi`.`claims_ratio`(`id_Cliente`, `Consumo`, `Reclamaciones`, `Ratio
INSERT INTO `vn`.`buy`(`id`,`entryFk`,`itemFk`,`buyingValue`,`quantity`,`packageFk`,`stickers`,`freightValue`,`packageValue`,`comissionValue`,`packing`,`grouping`,`groupingMode`,`location`,`price1`,`price2`,`price3`,`minPrice`,`producer`,`printedStickers`,`isChecked`,`isIgnored`) INSERT INTO `vn`.`buy`(`id`,`entryFk`,`itemFk`,`buyingValue`,`quantity`,`packageFk`,`stickers`,`freightValue`,`packageValue`,`comissionValue`,`packing`,`grouping`,`groupingMode`,`location`,`price1`,`price2`,`price3`,`minPrice`,`producer`,`printedStickers`,`isChecked`,`isIgnored`)
VALUES VALUES
(1, 1, 1, 2.5, 10 , 1, 1, 0.350, 0.050, 0.000, 1, 1, 1, NULL, 1.50, 1.25, 1.30, 2.00, NULL, 0, 1, 0), (1, 1, 1, 2.5, 5000 , 1, 1, 0.350, 0.050, 0.000, 1, 1, 1, NULL, 1.50, 1.25, 1.30, 2.00, NULL, 0, 1, 0),
(2, 2, 2, 5 , 450, 1, 1, 0.000, 0.000, 0.000, 1, 1, 1, NULL, 2, 1.00, 1.30, 2.00, NULL, 0, 1, 0), (2, 2, 2, 5 , 450, 1, 1, 0.000, 0.000, 0.000, 1, 1, 1, NULL, 2, 1.00, 1.30, 2.00, NULL, 0, 1, 0),
(3, 3, 3, 10 , 500, 1, 1, 0.000, 0.000, 0.000, 1, 1, 1, NULL, 2.50, 1.00, 2.50, 2.00, NULL, 0, 1, 0), (3, 3, 3, 10 , 500, 1, 1, 0.000, 0.000, 0.000, 1, 1, 1, NULL, 2.50, 1.00, 2.50, 2.00, NULL, 0, 1, 0),
(4, 4, 4, 20 , 100, 1, 1, 0.000, 0.000, 0.000, 1, 1, 1, NULL, 2.50, 1.00, 2.50, 2.00, NULL, 0, 1, 0); (4, 4, 4, 20 , 100, 1, 1, 0.000, 0.000, 0.000, 1, 1, 1, NULL, 2.50, 1.00, 2.50, 2.00, NULL, 0, 1, 0);