Commit Graph

19715 Commits

Author SHA1 Message Date
Bernat Exposito Domenech 79fca8b70b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2056-entry_descriptor 2020-02-24 09:25:39 +01:00
Joan Sanchez 224241a954 Merge branch '2038-entry_descriptor_vista_impresion' of verdnatura/salix into dev
gitea/salix/dev This commit looks good Details
2020-02-24 08:02:51 +00:00
Bernat Exposito Domenech c48da59314 report entry-order
gitea/salix/2038-entry_descriptor_vista_impresion This commit looks good Details
2020-02-24 08:44:43 +01:00
Joan Sanchez b9b05ada71 Merge branch 'worker-dms' of verdnatura/salix into dev
gitea/salix/dev This commit looks good Details
2020-02-24 07:15:38 +00:00
Bernat Exposito Domenech c3f907498d Merge branch 'worker-dms' of https://gitea.verdnatura.es/verdnatura/salix into worker-dms
gitea/salix/worker-dms This commit looks good Details
2020-02-24 08:05:44 +01:00
Bernat Exposito Domenech 005adc252d worker dms index 2020-02-24 08:05:26 +01:00
Bernat Exposito Domenech 1908f454c1 worker dms index
gitea/salix/worker-dms This commit looks good Details
2020-02-21 14:50:51 +01:00
Bernat Exposito Domenech 50a8da2064 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2056-entry_descriptor
gitea/salix/2056-entry_descriptor This commit looks good Details
2020-02-21 12:48:37 +01:00
Bernat Exposito Domenech 9779c6d2ba entry summary and descriptor 2020-02-21 12:48:34 +01:00
Joan Sanchez 7b57d79f50 Create client geo auto fill
gitea/salix/2034-postcode_autocomplete There was a failure building this commit Details
2020-02-21 12:39:41 +01:00
Carlos Jimenez Ruiz 1a54dfe653 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2087-snackbar_show_counter
gitea/salix/2087-snackbar_show_counter This commit looks good Details
2020-02-21 10:26:47 +01:00
Carlos Jimenez Ruiz 5c4d7bda18 #2137 e2e adaptados a Snackbar con contador 2020-02-21 10:26:40 +01:00
Bernat Exposito Domenech 773963e7ab update entry filter 2020-02-21 10:03:08 +01:00
Bernat Exposito 97716e0ede Merge branch '2130-ticket_sms' of verdnatura/salix into dev
gitea/salix/dev This commit looks good Details
2020-02-21 08:50:33 +00:00
Joan Sanchez 2dbde24a99 Requested changes
gitea/salix/2130-ticket_sms This commit looks good Details
2020-02-21 09:00:13 +01:00
Javi Gallego 4d389176fe Merge branch 'test' into dev
gitea/salix/dev This commit looks good Details
gitea/salix/test This commit looks good Details
2020-02-21 08:50:50 +01:00
Joan Sanchez bf4e0d09c5 Get phone from address and client
gitea/salix/2130-ticket_sms This commit looks good Details
2020-02-21 08:37:37 +01:00
Bernat Exposito Domenech d018d9d536 fonts 2020-02-21 07:44:20 +01:00
Javi Gallego a8137c8a6b zoneClosure 3
gitea/salix/test This commit looks good Details
gitea/salix/master This commit looks good Details
2020-02-20 15:15:50 +01:00
Joan Sanchez 2f089681df Don't throw error if no salesPerson is assigned 2020-02-20 12:52:05 +01:00
Carlos Jimenez Ruiz bb66f35f2f Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2087-snackbar_show_counter 2020-02-20 11:24:02 +01:00
Carlos Jimenez Ruiz f7d1482466 snackbar layer overlaping removed
gitea/salix/2087-snackbar_show_counter This commit looks good Details
2020-02-20 11:23:21 +01:00
Joan Sanchez 54bc1bc281 Merge branch '1835-e2e-item-request' of verdnatura/salix into dev
gitea/salix/dev This commit looks good Details
2020-02-20 10:10:18 +00:00
Carlos Jimenez Ruiz d9783c80d1 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2087-snackbar_show_counter 2020-02-20 11:01:41 +01:00
Joan Sanchez 6cc2ccf576 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/dev Something is wrong with the build of this commit Details
2020-02-20 10:58:27 +01:00
Joan Sanchez 36d142c3d6 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/test This commit looks good Details
2020-02-20 10:57:27 +01:00
Joan Sanchez 4c1ee5ad4a http-click fix
gitea/salix/master This commit looks good Details
2020-02-20 10:57:06 +01:00
Joan Sanchez 64e4593156 Renamed version number
gitea/salix/dev This commit looks good Details
2020-02-20 10:46:43 +01:00
Joan Sanchez 67380f2990 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/dev This commit looks good Details
2020-02-20 09:57:51 +01:00
Bernat Exposito Domenech cec1f7b90f Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2056-entry_descriptor
gitea/salix/2056-entry_descriptor There was a failure building this commit Details
2020-02-20 09:48:12 +01:00
Joan Sanchez c81027ad2f Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/test This commit looks good Details
2020-02-20 09:45:16 +01:00
Joan Sanchez 17523a2207 hotfix #2135 - Don't enable inputs disabled by ACL directive
gitea/salix/master This commit looks good Details
2020-02-20 09:44:05 +01:00
Carlos Jimenez Ruiz 6533cf095c Merge branch '2135-hotfix_acl_disabled_input' of verdnatura/salix into dev
gitea/salix/dev This commit looks good Details
2020-02-20 08:40:35 +00:00
Joan Sanchez 5e1f31ebdd hotfix #2135 - Don't enable inputs disabled by ACL directive
gitea/salix/2135-hotfix_acl_disabled_input This commit looks good Details
2020-02-20 09:32:47 +01:00
Carlos Jimenez Ruiz 587653fb40 #2119 e2e item.request
gitea/salix/1835-e2e-item-request This commit looks good Details
2020-02-20 09:31:44 +01:00
Bernat Exposito Domenech aecfe2b8a9 report entry-order 2020-02-20 09:31:09 +01:00
Carlos Jimenez Ruiz 095a9f7163 #2119 e2e item.request
gitea/salix/1835-e2e-item-request This commit looks good Details
2020-02-20 07:37:50 +01:00
Joan Sanchez a03788317b Merge branch '2046_e2e_route.basicData' of verdnatura/salix into dev
gitea/salix/dev This commit looks good Details
2020-02-19 13:56:35 +00:00
Carlos Jimenez Ruiz aece3e8788 Merge branch '2112-order_catalog_improvements' of verdnatura/salix into dev
gitea/salix/dev This commit looks good Details
2020-02-19 13:48:00 +00:00
Joan Sanchez 9e435e9553 Some changes
gitea/salix/2112-order_catalog_improvements This commit looks good Details
2020-02-19 12:34:33 +01:00
Joan Sanchez c9fd48b0cd 2112 - Catalog improvements
gitea/salix/2112-order_catalog_improvements This commit looks good Details
2020-02-19 11:57:39 +01:00
Carlos Jimenez Ruiz 081c742dcb Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1835-e2e-item-request 2020-02-19 11:48:01 +01:00
Carlos Jimenez Ruiz 7dd333ade6 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2046_e2e_route.basicData
gitea/salix/2046_e2e_route.basicData This commit looks good Details
2020-02-19 10:04:58 +01:00
Carlos Jimenez Ruiz 774185e52e #2120 e2e path agency.basicData
gitea/salix/2046_e2e_route.basicData This commit looks good Details
2020-02-19 10:04:29 +01:00
Joan Sanchez 346d20b066 Merge branch '2124-route_basic_data' of verdnatura/salix into dev
gitea/salix/dev This commit looks good Details
2020-02-18 12:07:29 +00:00
Bernat Exposito Domenech bfb8c5e138 route.basicData validations
gitea/salix/2124-route_basic_data This commit looks good Details
2020-02-18 12:51:29 +01:00
Joan Sanchez ba06a59ac8 Merge branch '2110-client_sample_validation' of verdnatura/salix into dev
gitea/salix/dev This commit looks good Details
2020-02-18 10:53:44 +00:00
Joan Sanchez af51c2632e Merge branch '2122-entry_index' of verdnatura/salix into dev
gitea/salix/dev This commit looks good Details
2020-02-18 10:20:19 +00:00
Joan Sanchez 2460725d98 Refactor + updated tests
gitea/salix/2110-client_sample_validation This commit looks good Details
2020-02-18 11:14:02 +01:00
Bernat Exposito Domenech 6540ef9598 change Fk to Id
gitea/salix/2122-entry_index This commit looks good Details
2020-02-18 11:07:55 +01:00