Commit Graph

3141 Commits

Author SHA1 Message Date
Javi Gallego 87447661b2 merge 2018-09-19 07:42:53 +02:00
Javi Gallego 68e075c496 #654 Permisos en claim.basicData 2018-09-19 07:41:07 +02:00
gerard 8d6b6cd2a8 updated translations 2018-09-18 14:38:17 +02:00
gerard 834d779154 Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-09-18 14:37:15 +02:00
gerard fa9c3f4759 Tarea #602 Investigar hook 2018-09-18 14:36:41 +02:00
Joan Sanchez 469e6f8076 fixed itemDiary warehouseFk select #671 2018-09-18 13:34:11 +02:00
Joan Sanchez 9aff95904d Added model rewriteDbError() method & fixed tag bug #597 & #662 2018-09-18 10:11:51 +02:00
gerard 5c6ab8efc3 skipped tests fixed 2018-09-18 09:52:50 +02:00
gerard 629df353ec Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-09-18 09:38:04 +02:00
gerard babadbb4f3 Bug #660 el catalogo deberia de estar deshabilitado 2018-09-18 09:37:54 +02:00
Carlos Jimenez f1e5fdfa0b Merge branch 'dev' of http://git.verdnatura.es/salix into dev 2018-09-18 08:58:26 +02:00
Carlos Jimenez 7bc2d0339d order is now deleted upon execution 2018-09-18 08:58:15 +02:00
Joan Sanchez f387673b80 catalogFilter back unit test fixed with different orderFk 2018-09-18 08:55:39 +02:00
gerard 18fe2e16af updated test 2018-09-17 15:10:46 +02:00
gerard 6b155c6485 reverted "Bur restoring old value" 2018-09-17 14:55:13 +02:00
gerard 97f45e7475 focus added to all vn-searcbar in modules index 2018-09-17 14:54:38 +02:00
gerard c3e9d0af95 bug restoring old value solved 2018-09-17 14:31:43 +02:00
gerard 4fb31f9522 Tarea #658 dialogo de añadir cantidad 2018-09-17 14:30:39 +02:00
Bernat 702690e949 update fixtures cau 8198 2018-09-17 13:13:33 +02:00
Carlos Jimenez 38633c1fef #639 Refacto e2e waitForSnackbar + error corrections 2018-09-17 10:50:15 +02:00
Bernat df02c35068 update fixtures 2018-09-14 14:59:14 +02:00
gerard ce8cd5708e Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-09-14 14:45:39 +02:00
gerard df85500ab5 added UserError 2018-09-14 14:45:29 +02:00
gerard 0926e481ed Tarea #601 dialogo de añadir cantidad 2018-09-14 14:44:46 +02:00
Joan Sanchez f8c014b330 Merge branches 'dev' and 'dev' of https://git.verdnatura.es/salix into dev 2018-09-14 14:25:32 +02:00
gerard 569cd60d7b Tarea #601 dialogo de añadir cantidad 2018-09-14 14:20:58 +02:00
Joan Sanchez e0628786b4 added catalog front & back unit test #598 2018-09-14 14:18:39 +02:00
gerard 899f9b3fe5 Tarea #653 Crear shortcuts 2018-09-14 13:51:28 +02:00
Bernat ec960eab76 update structure db 2018-09-14 13:47:50 +02:00
Carlos Jimenez e90af6b851 #593 Refactor card/descriptor/descriptor-popover 2018-09-14 13:43:51 +02:00
Joan Sanchez d66383dced fixed front-end unit test textfield 2018-09-14 11:01:56 +02:00
Joan Sanchez 8feba9f5eb catalogFilter back test 2018-09-14 09:37:54 +02:00
Joan Sanchez fa31010069 catalog filters #598 2018-09-14 09:10:30 +02:00
gerard 8d1aa30287 Bug #437 Boton cancelar 2018-09-14 08:14:52 +02:00
gerard 3fafadf5c8 Bug #657 mandar una notificacion al comercial de un cliente falla 2018-09-14 08:08:38 +02:00
gerard 0f14bf9d27 added translations 2018-09-13 17:00:01 +02:00
gerard d60308f72b Bug #651 test 2018-09-13 15:29:38 +02:00
gerard d39365b63b Bug #651 Al borrar un ticket no se cambia su estado a eliminado test 2018-09-13 15:13:42 +02:00
Carlos Jimenez 447044faf9 task updated #651 Al borrar un ticket no se cambia su estado a eliminado 2018-09-13 14:33:09 +02:00
Carlos Jimenez f3a4ed7344 Merge branch 'dev' of http://git.verdnatura.es/salix into dev 2018-09-13 14:30:15 +02:00
Carlos Jimenez 7211277b25 amends on spec file 2018-09-13 14:29:59 +02:00
gerard a6b63d4113 Bug #652 El componente textarea muestra mal el label 2018-09-13 14:01:26 +02:00
gerard 1e3b3b0ffa Tarea #644 Crear componente Input Number 2018-09-13 12:46:32 +02:00
gerard a2506a787e updated description 2018-09-13 12:39:56 +02:00
gerard 910d758117 Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-09-13 12:36:59 +02:00
gerard fe80a6b8c8 Bug #651 Al borrar un ticket no se cambia su estado a eliminado 2018-09-13 12:36:52 +02:00
Bernat 24f89156e4 update fixtures, fix test and selectors 2018-09-13 12:32:33 +02:00
Carlos Jimenez 28e4277ef0 Merge branch 'dev' of http://git.verdnatura.es/salix into dev 2018-09-13 11:30:05 +02:00
Carlos Jimenez b2b2c71117 #640 Ticket Create packages path is excluded 2018-09-13 11:29:53 +02:00
Carlos Jimenez 7638881c54 corrected description 2018-09-13 11:29:21 +02:00