Commit Graph

1953 Commits

Author SHA1 Message Date
Daniel Herrero e683ee66c1 Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-03-01 14:48:09 +01:00
Daniel Herrero 40e2b73e7c tarea #105 in progress 2018-03-01 14:48:02 +01:00
Bernat Exposito 836d7dc054 update structure and data from production DB 2018-03-01 14:47:25 +01:00
Juan 2c88d24e24 Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-03-01 14:04:40 +01:00
Juan 9881c4e6f3 Merge 2018-03-01 14:04:33 +01:00
Bernat Exposito f6c6ee1596 update fixtures adding data to vn.recovery 2018-03-01 14:02:51 +01:00
Juan de145bd814 #128 - Client invoices form 2018-03-01 14:01:45 +01:00
Joan Sanchez 52503c1015 Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-03-01 13:53:16 +01:00
Joan Sanchez 5dc7b0bb58 Client summary 2018-03-01 13:53:11 +01:00
Daniel Herrero 9a6dc5b99e e2e new selector fixed (clientIndex.searchResult) 2018-03-01 13:44:19 +01:00
Daniel Herrero 77b20ae764 clientIndex unit test fixed 2018-03-01 13:26:54 +01:00
Daniel Herrero a78292ffb8 merge conflicts 2018-03-01 12:55:07 +01:00
Daniel Herrero b92f8bdd43 tarea #105 esturcctura montada, falta rellenar datos 2018-03-01 12:51:35 +01:00
Javi Gallego 4ee4c07b19 Bug #125 Modelo item 2018-03-01 12:47:51 +01:00
Bernat Exposito cfbb94e9c3 Update fixtures in backend test 2018-03-01 12:28:22 +01:00
Javi Gallego c8eab7dc24 merge model-config 2018-03-01 11:57:33 +01:00
Javi Gallego f3b00f4b47 entidad recovery con list, create y tests 2018-03-01 11:55:28 +01:00
Juan 3d4ff56888 Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-03-01 11:36:48 +01:00
Daniel Herrero 465d210b51 bug 103 falcar cliente, acl condicionales 2018-03-01 10:54:02 +01:00
Juan e6c44d74eb Client invoices 2018-02-28 20:55:44 +01:00
Bernat Exposito 319cab6223 update fixtures for invoiceOut 2018-02-28 15:52:24 +01:00
Bernat Exposito 274d1475c9 resolve bugs in e2e test in windows and new module invoice-out 2018-02-28 15:40:52 +01:00
Carlos Jimenez 241c360c54 fixed summary e2e path 2018-02-28 13:46:45 +01:00
Juan b3037e2db9 Addresses E2E fixed 2018-02-28 13:07:58 +01:00
Juan d9c54415cb Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-02-28 12:07:59 +01:00
Juan a1ee22d153 #96 - Email validation errors fixed 2018-02-28 12:07:56 +01:00
Carlos Jimenez 884f7fe954 mini refactor on validateDni back end unit test 2018-02-28 10:02:57 +01:00
Daniel Herrero 50fb035dd9 Bug #108 tooltip outsides 2018-02-28 09:12:48 +01:00
Carlos Jimenez b473fdf289 e2e item summary path repairds 2018-02-28 08:27:59 +01:00
Carlos Jimenez 9bcd859963 Merge branch 'dev' of http://git.verdnatura.es/salix into dev 2018-02-28 08:16:49 +01:00
Carlos Jimenez 48e788b90a E2E item tax and clone Path repairs 2018-02-28 08:16:28 +01:00
Juan 8ee649b9d0 Bug with empty value validations fixed 2018-02-27 22:50:14 +01:00
Juan 4eebdf96ee Small fix before commit 2018-02-27 20:28:59 +01:00
Juan fba637f3b3 Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-02-27 20:28:19 +01:00
Juan 2a06244fd6 Create client E2E fixed, tests for validateDni 2018-02-27 20:28:07 +01:00
Carlos Jimenez b3ec161b00 e2e path for item tags #121 2018-02-27 19:00:46 +01:00
Daniel Herrero 34e35ee139 new global crudMethod 2018-02-27 14:55:59 +01:00
Carlos Jimenez cf77d05156 fixed a merge conflit problem 2018-02-27 14:39:50 +01:00
Carlos Jimenez cdfc2a6779 solved merge comflics with item tags 2018-02-27 13:40:33 +01:00
Carlos Jimenez 701e6f9976 completed task #144 tem tags bugs 2018-02-27 13:31:45 +01:00
Juan 688881fac4 Bug #97 - Show dash when no secured credit 2018-02-27 13:28:07 +01:00
Juan b864a8382c Backend test repaired 2018-02-27 12:56:03 +01:00
Carlos Jimenez 33f19949d8 fixed item tags plus added watcher to niches 2018-02-27 12:32:47 +01:00
Carlos Jimenez c22d1b0e72 salesperson spec repairs 2018-02-27 12:08:19 +01:00
Juan 3c1467ec97 Bug validateDni 2018-02-27 12:00:39 +01:00
Juan 4bfdf2a90f Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-02-27 10:00:56 +01:00
Juan 5830a0d8f9 Bug #94 - FI validation 2018-02-27 10:00:43 +01:00
Daniel Herrero 5b928f3e04 itemtags i18n 2018-02-27 08:14:28 +01:00
Daniel Herrero 687b011f9a minWatcher in tags 2018-02-27 08:09:51 +01:00
Daniel Herrero e048402223 itemTag added priority 2018-02-27 07:54:41 +01:00