Commit Graph

25517 Commits

Author SHA1 Message Date
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
Carlos Jimenez 4e5cbef155 corrected error message when tags are repeated 2018-02-26 17:34:40 +01:00
Carlos Jimenez 456e63700f removed unused code from item niche 2018-02-26 17:32:23 +01:00
Carlos Jimenez c0106b11d2 fixed BUG in #123 item tags 2018-02-26 16:49:44 +01:00
Carlos Jimenez 84f9ac57f3 client basic data, add address and item clone fixes plus add address notes path and create item 2018-02-26 16:06:49 +01:00
Bernat Exposito c2eda39745 Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-02-26 14:37:20 +01:00
Bernat Exposito 665fcd3976 uptade ACL table and add recovery model 2018-02-26 14:37:01 +01:00
Juan cbdf544232 Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-02-26 14:23:35 +01:00
Juan f9d6d63b6b #124 Validación de la description en observaciones de direcciones 2018-02-26 14:23:26 +01:00
Carlos Jimenez bb5440fb45 updated item niche selectors to fix niches path 2018-02-26 13:43:07 +01:00
Carlos Jimenez 30ca341269 removed focus and comments from spec file 2018-02-26 13:27:18 +01:00
Carlos Jimenez 9fd95bdc7e Merge branch 'dev' of http://git.verdnatura.es/salix into dev 2018-02-26 13:25:04 +01:00
Carlos Jimenez bf7fe7dcf0 e2e path for item tax 2018-02-26 13:24:47 +01:00
Juan 8a57dccad1 Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-02-26 12:56:48 +01:00
Juan eb582b51a9 Bug #132 solved 2018-02-26 12:56:42 +01:00
Carlos Jimenez fb6577bc01 fixed error of empty object catch on switching section to item tags 2018-02-26 12:37:27 +01:00
Vicente Falco 268f4b3463 merge 2018-02-25 10:59:33 +01:00
Carlos Jimenez 9054c32aba niche validation fix 2018-02-23 15:20:24 +01:00
Vicente Falco 218cf55e86 merge 2018-02-23 14:20:00 +01:00
Vicente Falco 54240b7278 Jenkins 2018-02-23 14:19:28 +01:00
Juan Ferrer Toribio bff00dc98e Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-02-23 13:05:00 +01:00
Juan Ferrer Toribio cfc4b01fb0 Item tax form and service 2018-02-23 13:04:44 +01:00
Javi Gallego f4a244398a greuge con decimales y favicon 2018-02-23 12:51:36 +01:00
Juan Ferrer Toribio 0c1fa49708 Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-02-23 12:00:18 +01:00
Juan Ferrer Toribio fdf2f017a0 DB upgraded 2018-02-23 11:59:58 +01:00
Carlos Jimenez 398f66defc e2e path for item clone 2018-02-23 09:42:19 +01:00
Daniel Herrero 632a5209c1 item Tags faltan test 2018-02-23 08:09:09 +01:00
Vicente Falco 443c888d73 merge 2018-02-23 07:18:26 +01:00
Vicente Falco b3d692aaa0 Docker nginx 2018-02-23 07:17:33 +01:00
Vicente Falco a9d98b77f6 Docker nginx 2018-02-22 22:28:29 +01:00
Carlos Jimenez 8815dece66 removed focus from describe 2018-02-22 16:44:53 +01:00
Carlos Jimenez bf751341c3 e2e path for item summary 2018-02-22 16:44:14 +01:00
Javi Gallego 51f8d01d24 Error de roles solucionado a falta de dump 2018-02-22 16:17:30 +01:00
Daniel Herrero c2782a8682 Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-02-22 13:40:31 +01:00
Daniel Herrero 10e47acd6b item clonation finish 2018-02-22 13:40:23 +01:00
Carlos Jimenez fe8f3a6660 Merge branch 'dev' of http://git.verdnatura.es/salix into dev 2018-02-22 11:26:51 +01:00
Carlos Jimenez a9dfe8b19d e2e path for item basic data 2018-02-22 11:26:32 +01:00