Merge branch 'dev' of http://git.verdnatura.es/salix into dev
This commit is contained in:
commit
ea3988351c
|
@ -249,7 +249,7 @@ INSERT INTO `salix`.`ACL`(`id`, `model`, `property`, `accessType`, `permission`,
|
||||||
(14, 'PayMethod', '*', 'READ', 'ALLOW', 'ROLE', 'employee'),
|
(14, 'PayMethod', '*', 'READ', 'ALLOW', 'ROLE', 'employee'),
|
||||||
(15, 'PayMethod', '*', 'WRITE', 'ALLOW', 'ROLE', 'employee'),
|
(15, 'PayMethod', '*', 'WRITE', 'ALLOW', 'ROLE', 'employee'),
|
||||||
(16, 'FakeProduction', '*', 'READ', 'ALLOW', 'ROLE', 'employee'),
|
(16, 'FakeProduction', '*', 'READ', 'ALLOW', 'ROLE', 'employee'),
|
||||||
(17, 'Warehouse', '* ', 'READ', 'ALLOW', 'ROLE', 'employee'),
|
(17, 'Warehouse', '*', 'READ', 'ALLOW', 'ROLE', 'employee'),
|
||||||
(18, 'State', '*', 'READ', 'ALLOW', 'ROLE', 'employee'),
|
(18, 'State', '*', 'READ', 'ALLOW', 'ROLE', 'employee'),
|
||||||
(19, 'FakeProduction', '*', 'WRITE', 'ALLOW', 'ROLE', 'employee'),
|
(19, 'FakeProduction', '*', 'WRITE', 'ALLOW', 'ROLE', 'employee'),
|
||||||
(20, 'TicketState', '*', 'WRITE', 'ALLOW', 'ROLE', 'employee'),
|
(20, 'TicketState', '*', 'WRITE', 'ALLOW', 'ROLE', 'employee'),
|
||||||
|
@ -258,7 +258,7 @@ INSERT INTO `salix`.`ACL`(`id`, `model`, `property`, `accessType`, `permission`,
|
||||||
(24, 'Delivery', '*', 'READ', 'ALLOW', 'ROLE', 'employee'),
|
(24, 'Delivery', '*', 'READ', 'ALLOW', 'ROLE', 'employee'),
|
||||||
(25, 'Zone', '*', 'READ', 'ALLOW', 'ROLE', 'employee');
|
(25, 'Zone', '*', 'READ', 'ALLOW', 'ROLE', 'employee');
|
||||||
|
|
||||||
INSERT INTO `salix`.`Account`(`id`,`name`,`password`,`roleFk`,`active`,`email`)
|
INSERT INTO `account`.`user`(`id`,`name`,`password`,`role`,`active`,`email`)
|
||||||
VALUES
|
VALUES
|
||||||
(1, 'BruceWayne', 'ac754a330530832ba1bf7687f577da91', 2, 1, 'BruceWayne@verdnatura.es'),
|
(1, 'BruceWayne', 'ac754a330530832ba1bf7687f577da91', 2, 1, 'BruceWayne@verdnatura.es'),
|
||||||
(2, 'PetterParker', 'ac754a330530832ba1bf7687f577da91', 2, 1, 'PetterParker@verdnatura.es'),
|
(2, 'PetterParker', 'ac754a330530832ba1bf7687f577da91', 2, 1, 'PetterParker@verdnatura.es'),
|
||||||
|
@ -281,15 +281,15 @@ INSERT INTO `salix`.`Country`(`id`, `name`, `inCee`, `code`, `currencyFk`, `real
|
||||||
(5, 'Holanda', 1, 'NL', 1, 5),
|
(5, 'Holanda', 1, 'NL', 1, 5),
|
||||||
(30,'Francia', 1, 'FR', 1, 6);
|
(30,'Francia', 1, 'FR', 1, 6);
|
||||||
|
|
||||||
INSERT INTO `salix`.`Warehouse`(`id`, `name`, `tpv`, `inventory`, `isManaged`)
|
INSERT INTO `vn`.`warehouse`(`id`, `name`, `isComparative`, `isInventory`, `isManaged`)
|
||||||
VALUES
|
VALUES
|
||||||
(1, 'Warehouse One', 01, 1, 1),
|
(1, 'Warehouse One', 0, 1, 1),
|
||||||
(2, 'Warehouse Two', 01, 1, 1),
|
(2, 'Warehouse Two', 0, 1, 1),
|
||||||
(3, 'Warehouse Three', 01, 1, 1),
|
(3, 'Warehouse Three', 1, 1, 1),
|
||||||
(4, 'Warehouse Four', 01, 1, 1),
|
(4, 'Warehouse Four', 1, 1, 1),
|
||||||
(5, 'Warehouse Five', 01, 1, 0);
|
(5, 'Warehouse Five', 1, 1, 0);
|
||||||
|
|
||||||
INSERT INTO `salix`.`WarehouseAlias`(`id`, `name`)
|
INSERT INTO `vn`.`warehouseAlias`(`id`, `name`)
|
||||||
VALUES
|
VALUES
|
||||||
(1, 'Main Warehouse');
|
(1, 'Main Warehouse');
|
||||||
|
|
||||||
|
@ -301,7 +301,7 @@ INSERT INTO `vn`.`accountingType`(`id`, `description`)
|
||||||
(4, 'Stolen Money'),
|
(4, 'Stolen Money'),
|
||||||
(5, 'Miscellaneous');
|
(5, 'Miscellaneous');
|
||||||
|
|
||||||
INSERT INTO `salix`.`Bank`(`id`, `bank`, `account`, `cash`, `entityFk`, `isActive`)
|
INSERT INTO `vn`.`bank`(`id`, `bank`, `account`, `cash`, `entityFk`, `isActive`)
|
||||||
VALUES
|
VALUES
|
||||||
(8, 'Pay on receipt', '0000000000', 4, 0, 1);
|
(8, 'Pay on receipt', '0000000000', 4, 0, 1);
|
||||||
|
|
||||||
|
@ -314,14 +314,14 @@ INSERT INTO `salix`.`Agency`(`id`, `name`, `warehouseFk`, `isVolumetric`, `bankF
|
||||||
(5, 'Quantum break device', 1, 0, 8, 1),
|
(5, 'Quantum break device', 1, 0, 8, 1),
|
||||||
(6, 'Walking', 1, 0, 8, 1);
|
(6, 'Walking', 1, 0, 8, 1);
|
||||||
|
|
||||||
UPDATE `salix`.`AgencyMode` SET `id` = 1 WHERE `name` = 'inhouse pickup';
|
UPDATE `vn`.`agencyMode` SET `id` = 1 WHERE `name` = 'inhouse pickup';
|
||||||
UPDATE `salix`.`AgencyMode` SET `id` = 2 WHERE `name` = 'Super-Man delivery';
|
UPDATE `vn`.`agencyMode` SET `id` = 2 WHERE `name` = 'Super-Man delivery';
|
||||||
UPDATE `salix`.`AgencyMode` SET `id` = 3 WHERE `name` = 'Teleportation device';
|
UPDATE `vn`.`agencyMode` SET `id` = 3 WHERE `name` = 'Teleportation device';
|
||||||
UPDATE `salix`.`AgencyMode` SET `id` = 4 WHERE `name` = 'Entanglement';
|
UPDATE `vn`.`agencyMode` SET `id` = 4 WHERE `name` = 'Entanglement';
|
||||||
UPDATE `salix`.`AgencyMode` SET `id` = 5 WHERE `name` = 'Quantum break device';
|
UPDATE `vn`.`agencyMode` SET `id` = 5 WHERE `name` = 'Quantum break device';
|
||||||
UPDATE `salix`.`AgencyMode` SET `id` = 6 WHERE `name` = 'Walking';
|
UPDATE `vn`.`agencyMode` SET `id` = 6 WHERE `name` = 'Walking';
|
||||||
|
|
||||||
INSERT INTO `salix`.`PayMethod`(`id`, `name`, `graceDays`, `outstandingDebt`, `ibanRequired`)
|
INSERT INTO `vn`.`payMethod`(`id`, `name`, `graceDays`, `outstandingDebt`, `ibanRequired`)
|
||||||
VALUES
|
VALUES
|
||||||
(1, 'PayMethod one', 0, 001, 0),
|
(1, 'PayMethod one', 0, 001, 0),
|
||||||
(2, 'PayMethod two', 10, 001, 0),
|
(2, 'PayMethod two', 10, 001, 0),
|
||||||
|
@ -335,7 +335,7 @@ INSERT INTO `salix`.`Zone`(`id`, `name`, `printingOrder`)
|
||||||
(2, 'zone two', 2),
|
(2, 'zone two', 2),
|
||||||
(3, 'zone three', 3);
|
(3, 'zone three', 3);
|
||||||
|
|
||||||
INSERT INTO `salix`.`Province`(`id`, `name`, `countryFk`, `warehouseFk`, `zoneFk`)
|
INSERT INTO `vn`.`province`(`id`, `name`, `countryFk`, `warehouseFk`, `zoneFk`)
|
||||||
VALUES
|
VALUES
|
||||||
(1, 'Province one', 1, NULL, 1),
|
(1, 'Province one', 1, NULL, 1),
|
||||||
(2, 'Province two', 1, NULL, 2),
|
(2, 'Province two', 1, NULL, 2),
|
||||||
|
@ -343,14 +343,14 @@ INSERT INTO `salix`.`Province`(`id`, `name`, `countryFk`, `warehouseFk`, `zoneFk
|
||||||
(4, 'Province four', 1, NULL, 2),
|
(4, 'Province four', 1, NULL, 2),
|
||||||
(5, 'Province five', 1, NULL, 1);
|
(5, 'Province five', 1, NULL, 1);
|
||||||
|
|
||||||
INSERT INTO `salix`.`ClientType`(`id`, `code`, `type`)
|
INSERT INTO `vn`.`clientType`(`id`, `code`, `type`)
|
||||||
VALUES
|
VALUES
|
||||||
(1, 'normal', 'Normal'),
|
(1, 'normal', 'Normal'),
|
||||||
(2, 'internalUse', 'Autoconsumo'),
|
(2, 'internalUse', 'Autoconsumo'),
|
||||||
(3, 'handMaking', 'Confección'),
|
(3, 'handMaking', 'Confección'),
|
||||||
(4, 'loses', 'Mermas');
|
(4, 'loses', 'Mermas');
|
||||||
|
|
||||||
INSERT INTO `salix`.`City`(`id`, `name`, `provinceFk`)
|
INSERT INTO `vn`.`city`(`id`, `name`, `provinceFk`)
|
||||||
VALUES
|
VALUES
|
||||||
(1, 'Gotham', 1);
|
(1, 'Gotham', 1);
|
||||||
|
|
||||||
|
@ -359,7 +359,7 @@ INSERT INTO `vn`.`cplusTerIdNif`(`id`, `description`)
|
||||||
VALUES
|
VALUES
|
||||||
(1, 'NIF');
|
(1, 'NIF');
|
||||||
|
|
||||||
INSERT INTO `vn2008`.`Trabajadores`(`CodigoTrabajador`, `Id_Trabajador`, `Nombre`, `Apellidos`, `user_id`)
|
INSERT INTO `vn`.`worker`(`workerCode`, `id`, `firstName`, `name`, `userFk`)
|
||||||
VALUES
|
VALUES
|
||||||
('LGN', 1, 'David Charles', 'Haller', 6),
|
('LGN', 1, 'David Charles', 'Haller', 6),
|
||||||
('ANT', 2, 'Hank', 'Pym', 7),
|
('ANT', 2, 'Hank', 'Pym', 7),
|
||||||
|
@ -368,7 +368,7 @@ INSERT INTO `vn2008`.`Trabajadores`(`CodigoTrabajador`, `Id_Trabajador`, `Nombre
|
||||||
('JJJ', 5, 'Jessica', 'Jones', 10),
|
('JJJ', 5, 'Jessica', 'Jones', 10),
|
||||||
('VSC', 20, 'Victor', 'Stone', 11);
|
('VSC', 20, 'Victor', 'Stone', 11);
|
||||||
|
|
||||||
INSERT INTO `salix`.`ContactChannel`(`id`, `name`)
|
INSERT INTO `vn`.`contactChannel`(`id`, `name`)
|
||||||
VALUES
|
VALUES
|
||||||
(1, 'Rumors on the streets'),
|
(1, 'Rumors on the streets'),
|
||||||
(2, 'Metropolis newspaper'),
|
(2, 'Metropolis newspaper'),
|
||||||
|
@ -428,7 +428,7 @@ INSERT INTO `salix`.`ClientObservation`(`id`, `clientFk`, `employeeFk`, `text`,
|
||||||
(7, 7, 4, 'I think our first move should be calling the Avengers..', CURDATE()),
|
(7, 7, 4, 'I think our first move should be calling the Avengers..', CURDATE()),
|
||||||
(8, 8, 4, 'Just because someone stumbles and loses their path, does not mean they are lost forever.', CURDATE()),
|
(8, 8, 4, 'Just because someone stumbles and loses their path, does not mean they are lost forever.', CURDATE()),
|
||||||
(9, 9, 5, 'HULK SMASH! ...', CURDATE()),
|
(9, 9, 5, 'HULK SMASH! ...', CURDATE()),
|
||||||
(10, 10, 5, 'They say everyone is born a hero. But if you let it, life will push you over the line until you are the villain. Problem is, you dont always know that you have crossed that line.', CURDATE());
|
(10, 10, 5, 'They say everyone is born a hero. But if you let it, life will push you over the line until you are the villain.', CURDATE());
|
||||||
|
|
||||||
INSERT INTO `vn`.`creditClassification`(`id`, `client`, `dateStart`, `dateEnd`)
|
INSERT INTO `vn`.`creditClassification`(`id`, `client`, `dateStart`, `dateEnd`)
|
||||||
VALUES
|
VALUES
|
||||||
|
@ -460,7 +460,7 @@ INSERT INTO `vn2008`.`empresa_grupo`(`empresa_grupo_id`, `grupo`)
|
||||||
|
|
||||||
INSERT INTO `vn2008`.`empresa`(`id`, `abbreviation`, `registro`, `gerente_id`, `alta`, `baja`, `logo`, `oficial`, `cyc`, `rgb`, `mail`, `cuno`, `ODBC_DATE`, `Id_Cliente`, `digito_factura`, `Id_Proveedores_account`, `morosidad`, `empresa_grupo`)
|
INSERT INTO `vn2008`.`empresa`(`id`, `abbreviation`, `registro`, `gerente_id`, `alta`, `baja`, `logo`, `oficial`, `cyc`, `rgb`, `mail`, `cuno`, `ODBC_DATE`, `Id_Cliente`, `digito_factura`, `Id_Proveedores_account`, `morosidad`, `empresa_grupo`)
|
||||||
VALUES
|
VALUES
|
||||||
(442, 'WAY', 'Wayne Industries, Inc. operates as a warehouse for steel products. Wayne Industries, Inc. was founded in 1989 and is based in Wayne, Michigan.', '2', '1989-11-19', NULL, NULL, '1', '1', '00FF00', 'BruceWayne@verdnatura.es', NULL, '1989-08-11 12:31:22', '10', '1', NULL, '1', '1');
|
(442, 'WAY', 'Wayne Industries, Inc. operates as a warehouse for steel products.', '2', '1989-11-19', NULL, NULL, '1', '1', '00FF00', 'BruceWayne@verdnatura.es', NULL, '1989-08-11 12:31:22', '10', '1', NULL, '1', '1');
|
||||||
|
|
||||||
|
|
||||||
INSERT INTO `vn`.`ticket`(`id`, `agencyModeFk`,`warehouseFk`,`routeFk`, `shipped`, `clientFk`,`nickname`, `addressFk`)
|
INSERT INTO `vn`.`ticket`(`id`, `agencyModeFk`,`warehouseFk`,`routeFk`, `shipped`, `clientFk`,`nickname`, `addressFk`)
|
||||||
|
@ -476,7 +476,7 @@ INSERT INTO `vn2008`.`empresa`(`id`, `abbreviation`, `registro`, `gerente_id`, `
|
||||||
(9, 5, 5, NULL, CURDATE(), 5, 'Hulk', 9),
|
(9, 5, 5, NULL, CURDATE(), 5, 'Hulk', 9),
|
||||||
(10, 6, 5, NULL, CURDATE(), 5, 'Jessica Jones', 10);
|
(10, 6, 5, NULL, CURDATE(), 5, 'Jessica Jones', 10);
|
||||||
|
|
||||||
INSERT INTO `salix`.`TicketState`(`id`, `ticketFk`, `stateFk`, `employeeFk`, `updated`)
|
INSERT INTO `vn`.`ticketTracking`(`id`, `ticketFk`, `stateFk`, `workerFk`, `created`)
|
||||||
VALUES
|
VALUES
|
||||||
(1, 1, 1, 5, CURDATE()),
|
(1, 1, 1, 5, CURDATE()),
|
||||||
(2, 2, 2, 5, CURDATE()),
|
(2, 2, 2, 5, CURDATE()),
|
||||||
|
@ -489,7 +489,7 @@ INSERT INTO `salix`.`TicketState`(`id`, `ticketFk`, `stateFk`, `employeeFk`, `up
|
||||||
(9, 9, 3, 5, CURDATE()),
|
(9, 9, 3, 5, CURDATE()),
|
||||||
(10, 10, 1, 5, CURDATE());
|
(10, 10, 1, 5, CURDATE());
|
||||||
|
|
||||||
INSERT INTO `salix`.`Vehicle`(`id`, `numberPlate`, `tradeMark`, `model`, `companyFk`, `warehouseFk`, `description`, `m3`, `isActive`)
|
INSERT INTO `vn`.`vehicle`(`id`, `numberPlate`, `tradeMark`, `model`, `companyFk`, `warehouseFk`, `description`, `m3`, `isActive`)
|
||||||
VALUES
|
VALUES
|
||||||
(1, '3333-BAT', 'WAYNE INDUSTRIES', 'BATMOBILE', 442, 1, 'The ultimate war machine', 50, 1),
|
(1, '3333-BAT', 'WAYNE INDUSTRIES', 'BATMOBILE', 442, 1, 'The ultimate war machine', 50, 1),
|
||||||
(2, '1111-IMK', 'STARK INDUSTRIES', 'MARK-III', 442, 1, 'Iron-Man Heavy Armor MARK-III', 18, 1),
|
(2, '1111-IMK', 'STARK INDUSTRIES', 'MARK-III', 442, 1, 'Iron-Man Heavy Armor MARK-III', 18, 1),
|
||||||
|
@ -585,11 +585,11 @@ INSERT INTO `vn`.`expence`(`id`, `taxTypeFk`, `name`, `isWithheld`)
|
||||||
|
|
||||||
INSERT INTO `vn`.`item`(`id`, `name`,`typeFk`,`size`,`inkFk`,`category`,`stems`,`originFk`,`description`,`producerFk`,`intrastatFk`,`isOnOffer`,`expenceFk`,`isBargain`,`comment`,`relevancy`,`image`,`taxClassFk`)
|
INSERT INTO `vn`.`item`(`id`, `name`,`typeFk`,`size`,`inkFk`,`category`,`stems`,`originFk`,`description`,`producerFk`,`intrastatFk`,`isOnOffer`,`expenceFk`,`isBargain`,`comment`,`relevancy`,`image`,`taxClassFk`)
|
||||||
VALUES
|
VALUES
|
||||||
(1, 'Gema del Tiempo', 2, 70, 'AMA', 'EXT', 1, 1, 'Una de las gemas del infinito', 1, 2, 0, 1, 0, NULL, 0, NULL, 1),
|
(1, 'Gema del Tiempo', 2, 70, 'AMA', 'EXT', 1, 1, 'Una de las gemas del infinito', 1, 2, 0, 1, 0, NULL, 0, 66540, 1),
|
||||||
(2, 'Gema de la Mente', 2, 70, 'AZL', 'EXT', 1, 2, 'Una de las gemas del infinito', 1, 2, 0, 1, 0, NULL, 0, NULL, 1),
|
(2, 'Gema de la Mente', 2, 70, 'AZL', 'EXT', 1, 2, 'Una de las gemas del infinito', 1, 2, 0, 1, 0, NULL, 0, 65540, 1),
|
||||||
(3, 'Iron Patriot', 1, 60, 'AMR', 'EXT', 1, 3, 'La armadura de Rhodey', 1, 1, 0, 1, 0, NULL, 0, NULL, 1),
|
(3, 'Iron Patriot', 1, 60, 'AMR', 'EXT', 1, 3, 'La armadura de Rhodey', 1, 1, 0, 1, 0, NULL, 0, 61692, 1),
|
||||||
(4, 'Mark I', 1, 60, 'AMR', 'EXT', 1, 1, 'La primera armadura de Iron Man', 1, 1, 1, 2, 0, NULL, 0, NULL, 2),
|
(4, 'Mark I', 1, 60, 'AMR', 'EXT', 1, 1, 'La primera armadura de Iron Man', 1, 1, 1, 2, 0, NULL, 0, 66090, 2),
|
||||||
(5, 'Mjolnir', 3, 30, 'AZR', 'EXT', 1, 2, 'El martillo de Thor', 2, 2, 1, 2, 0, NULL, 0, NULL, 2);
|
(5, 'Mjolnir', 3, 30, 'AZR', 'EXT', 1, 2, 'El martillo de Thor', 2, 2, 1, 2, 0, NULL, 0, 67350, 2);
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue