Commit Graph

1735 Commits

Author SHA1 Message Date
Carlos Jimenez Ruiz 794b20fc83 #2131 jest.spyOn 2020-02-26 13:22:52 +01:00
Joan Sanchez 37ff99d838 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/dev This commit looks good Details
2020-02-26 13:19:32 +01:00
Joan Sanchez e15ef3386e Translation changes
gitea/salix/test This commit looks good Details
2020-02-26 13:18:29 +01:00
Joan Sanchez d401fa8d13 Changed variable name
gitea/salix/2138-zone_event_m3 This commit looks good Details
2020-02-26 13:06:35 +01:00
Joan Sanchez ce84d26fae Some changes
gitea/salix/2138-zone_event_m3 There was a failure building this commit Details
2020-02-26 12:24:48 +01:00
Joan Sanchez e09325b3fa Changed test description
gitea/salix/2138-zone_event_m3 This commit looks good Details
2020-02-26 11:43:41 +01:00
Joan Sanchez 442c3ba87c unit tests
gitea/salix/2138-zone_event_m3 This commit looks good Details
2020-02-26 11:05:29 +01:00
Joan Sanchez 4add07898f Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2138-zone_event_m3 2020-02-26 11:00:40 +01:00
Bernat Exposito Domenech 9cad13f166 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1970-test_crud_model
gitea/salix/1970-test_crud_model This commit looks good Details
2020-02-26 08:24:21 +01:00
Joan Sanchez 9849c60651 Added popover
gitea/salix/2138-zone_event_m3 There was a failure building this commit Details
2020-02-26 07:02:03 +01:00
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 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
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 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
Joan Sanchez 3643709a80 Added datalist auto completion
gitea/salix/2034-postcode_autocomplete There was a failure building this commit Details
2020-02-24 11:27:36 +01:00
Bernat Exposito Domenech 0a4adedcdb client descriptor translates 2020-02-24 09:47:26 +01:00
Joan Sanchez 75d7125426 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2034-postcode_autocomplete
gitea/salix/2034-postcode_autocomplete There was a failure building this commit Details
2020-02-24 09:41:23 +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
Bernat Exposito Domenech 005adc252d worker dms index 2020-02-24 08:05:26 +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
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
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
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
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
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
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
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
Bernat Exposito Domenech 3f978bd32b entry index refactor
gitea/salix/2122-entry_index This commit looks good Details
2020-02-18 10:33:17 +01:00
Joan Sanchez 7e38100d05 Merge branch '845-order_catalog_datalist' of verdnatura/salix into dev
gitea/salix/dev This commit looks good Details
2020-02-18 06:58:54 +00:00
Joan Sanchez 30e3880299 Removed comments
gitea/salix/845-order_catalog_datalist Build started... Details
2020-02-18 07:50:18 +01:00
Joan Sanchez 61b3ce184c Merge branch '2113-item_data_add_instrastat' of verdnatura/salix into dev
gitea/salix/dev This commit looks good Details
2020-02-18 06:32:17 +00:00
Joan Sanchez fe8a0b4583 Added translation. taxClassCode.sql removed
gitea/salix/2113-item_data_add_instrastat This commit looks good Details
2020-02-18 07:21:35 +01:00
Joan Sanchez a9b8fab51d 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-17 14:55:26 +01:00
Joan Sanchez 1ca3753908 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/test This commit looks good Details
2020-02-17 14:48:11 +01:00
Joan Sanchez a148daa368 2125 - ticket create invalid type fix
gitea/salix/master This commit looks good Details
2020-02-17 14:47:43 +01:00
Bernat Exposito Domenech f900b7ef62 crud model test 2020-02-17 13:50:54 +01:00
Joan Sanchez 7d8e88e884 Updated unit test
gitea/salix/2113-item_data_add_instrastat This commit looks good Details
2020-02-17 13:32:12 +01:00
Joan Sanchez 844b27acb9 2118 - Create new intrastat
gitea/salix/2113-item_data_add_instrastat There was a failure building this commit Details
2020-02-17 12:47:03 +01:00
Joan Sanchez 578556b1d5 2121 - Client balance fix balance on pagination
gitea/salix/2121-client_balance_fix This commit looks good Details
2020-02-17 08:38:19 +01:00
Joan Sanchez d9ed7cda38 Added form dialog
gitea/salix/2113-item_data_add_instrastat There was a failure building this commit Details
2020-02-17 07:22:55 +01:00
Carlos Jimenez Ruiz 4e2ab537ee unstable with the rest of tests
gitea/salix/1835-e2e-item-request This commit looks good Details
2020-02-14 14:52:47 +01:00
Joan Sanchez 84bf95db13 2106 - Sms max length fix
gitea/salix/2106-sms_send_with_dots This commit looks good Details
2020-02-14 12:01:17 +01:00
Joan Sanchez fd45c41210 removed focus
gitea/salix/2094-claim_send_chat This commit looks good Details
2020-02-13 15:01:24 +01:00
Joan Sanchez 5360c407d5 updated unit test
gitea/salix/2094-claim_send_chat This commit looks good Details
2020-02-13 14:46:18 +01:00
Joan Sanchez be07e33e5f updated unit test
gitea/salix/2094-claim_send_chat This commit looks good Details
2020-02-13 14:39:33 +01:00
Joan Sanchez 39470e837b 2094 Regularize claim send chat even if doesn't have destination
gitea/salix/2094-claim_send_chat This commit looks good Details
2020-02-13 13:20:31 +01:00
Joan Sanchez c5840f322f Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 845-order_catalog_datalist
gitea/salix/845-order_catalog_datalist This commit looks good Details
2020-02-13 11:38:18 +01:00
Bernat Exposito Domenech 1887cc8c60 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2105-export_structure_db 2020-02-13 08:44:25 +01:00
Bernat Exposito Domenech 4b48a89eaa ticket descriptor update acl
gitea/salix/2079-acl_update_ticket_weekly This commit looks good Details
2020-02-13 08:31:29 +01:00
Bernat Exposito Domenech 4abf87552d db production exported 2020-02-12 14:38:51 +01:00
Carlos Jimenez Ruiz 2a7f826cf6 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2006-e2e-route-summary
gitea/salix/2006-e2e-route-summary This commit looks good Details
2020-02-12 14:36:14 +01:00
Carlos Jimenez Ruiz e8a178d5f4 #2006 e2e route.summary plus refactors 2020-02-12 14:36:05 +01:00
Bernat Exposito Domenech e0f7b917d7 db test ticket_recalcComponent
gitea/salix/1893-dbTest_ticket_recalcComponents This commit looks good Details
2020-02-12 10:39:46 +01:00
Joan Sanchez c78c154ab0 Added datalist
gitea/salix/845-order_catalog_datalist This commit looks good Details
2020-02-11 14:41:59 +01:00
Bernat Exposito Domenech 5375952778 translate
gitea/salix/1910-informe_consumo This commit looks good Details
2020-02-11 13:52:05 +01:00
Bernat Exposito Domenech 1d73d9f89d refactor campaing report
gitea/salix/1910-informe_consumo This commit looks good Details
2020-02-11 13:25:41 +01:00
Carlos Jimenez Ruiz 420f059211 Merge branch '1684-ticket_transfer_salesLog' of verdnatura/salix into dev
gitea/salix/dev There was a failure building this commit Details
2020-02-11 08:30:08 +00:00
Joan Sanchez 91210c3a0d 1684 - Log old quantity value
gitea/salix/1684-ticket_transfer_salesLog This commit looks good Details
2020-02-11 08:19:03 +01:00
Joan Sanchez f2fdce11cd Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/dev This commit looks good Details
2020-02-10 14:54:59 +01:00
Joan Sanchez 8ad2344735 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/test This commit looks good Details
2020-02-10 14:54:21 +01:00
Bernat Exposito Domenech d26597c395 fix ticket.sale sms
gitea/salix/master This commit looks good Details
2020-02-10 14:34:53 +01:00
Bernat Exposito Domenech d1c8c8ad58 ticket/client.sms validations 2020-02-10 14:33:38 +01:00
Joan Sanchez e1942875af 1684 - Log transfer old values
gitea/salix/1684-ticket_transfer_salesLog Something is wrong with the build of this commit Details
2020-02-10 14:32:52 +01:00
Bernat Exposito Domenech f6674448f8 ticket/client.sms validations
gitea/salix/2090-sms.validations This commit looks good Details
2020-02-10 13:22:43 +01:00
Joan Sanchez cdef356e8f Merge branch '2091-ticket_sms' of verdnatura/salix into dev
gitea/salix/dev This commit looks good Details
2020-02-10 08:52:34 +00:00
Joan Sanchez 829f9a67bc Merge branch '2007-e2e-invoiceout-summary' of verdnatura/salix into dev
gitea/salix/dev This commit looks good Details
2020-02-10 08:47:49 +00:00
Bernat Exposito Domenech bafec3ce90 fix ticket.sale sms
gitea/salix/2091-ticket_sms This commit looks good Details
2020-02-10 09:36:40 +01:00
Bernat Exposito Domenech 7a643eff34 fix index step-two
gitea/salix/2041-ticket_datos_basico This commit looks good Details
2020-02-10 07:03:09 +01:00
Carlos Jimenez Ruiz 0a554afdb2 2007 e2e invoiceOut summary
gitea/salix/2007-e2e-invoiceout-summary This commit looks good Details
2020-02-07 15:42:11 +01:00
Bernat Exposito Domenech dd368a8c3f refactor ticket.basicData steps
gitea/salix/2041-ticket_datos_basico This commit looks good Details
2020-02-07 13:38:32 +01:00
Carlos Jimenez Ruiz f28a80b855 #2078 ticket. step-one 2020-02-07 11:25:56 +01:00
Carlos Jimenez Ruiz ca94f03c58 Merge branch '2036-claim_action_show_snackbar' of verdnatura/salix into dev
gitea/salix/dev There was a failure building this commit Details
2020-02-07 08:27:36 +00:00
Joan Sanchez b192cb15c0 Show data save snackbar on auto-save
gitea/salix/2036-claim_action_show_snackbar This commit looks good Details
2020-02-07 07:47:11 +01:00
Bernat Exposito Domenech 2f81727594 reload_card_volume
gitea/salix/2080-reload_card_volume This commit looks good Details
2020-02-07 07:43:22 +01:00
Joan Sanchez 4deda8588b Merge branch '2029-fix_item_request_filters' of verdnatura/salix into dev
gitea/salix/dev This commit looks good Details
2020-02-07 06:09:02 +00:00
Joan Sanchez b623646f25 removed console
gitea/salix/2029-fix_item_request_filters This commit looks good Details
2020-02-07 07:02:27 +01:00
Javi Gallego 5d0f72af4e zoneDoCalc
gitea/salix/test This commit looks good Details
2020-02-06 16:04:23 +01:00
Bernat Exposito Domenech 5cd3bde306 ticketRequest front test
gitea/salix/2054-ticket_request_frontTest This commit looks good Details
2020-02-06 14:59:00 +01:00
Joan Sanchez 3e0fd10b41 2029 - Item request fixes & searchbar filters working
gitea/salix/2029-fix_item_request_filters This commit looks good Details
2020-02-06 14:33:28 +01:00
Carlos Jimenez Ruiz a3a7b4cbaa Merge branch '2084-order_catalog_keep_category' of verdnatura/salix into dev
gitea/salix/dev This commit looks good Details
n1ce
2020-02-06 12:52:00 +00:00