Commit Graph

839 Commits

Author SHA1 Message Date
Carlos Jimenez Ruiz 17c784e06f Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2517-clientBalanceCompensaciones 2021-02-01 09:52:42 +01:00
Joan Sanchez f5f4c5936d 2763 - Notify urgen issues 2021-02-01 09:29:47 +01:00
Joan Sanchez 3ec55426ae Removed params due a docker error 2021-02-01 07:21:36 +01:00
Joan Sanchez 57c124b936 Updated config params 2021-01-29 10:03:18 +01:00
Carlos Jimenez Ruiz c442eaa0c7 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2517-clientBalanceCompensaciones 2021-01-29 09:13:58 +01:00
Joan Sanchez ca47fe6827 2476 - downloadImages() method refactor 2021-01-28 12:23:18 +01:00
Bernat Exposito 01c96272bd export production 2021-01-26 10:55:30 +01:00
Javi Gallego d61ab94398 acl conflicto 2021-01-25 07:49:57 +01:00
Joan Sanchez a6e4d68017 Merge branch 'dev' into 2517-clientBalanceCompensaciones 2021-01-22 15:05:39 +00:00
Javi Gallego 93417e9676 refactor 2021-01-22 14:45:02 +01:00
Javi Gallego e1711af265 sin keep 2021-01-22 14:32:35 +01:00
Javi Gallego 228a642634 Merge branch 'dev' into 2479-factura-ticket 2021-01-22 14:31:28 +01:00
Javi Gallego 7bdfb36f25 minor refactor 2021-01-22 14:30:46 +01:00
Carlos Jimenez Ruiz c4f673e089 relocated sql code 2021-01-22 11:28:47 +01:00
Javi Gallego aab9797d3f Merge branch 'dev' into 2479-factura-ticket 2021-01-21 13:40:55 +01:00
Javi Gallego 3dc50e8a16 test ok 2021-01-21 13:39:40 +01:00
Carlos Jimenez Ruiz 0cf3f198ef Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2583-create_supplierAccount_section 2021-01-21 11:50:32 +01:00
Carlos Jimenez Ruiz 90c6d2fe3e SQLs moved to current version folder 2021-01-21 11:30:22 +01:00
Jorge Padawan 6acb5c221e Changes folder of ACL 2021-01-21 10:55:21 +01:00
Carlos Jimenez Ruiz a53231c721 amends 2021-01-21 10:44:43 +01:00
Carlos Jimenez Ruiz 42e7fa7047 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2517-clientBalanceCompensaciones 2021-01-21 10:25:39 +01:00
Joan Sanchez 5e4c320310 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2677-rating_component 2021-01-21 09:26:02 +01:00
Javi Gallego a6dfdc971a receipt_beforInsert 2021-01-20 13:54:55 +01:00
Joan Sanchez c9dc9495dc 2677 - Added rating component to order catalog 2021-01-20 13:51:30 +01:00
Carlos Jimenez Ruiz ef3b48005e sql changes now in correct version 2021-01-20 09:23:58 +01:00
Carlos Jimenez Ruiz 843608c47f Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2564-item_priceFixed 2021-01-20 09:17:55 +01:00
Joan Sanchez a67c8e4fbd Renamed version 2021-01-20 08:22:23 +01:00
Joan Sanchez 94b8fa7c4e Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev 2021-01-20 08:22:05 +01:00
Joan Sanchez 24982ba030 Renamed version 2021-01-20 08:21:45 +01:00
Joan Sanchez ffb76e6cb5 Added new db version 2021-01-20 08:12:40 +01:00
Javi Gallego e47e5b9ec4 merged carpetas de cambios 2021-01-19 11:32:47 +01:00
Javi Gallego 043a74b548 Merge branch 'dev' into 2517-clientBalanceCompensaciones 2021-01-19 10:20:45 +01:00
Carlos Jimenez Ruiz 464366fdbe Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2564-item_priceFixed 2021-01-18 17:17:02 +01:00
Carlos Jimenez Ruiz 3251d737e6 fixed price index implementation 2021-01-18 14:16:39 +01:00
Jorge Padawan daa8bafb09 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2583-create_supplierAccount_section 2021-01-15 08:56:20 +01:00
Bernat Exposito 975e158ebb itemTag trigger 2021-01-13 08:17:41 +01:00
Jorge Padawan 4e1b9b911b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2583-create_supplierAccount_section 2021-01-12 11:05:35 +01:00
Javi Gallego 6acfe7f1cf minorBugs 2021-01-11 17:18:37 +01:00
Javi Gallego d3b5300553 test 2021-01-11 16:30:14 +01:00
Bernat Exposito 8b3af8851c fix trigger itemTag 2021-01-11 11:29:47 +01:00
Javi Gallego ea6e234cde minor fixes 2021-01-11 08:01:57 +01:00
Jorge Padawan b8827ec63d Fix problems with ACL and the autocomplete of bank entity 2021-01-08 16:45:20 +01:00
Javi Gallego 6c2138a69a Merge branch 'dev' into 2517-clientBalanceCompensaciones 2021-01-08 15:24:05 +01:00
Bernat Exposito a2550ce128 export table payment 2021-01-08 10:24:41 +01:00
Javi Gallego b5cd4e3c9f Merge branch 'dev' into 2517-clientBalanceCompensaciones 2021-01-08 09:44:13 +01:00
Javi Gallego 1884dc8789 fixtures 2021-01-08 09:43:36 +01:00
Jorge Padawan 6017894ba9 first step bankEntity 2021-01-07 15:14:38 +01:00
Bernat Exposito 779b229dfc refactor tag fixtures 2021-01-07 12:11:14 +01:00
Javi Gallego c0cc91b6c3 Merge branch 'dev' into 2517-clientBalanceCompensaciones 2021-01-07 09:11:34 +01:00
Bernat Exposito 6179921978 export production 2021-01-07 08:37:56 +01:00
Javi Gallego 1291fc4b6c acl 2021-01-04 11:49:32 +01:00
Carlos Jimenez Ruiz e356dd9e5e Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2661-travel_cloneWithEntries 2020-12-30 14:55:14 +01:00
Javi Gallego 0d5540b639 Merge branch 'dev' into 2517-clientBalanceCompensaciones 2020-12-29 17:00:45 +01:00
Joan Sanchez 2886e02328 Enabled loggable for locations 2020-12-29 08:50:12 +01:00
Joan Sanchez f4ff31a294 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2657-zone_log 2020-12-29 08:09:49 +01:00
Joan Sanchez 910caf5689 2661 - Added clone options 2020-12-28 14:53:26 +01:00
Joan Sanchez c192a0e125 Merge pull request '2667-create_entryObservation' (#490) from 2667-create_entryObservation into dev
Reviewed-on: #490
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2020-12-24 08:59:33 +00:00
Jorge Padawan 3517bdea41 Añadido a las foreignKeys el valor UNIQUE 2020-12-23 13:31:55 +01:00
Bernat Exposito a21476e3df fix searchbar index 2020-12-23 12:42:41 +01:00
Jorge Padawan a19064cb1b Nueva tabla entryObservation y he juntado la consulta de 1260-navidad con 1260-holydays 2020-12-23 12:23:37 +01:00
Javi Gallego 36bace2a94 Merge branch 'dev' into 2517-clientBalanceCompensaciones 2020-12-22 07:42:28 +01:00
Javi Gallego 340927799c Merge branch 'dev' into 2517-clientBalanceCompensaciones 2020-12-21 09:53:00 +01:00
Javi Gallego 3a6d62ac7d xdiario 2020-12-21 09:52:27 +01:00
Joan Sanchez d8a2184695 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2576-photo_uploader 2020-12-18 17:24:30 +01:00
Joan Sanchez 42cd2356a2 Refactor v2 2020-12-18 17:23:04 +01:00
Bernat Exposito d1793351fb Merge pull request 'fixtures amended for calendar testing' (#484) from 2622-route_tickets_refactor into dev
Reviewed-on: #484
Reviewed-by: Bernat Exposito <bernat@verdnatura.es>
2020-12-18 12:33:18 +00:00
Carlos Jimenez Ruiz 177d3cd35b fixtures amended for calendar testing 2020-12-18 13:16:44 +01:00
Jorge Benedito 29ec268113 Merge pull request '2682-supplier_billingData_e2e + fixes' (#482) from 2682-supplier_billingData_e2e into dev
Reviewed-on: #482
Reviewed-by: Jorge Benedito <jorgebl@verdnatura.es>
2020-12-18 08:34:00 +00:00
Javi Gallego 87adbbfa3c Merge branch 'dev' into 2517-clientBalanceCompensaciones 2020-12-18 08:21:36 +01:00
Bernat Exposito 0b5a98c2fe export production 2020-12-17 15:17:03 +01:00
Jorge Padawan 33237dad86 Add acl to supplier billing data 2020-12-17 12:29:37 +01:00
Joan Sanchez 5ecd589106 Updated delivery note 2020-12-16 09:24:11 +01:00
Javi Gallego 2bb9125eee Merge branch 'dev' into 2517-clientBalanceCompensaciones 2020-12-16 08:34:54 +01:00
Javi Gallego 963db11686 funcionalidad 2020-12-16 08:33:08 +01:00
Joan Sanchez 0a4016be41 Updated unit tests & changed ACL 2020-12-11 15:04:55 +01:00
Joan Sanchez 59c622481f Updated image fixtures 2020-12-10 13:21:11 +01:00
Joan Sanchez 260b502cd6 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2576-photo_uploader 2020-12-10 07:30:31 +01:00
Bernat Exposito 6605e5ae4c zoneLog 2020-12-02 12:05:47 +01:00
Joan Sanchez 1ba1d27ba0 2576 - Photo upload component 2020-11-27 13:10:39 +01:00
Bernat Exposito 06e7583f2b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2645-export_production 2020-11-25 12:47:17 +01:00
Bernat Exposito 78f25e0b46 export production 2020-11-25 12:37:44 +01:00
Javi Gallego b23a441f31 fixtures 2020-11-23 12:20:58 +01:00
Joan Sanchez d40ea52560 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2569-travel_extra_community 2020-11-20 15:06:34 +01:00
Joan Sanchez 7693a1c449 2569 - Section changes 2020-11-20 15:05:57 +01:00
Joan Sanchez 8a3f5345f4 Merge branch 'dev' into 2575-image_download 2020-11-16 13:54:47 +00:00
Joan Sanchez 359dcc904d Version merge 2020-11-16 09:08:39 +01:00
Joan Sanchez 8194801308 Supplier cargo migration to vn 2020-11-16 08:48:42 +01:00
Juan Ferrer 80cbb53dfe Merge branch 'test' into dev 2020-11-13 10:49:59 +01:00
Juan Ferrer cdf6cb661f Login sync fixes 2020-11-13 10:33:34 +01:00
Bernat Exposito 6fc14d569c Merge branch 'dev' into 2575-image_download 2020-11-13 08:32:39 +00:00
Joan Sanchez cb8e9655af Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev 2020-11-13 07:22:12 +01:00
Juan Ferrer 4b46b0787b User syncronization fixes, improvements, refactor 2020-11-12 23:20:25 +01:00
Bernat Exposito 5be616ad91 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2557-export_production 2020-11-12 08:04:38 +01:00
Bernat Exposito eb8931bca5 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2575-image_download 2020-11-11 13:57:37 +01:00
Joan Sanchez db4f226f6f Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev 2020-11-11 12:39:15 +01:00
Bernat Exposito 1e95f0105a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2575-image_download 2020-11-11 10:52:46 +01:00
Bernat Exposito 75ffa108fb refactor back download 2020-11-11 10:52:35 +01:00
Joan Sanchez 08af948eb0 Merge branch 'dev' into 2574-itemTag_refactor 2020-11-10 12:39:17 +00:00
Bernat Exposito e4e4f37609 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2575-image_download 2020-11-10 08:46:37 +01:00
Bernat Exposito 4ea5993dcc user image 2020-11-10 08:39:34 +01:00