Commit Graph

6931 Commits

Author SHA1 Message Date
Carlos Jimenez Ruiz 0bf0ed78ee Merge branch '2056-entry_descriptor' of verdnatura/salix into dev
gitea/salix/dev This commit looks good Details
2020-02-25 10:49:40 +00:00
Bernat Exposito Domenech bbba294b79 fix test
gitea/salix/2056-entry_descriptor This commit looks good Details
2020-02-25 11:44:46 +01:00
Bernat Exposito Domenech b37e8da410 fix test
gitea/salix/2056-entry_descriptor This commit looks good Details
2020-02-25 10:39:21 +01:00
Joan Sanchez 78a6c38882 Merge branch '2138-zone_event_m3' of verdnatura/salix into dev
gitea/salix/dev This commit looks good Details
2020-02-25 08:05:14 +00:00
Joan Sanchez 70b0143f0a Renamed sql version
gitea/salix/2138-zone_event_m3 This commit looks good Details
2020-02-25 08:53:09 +01:00
Joan Sanchez 04bdd6d20a Updated e2e
gitea/salix/2138-zone_event_m3 This commit looks good Details
2020-02-25 08:24:54 +01:00
Joan Sanchez 447cdc686e 2138 - Added field m3Max to zoneEvent 2020-02-25 08:08:13 +01:00
Bernat Exposito Domenech e7cdc58fad translates
gitea/salix/2056-entry_descriptor This commit looks good Details
2020-02-25 07:51:16 +01:00
Bernat Exposito 7c1a13cca8 Merge branch '2134-item_request_load_error' of verdnatura/salix into dev
gitea/salix/dev This commit looks good Details
2020-02-24 13:38:17 +00:00
Bernat Exposito Domenech 843f13276a entry summary e2e
gitea/salix/2056-entry_descriptor This commit looks good Details
2020-02-24 14:34:36 +01:00
Bernat Exposito 41bec34119 Merge branch '2081-fix_ticket_search_by_order' of verdnatura/salix into dev
gitea/salix/dev This commit looks good Details
2020-02-24 13:30:48 +00:00
Joan Sanchez ad1e08ec70 2134 - Irem request load error
gitea/salix/2134-item_request_load_error This commit looks good Details
2020-02-24 14:29:48 +01:00
Joan Sanchez 415316d7d0 2081 - Fix ticket search by order id
gitea/salix/2081-fix_ticket_search_by_order This commit looks good Details
2020-02-24 13:28:59 +01:00
Bernat Exposito 40f5093106 Merge branch '2126-ticket_weekly_search_by_name' of verdnatura/salix into dev
gitea/salix/dev This commit looks good Details
2020-02-24 11:39:52 +00:00
Bernat Exposito Domenech 832089de79 entry descriptor, add more options to view entry report 2020-02-24 12:20:53 +01:00
Joan Sanchez d0c2f88a77 2126 - Search by client name
gitea/salix/2126-ticket_weekly_search_by_name This commit looks good Details
2020-02-24 12:08:53 +01:00
Bernat Exposito Domenech 0a4adedcdb client descriptor translates 2020-02-24 09:47:26 +01:00
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
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