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

2018-10-05 12:57:39 +02:00 · 2018-10-05 12:57:39 +02:00 · fda683f59e
parent 8edbc40da3 47a50be560
commit fda683f59e
1 changed files with 4 additions and 1 deletions
--- a/services/db/install/dump/fixtures.sql
+++ b/services/db/install/dump/fixtures.sql
@ -928,4 +928,7 @@ INSERT INTO `vn`.`orderTicket`(`orderFk`, `ticketFk`)
        (18,    18), 
        (19,    19), 
        (20,    20), 
-        (21,    21);
+        (21,    21);
+
+INSERT INTO `vn`.`userConfig` (`userFk`, `warehouseFk`) 
+    VALUES ('9', '1');