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

This commit is contained in:
Carlos Jimenez 2018-04-17 08:18:53 +02:00
commit 8c5207c490
1 changed files with 21 additions and 21 deletions

View File

@ -282,27 +282,27 @@ INSERT INTO `vn`.`invoiceOut`(`id`, `ref`, `serial`, `amount`, `clientFk`, `crea
INSERT INTO `vn`.`ticket`(`id`, `agencyModeFk`,`warehouseFk`,`routeFk`, `shipped`, `clientFk`,`nickname`, `addressFk`, `refFk`) INSERT INTO `vn`.`ticket`(`id`, `agencyModeFk`,`warehouseFk`,`routeFk`, `shipped`, `clientFk`,`nickname`, `addressFk`, `refFk`)
VALUES VALUES
(1, 1, 1, 1, DATE_ADD(CURDATE(), INTERVAL -15 DAY), 101, 'Batman', 101, NULL), (1, 1, 1, 1, DATE_ADD(CURDATE(), INTERVAL -15 DAY), 101, 'Batman', 121, NULL),
(2, 1, 1, 1, DATE_ADD(CURDATE(), INTERVAL -10 DAY), 101, 'Spider-Man', 102, NULL), (2, 1, 1, 1, DATE_ADD(CURDATE(), INTERVAL -10 DAY), 101, 'Spider-Man', 121, NULL),
(3, 2, 2, 2, DATE_ADD(CURDATE(), INTERVAL -5 DAY), 102, 'Super-Man', 103, NULL), (3, 2, 2, 2, DATE_ADD(CURDATE(), INTERVAL -5 DAY), 102, 'Super-Man', 122, NULL),
(4, 2, 2, 2, DATE_ADD(CURDATE(), INTERVAL -4 DAY), 102, 'Iron-Man', 104, NULL), (4, 2, 2, 2, DATE_ADD(CURDATE(), INTERVAL -4 DAY), 102, 'Iron-Man', 122, NULL),
(5, 3, 3, 3, DATE_ADD(CURDATE(), INTERVAL -3 DAY), 103, 'Magneto', 105, NULL), (5, 3, 3, 3, DATE_ADD(CURDATE(), INTERVAL -3 DAY), 103, 'Magneto', 123, NULL),
(6, 3, 3, 4, DATE_ADD(CURDATE(), INTERVAL -2 DAY), 103, 'Legion', 106, NULL), (6, 3, 3, 4, DATE_ADD(CURDATE(), INTERVAL -2 DAY), 103, 'Legion', 123, NULL),
(7, 4, 4, 4, DATE_ADD(CURDATE(), INTERVAL -1 DAY), 104, 'Ant-Man', 107, NULL), (7, 4, 4, 4, DATE_ADD(CURDATE(), INTERVAL -1 DAY), 104, 'Ant-Man', 124, NULL),
(8, 4, 4, 4, DATE_ADD(CURDATE(), INTERVAL -1 MONTH), 104, 'Professor X', 108, NULL), (8, 4, 4, 4, DATE_ADD(CURDATE(), INTERVAL -1 MONTH), 104, 'Professor X', 124, NULL),
(9, 5, 5, 4, DATE_ADD(CURDATE(), INTERVAL -2 MONTH), 105, 'Hulk', 109, NULL), (9, 5, 5, 4, DATE_ADD(CURDATE(), INTERVAL -2 MONTH), 105, 'Hulk', 125, NULL),
(10, 6, 5, 5, DATE_ADD(CURDATE(), INTERVAL -3 MONTH), 105, 'Jessica Jones', 110, NULL), (10, 6, 5, 5, DATE_ADD(CURDATE(), INTERVAL -3 MONTH), 105, 'Jessica Jones', 125, NULL),
(11, 1, 1, 1, DATE_ADD(CURDATE(), INTERVAL +1 DAY), 101, 'Batman', 101, NULL), (11, 1, 1, 1, DATE_ADD(CURDATE(), INTERVAL +1 DAY), 101, 'ticket 1', 121, NULL),
(12, 1, 1, 1, DATE_ADD(CURDATE(), INTERVAL +1 DAY), 101, 'Spider-Man', 102, NULL), (12, 1, 1, 1, DATE_ADD(CURDATE(), INTERVAL +1 DAY), 101, 'ticket 2', 121, NULL),
(13, 2, 2, 2, CURDATE(), 102, 'Super-Man', 103, NULL), (13, 2, 2, 2, CURDATE(), 101, 'ticket 3', 121, NULL),
(14, 2, 2, 2, CURDATE(), 102, 'Iron-Man', 104, NULL), (14, 2, 2, 2, CURDATE(), 101, 'ticket 4', 121, NULL),
(15, 3, 3, 3, CURDATE(), 103, 'Magneto', 105, NULL), (15, 3, 3, 3, CURDATE(), 101, 'ticket 5', 121, NULL),
(16, 3, 3, 4, CURDATE(), 103, 'Legion', 106, NULL), (16, 3, 3, 4, CURDATE(), 101, 'ticket 6', 121, NULL),
(17, 4, 4, 4, CURDATE(), 104, 'Ant-Man', 107, NULL), (17, 4, 4, 4, CURDATE(), 106, 'ticket 7', 126, NULL),
(18, 4, 4, 4, CURDATE(), 104, 'Professor X', 108, NULL), (18, 4, 4, 4, CURDATE(), 107, 'ticket 8', 127, NULL),
(19, 5, 5, 4, CURDATE(), 105, 'Hulk', 109, NULL), (19, 5, 5, 4, CURDATE(), 108, 'ticket 9', 128, NULL),
(20, 5, 5, 4, CURDATE(), 105, 'Hulk', 109, NULL), (20, 5, 5, 4, CURDATE(), 109, 'ticket 10', 119, NULL),
(21, 5, 5, 4, CURDATE(), 105, 'Hulk', 109, NULL); (21, 5, 5, 4, CURDATE(), 110, 'ticket 11', 129, NULL);
INSERT INTO `vn`.`ticketObservation`(`id`, `ticketFk`, `observationTypeFk`, `description`) INSERT INTO `vn`.`ticketObservation`(`id`, `ticketFk`, `observationTypeFk`, `description`)
VALUES VALUES