Commit Graph

659 Commits

Author SHA1 Message Date
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
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
Daniel Herrero 34e35ee139 new global crudMethod 2018-02-27 14:55:59 +01:00
Carlos Jimenez cdfc2a6779 solved merge comflics with item tags 2018-02-27 13:40:33 +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 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
Bernat Exposito 665fcd3976 uptade ACL table and add recovery model 2018-02-26 14:37:01 +01:00
Juan eb582b51a9 Bug #132 solved 2018-02-26 12:56:42 +01:00
Carlos Jimenez 9054c32aba niche validation fix 2018-02-23 15:20:24 +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 fdf2f017a0 DB upgraded 2018-02-23 11:59:58 +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
Javi Gallego 51f8d01d24 Error de roles solucionado a falta de dump 2018-02-22 16:17:30 +01:00
Daniel Herrero 10e47acd6b item clonation finish 2018-02-22 13:40:23 +01:00
Daniel Herrero 91b7be32fb Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-02-22 11:20:22 +01:00
Daniel Herrero 43eef84ecf renamed item models to kebab-case 2018-02-22 11:20:08 +01:00
Bernat Exposito f92c6faa22 fixed blocking errors on e2e due to snackbar restet time plus fixtures permisions 2018-02-22 10:03:58 +01:00
Bernat Exposito e377e9e452 update fixtures and mudole itemTag.json 2018-02-21 13:44:25 +01:00
Javi Gallego 41dfa9f9a1 creacion de ACL en diferentes modelos 2018-02-21 09:28:17 +01:00
Bernat Exposito 2daed2bda9 import fixtures from DB produccion and create unique index for vn2008.Articles_nicho 2018-02-20 15:01:59 +01:00
Daniel Herrero 60e2d8132b itemBotanical 2018-02-20 14:30:02 +01:00
Daniel Herrero ada3d9480b bug fixed acl obervationType 2018-02-20 14:05:05 +01:00
Carlos Jimenez 6b70556320 acls are back to obersvation-type.json properties 2018-02-20 13:38:04 +01:00
Carlos Jimenez 4251ee20e4 Merge branch 'dev' of http://git.verdnatura.es/salix into dev 2018-02-20 12:26:29 +01:00
Carlos Jimenez 144d5a2bf0 issue 40 completed: niches 2018-02-20 12:25:51 +01:00
Bernat Exposito 4c26879fdb update fixtures edi.genus/specie 2018-02-20 11:16:02 +01:00
SAMBA\bernat 20229cf3e1 update fixtures 2018-02-19 13:39:31 +01:00
SAMBA\bernat 171d0f5867 update changes05-articles_nicho 2018-02-19 13:21:15 +01:00
SAMBA\bernat 0f1004f5de Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-02-19 12:52:33 +01:00
SAMBA\bernat 3018898cad update fixtures / alter table vn2008.articles_nicho 2018-02-19 12:50:14 +01:00
Carlos Jimenez 84bc505937 adapted test to show now 6 sales person 2018-02-19 11:58:02 +01:00
Carlos Jimenez b8e6a8d0b3 Merge branch 'dev' of http://git.verdnatura.es/salix into dev 2018-02-19 11:56:05 +01:00
Carlos Jimenez dcf5bf61da backend unit test for barcode duplicity plus e2e path completed 2018-02-19 11:55:45 +01:00
SAMBA\bernat f4735b4666 update fixtures Botanical 2018-02-19 09:42:40 +01:00
SAMBA\bernat f2d5d58513 fixtures for Barcode and itemPlacement 2018-02-16 14:58:51 +01:00
SAMBA\bernat 2390ee3b01 update fixtures / script for automatic change update in the BD 2018-02-16 13:01:04 +01:00
Juan Ferrer Toribio 2240b4f6d8 Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-02-15 16:11:54 +01:00