Commit Graph

205 Commits

Author SHA1 Message Date
Joan Sanchez c174d0a29e acl fix 2020-01-29 14:50:53 +01:00
Joan Sanchez 35e443a112 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2003-adress_validate_uee_members 2020-01-28 09:03:33 +01:00
Joan Sanchez 0044bd2efa updated tests 2020-01-28 09:03:20 +01:00
Bernat Exposito Domenech 849faad6ea add m3Max in agency.basicData 2020-01-27 09:45:13 +01:00
Joan Sanchez 921af4dcc2 Merge branch '2014-remove_bi_from_db' of verdnatura/salix into dev 2020-01-24 12:52:30 +00:00
Bernat Exposito Domenech 2bcd0caa06 update structure db 2020-01-24 12:55:54 +01:00
Javi Gallego 08fda3ed1b #workedHours 2020-01-24 12:38:08 +01:00
Joan Sanchez 25ffa839a2 added incoterms & customs agent to address forms 2020-01-24 09:47:24 +01:00
Joan Sanchez deada69ca4 Added models 2020-01-23 14:59:37 +01:00
Bernat Exposito Domenech 6700daf0e3 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2014-remove_bi_from_db 2020-01-23 12:58:47 +01:00
Bernat Exposito Domenech 64bd721287 update structure db 2020-01-23 12:58:38 +01:00
Bernat Exposito 6c0cc3d204 Merge branch '1982-travel_add_thermograph' of verdnatura/salix into dev 2020-01-23 10:00:58 +00:00
Bernat Exposito Domenech 2790cc8057 update structure 2020-01-22 14:34:45 +01:00
Joan Sanchez 77f6333aba Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1982-travel_add_thermograph 2020-01-21 12:23:10 +01:00
Joan Sanchez f0b4c26aea added travel thermograph create & remove methods 2020-01-21 12:21:53 +01:00
Joan Sanchez 20b4f6ec74 updated tests 2020-01-21 09:33:26 +01:00
Joan Sanchez 5e4ab8b128 Loggable errors 2020-01-21 09:00:42 +01:00
Joan Sanchez 41e69a2e9d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1982-travel_add_thermograph 2020-01-20 13:05:06 +01:00
Bernat Exposito Domenech 0fe0596b3e worker phone refactor 2020-01-20 11:03:40 +01:00
Joan Sanchez 4002b51565 added section 2020-01-17 08:43:10 +01:00
Joan Sanchez 1704f5e93b Merge branch '2011-client_phone' of verdnatura/salix into dev 2020-01-17 06:48:57 +00:00
Bernat Exposito Domenech 74b688dc4b client phone refactor 2020-01-17 07:24:57 +01:00
Joan Sanchez 3cba6f0293 Translated family names 2020-01-16 14:35:40 +01:00
Joan Sanchez 2b2e6532f6 changes to percentage filter 2020-01-16 13:39:32 +01:00
Bernat Exposito Domenech 1307f6c5fb update structure 2020-01-15 13:43:38 +01:00
Bernat Exposito Domenech 1f60aac446 export structure db 2020-01-15 08:19:22 +01:00
Carlos Jimenez Ruiz 83d2ec40d4 Merge branch '1985-apply_item_type_filter' of verdnatura/salix into dev 2020-01-09 10:50:26 +00:00
Bernat Exposito Domenech d432c32577 export production and create new models 2020-01-09 10:49:09 +01:00
Joan Sanchez 5a7bd4e18f filters refactor 2020-01-08 12:27:18 +01:00
Bernat Exposito Domenech 730b8e160f Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1947-route_basic_data 2020-01-07 08:30:55 +01:00
Bernat Exposito Domenech 814c96434e routebasic 2020-01-03 14:31:02 +01:00
Joan Sanchez 8a36e0913f changed fixtures for dynamic holidays 2020-01-03 08:43:03 +01:00
Joan Sanchez a5eb8e5315 extended worker contract ranges & fixed invoice 2020-01-02 11:10:26 +01:00
Joan Sanchez 8f92abe49c fixed procedure bug 2019-12-31 14:01:05 +01:00
Joan Sanchez 417642ac9e updated UserPhone acl 2019-12-31 11:07:46 +01:00
Joan Sanchez 0ece53a35e Send chat message with user avatar 2019-12-27 08:49:51 +01:00
Bernat Exposito Domenech 0827b998a1 update structure sql 2019-12-23 15:15:58 +01:00
Bernat Exposito Domenech e9d416671d update fixtures and structure db 2019-12-20 13:51:04 +01:00
Joan Sanchez 72d591e143 sql changes 2019-12-20 10:59:17 +01:00
Joan Sanchez b9415c0335 updated sql 2019-12-20 10:40:12 +01:00
Bernat Exposito Domenech aab970e667 client.phone section 2019-12-17 09:11:28 +01:00
Bernat Exposito Domenech c1db827889 update structure db 2019-12-16 11:33:10 +01:00
Bernat Exposito Domenech e4c17492f0 update structure 2019-12-16 09:22:59 +01:00
Bernat Exposito Domenech d66519a39f set autoincrement db to one 2019-12-16 08:48:12 +01:00
Bernat Exposito Domenech ff117c1811 merge conflicts structure.sql 2019-12-13 09:06:39 +01:00
Bernat Exposito Domenech dd86961542 update structure 2019-12-13 08:46:40 +01:00
Bernat Exposito 6d1bd7575d Merge branch '1925excludeTables' of verdnatura/salix into dev 2019-12-13 06:17:03 +00:00
Juan Ferrer d61b08ed10 Merge branch '1922-mysql8' of verdnatura/salix into dev 2019-12-12 13:49:05 +00:00
Bernat Exposito Domenech e8c216799c update estructure 2019-12-12 14:28:58 +01:00
Joan Sanchez 62aae9ce14 removed password from fixtures 2019-12-12 09:46:29 +01:00