Commit Graph

421 Commits

Author SHA1 Message Date
Carlos Jimenez Ruiz bde6c4495d e2e path updated + 2 new tasks for broken tests 2020-09-16 16:10:43 +02:00
Carlos Jimenez Ruiz 5b69ce983c salesPersonUser replaces salesPerson relation 2020-09-15 19:43:07 +02:00
Carlos Jimenez Ruiz 13a5c4c4c9 test enhanced 2020-09-14 13:58:42 +02:00
Carlos Jimenez Ruiz 0b4c53a655 added invoiceOut descriptor 2020-09-14 13:11:53 +02:00
Bernat Exposito Domenech 0cf99a5a83 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2438-export_production 2020-09-10 11:34:35 +02:00
Bernat Exposito Domenech 348412c5db Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2245-ticket_component 2020-09-09 15:50:06 +02:00
Bernat Exposito Domenech d4b6d7cd96 cr changes 2020-09-09 15:49:59 +02:00
Bernat Exposito Domenech 9ff7232b50 export production and fix test 2020-09-09 12:54:10 +02:00
Bernat Exposito Domenech 5bb8aacfb0 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2245-ticket_component 2020-09-09 11:12:18 +02:00
Joan Sanchez d0ac1b621c Merge branch 'dev' into 2385-worker_descriptor_refactor 2020-09-09 09:06:11 +00:00
Bernat Exposito Domenech f99fb69d48 front and back test 2020-09-09 08:20:27 +02:00
Joan Sanchez db081501eb 2440 - Ticket filter hotfix 2020-09-09 08:14:17 +02:00
Bernat Exposito Domenech d79cffb2c3 back test for getComponentsSum 2020-09-08 08:13:54 +02:00
Bernat Exposito Domenech 174cea7bc3 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2245-ticket_component 2020-09-08 07:17:23 +02:00
Bernat Exposito Domenech 92e14d5292 update getComponentSum 2020-09-08 07:17:16 +02:00
Joan Sanchez b848fa52f2 2385 - Replaced worker nickname 2020-09-03 15:11:16 +02:00
Javi Gallego b4952002a3 Merge branch 'dev' into 2411-ticket-expedition-añadir-campo-packagingFk 2020-09-01 06:49:09 +00:00
Joan Sanchez 6297d09de2 Updated syntax 2020-08-31 12:14:39 +02:00
Joan Sanchez baf9ec6e70 2416 - Item request - Added state filter 2020-08-31 08:32:30 +02:00
Javi Gallego 8b26c41b7f campo packageFk 2020-08-28 17:06:27 +02:00
Joan Sanchez 4d8a84e774 Fixed back unit tests 2020-08-20 08:45:03 +02:00
Joan Sanchez f13c47ce6d Ticket problems filter fix 2020-08-17 14:31:26 +02:00
Bernat Exposito Domenech 0d689a8c01 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2245-ticket_component 2020-08-13 10:43:25 +02:00
Joan Sanchez 88c5b6f8a6 Changed ticket problems min date 2020-08-13 08:23:55 +02:00
Carlos Jimenez Ruiz 9402f368f6 ticket index and zone descriptor refactor 2020-07-30 12:51:19 +02:00
Bernat Exposito Domenech b972353bb4 create method getComponentSum 2020-07-21 11:11:09 +02:00
Bernat Exposito Domenech 064b950773 export production 2020-07-16 12:10:18 +02:00
Bernat Exposito Domenech f7100f11ee first step add right menu in ticket components 2020-07-16 07:43:07 +02:00
Joan Sanchez 6aca80b075 Merge branch 'dev' into 2338-ticket_weekly 2020-07-07 12:34:04 +00:00
Joan Sanchez 53d672152b Merge branch 'dev' into 2343-exportar_produccion 2020-07-07 06:19:12 +00:00
Carlos Jimenez Ruiz c801d8a969 Merge branch '1368-ticket_sale_refactor' of https://gitea.verdnatura.es/verdnatura/salix into 1368-ticket_sale_refactor 2020-07-01 14:45:53 +02:00
Carlos Jimenez Ruiz 354123dc86 e2e toolkit 2.0 + refactors 2020-07-01 14:45:48 +02:00
Joan Sanchez b40e09a6cb Methods refactor & updated back unit tests 2020-07-01 14:28:05 +02:00
Joan Sanchez 0a327087ce Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1368-ticket_sale_refactor 2020-07-01 11:57:16 +02:00
Javi Gallego 039eec7d26 test excepto fallo e2e 2020-06-30 10:16:22 +02:00
Javi Gallego db06626675 refactor 2020-06-29 14:26:27 +02:00
Bernat Exposito Domenech faee28cb01 fix bugs in ticket weekly 2020-06-29 09:35:18 +02:00
Bernat Exposito Domenech ea1eb16060 export structure 2020-06-29 07:32:08 +02:00
Javi Gallego 962436b8bb 2344 ticket sale descuento usuario 2020-06-25 17:12:53 +02:00
Joan Sanchez d4c78b46c1 1368 - First sale refactor 2020-06-23 13:40:49 +02:00
Carlos Jimenez Ruiz e6a72d0f09 clean code refactor 2020-06-18 15:26:15 +02:00
Carlos Jimenez Ruiz 4d97357213 update estate without model.refresh() 2020-06-18 13:50:52 +02:00
Carlos Jimenez Ruiz edea60dd94 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2319_show_delivery_note 2020-06-17 15:38:49 +02:00
Carlos Jimenez Ruiz 2abd45f498 setDelivered and open delivery notes and tests 2020-06-17 15:38:37 +02:00
Joan Sanchez fd97845979 Revert "Removed sms excluded tests"
This reverts commit 30912bd5e9.
2020-06-17 14:00:04 +02:00
Joan Sanchez 30912bd5e9 Removed sms excluded tests 2020-06-16 15:11:24 +02:00
Joan Sanchez dddfe2773a 2293 - getVolume() call to saleVolume 2020-06-12 11:26:32 +02:00
Carlos Jimenez Ruiz 538ae75b89 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2283_e2e_delete_ticket_with_stowaway 2020-06-10 16:24:17 +02:00
Joan Sanchez 5edfc59d97 Updated unit test 2020-06-10 13:57:32 +02:00
Joan Sanchez 461fec7e64 Updated unit test 2020-06-10 13:57:08 +02:00
Carlos Jimenez Ruiz 4b1e79a433 2314 server side unit test fixed 2020-06-10 13:50:03 +02:00
Joan Sanchez 3cfb8b4730 2323 - Filter by myTeam fix 2020-06-10 12:13:07 +02:00
Joan Sanchez 1fed4c7913 Contextmenu fixes 2020-06-09 12:16:40 +02:00
Carlos Jimenez Ruiz d8593ea3e0 Merge pull request '2176-contextmenu' (#302) from 2176-contextmenu into dev
Reviewed-by: Carlos Jimenez <carlosjr@verdnatura.es>
2020-06-08 12:59:59 +00:00
Joan Sanchez ba9a44dec1 Updated back unit test 2020-06-08 13:06:33 +02:00
Joan Sanchez ab1e8fb622 2176 First working version 2020-06-08 12:14:27 +02:00
Joan Sanchez 181f2f0148 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2176-contextmenu 2020-06-08 08:19:18 +02:00
Javi Gallego faa053a3d2 Merge branch 'dev' into 2035-el-parametro-vShowExpiredZones 2020-06-05 10:01:52 +02:00
Javi Gallego b40be5cca9 2035 2020-06-05 10:01:21 +02:00
Bernat Exposito Domenech a81862baad set deleteded skiped 2020-06-05 08:29:51 +02:00
Bernat Exposito Domenech f340466daf fix test 2296 2020-06-04 14:23:48 +02:00
Joan Sanchez 94dcf7679b Merge pull request '2265-item_request_filters' (#289) from 2265-item_request_filters into dev
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2020-06-03 10:54:41 +00:00
Joan Sanchez 613937dc8d Fixed order 2020-06-03 12:21:03 +02:00
Joan Sanchez 18edd523d2 Excluded failing test 2020-06-03 11:40:18 +02:00
Joan Sanchez b7ceeae65a Excluded back unit tests. TLS error 2020-06-03 11:27:14 +02:00
Joan Sanchez 751f79373a Merge pull request '2230-log_ticket_request' (#282) from 2230-log_ticket_request into dev
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2020-06-02 09:28:14 +00:00
Bernat Exposito fac64c45c0 Merge pull request 'zone delete' (#285) from 2244-zone_descriptor into dev
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2020-06-02 09:18:24 +00:00
Bernat Exposito Domenech aac47e52e9 update log 2020-06-02 11:15:07 +02:00
Joan Sanchez a0767a6ea2 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2265-item_request_filters 2020-06-02 10:56:40 +02:00
Joan Sanchez 1e4f36b775 Updated back unit test 2020-06-02 09:34:42 +02:00
Bernat Exposito Domenech 546272cc3f zone delete 2020-06-02 08:59:04 +02:00
Joan Sanchez 052c51cee5 2282 - Change stowaway state to FIXING 2020-06-01 12:47:04 +02:00
Joan Sanchez 3f1109aee3 Test changes 2020-05-29 12:10:04 +02:00
Joan Sanchez 90ae1562dd Added filters 2020-05-29 11:10:58 +02:00
Bernat Exposito Domenech 8be929c1da log tiquet request 2020-05-27 08:07:14 +02:00
Javi Gallego d8871c0bce cr 2020-05-26 10:37:52 +02:00
Joan Sanchez 4d2d57d646 2265 Changes to filter 2020-05-26 08:08:09 +02:00
Javi Gallego 692af6078c Merge pull request 'Tarea-#2242-zone-upcomingDeliveries' (#260) from Tarea-#2242-zone-upcomingDeliveries into dev
Reviewed-by: Juan Ferrer <juan@verdnatura.es>
2020-05-19 10:21:33 +00:00
Javi Gallego a7e6e3d4b7 cr juan 2020-05-19 08:46:42 +02:00
Bernat Exposito Domenech 2681060878 update mehod ticket summary 2020-05-18 14:59:58 +02:00
Bernat Exposito Domenech c205c173f8 invoiceOut descriptor popover in ticket summary 2020-05-18 10:28:33 +02:00
Javi Gallego 3815edfbea falta CR 2020-05-15 12:17:34 +02:00
Javi Gallego 6dacf20bd9 ticket.index modificar orden de las secciones 2020-04-23 17:59:46 +02:00
Javi Gallego dbb2257430 test de zone_getLanded y zone_getFromGeo 2020-04-20 13:49:33 +02:00
Javi Gallego 09e425c33c 2174 ticket.weekly con campo agencyModeFk con E2E 2020-04-08 12:33:36 +02:00
Joan Sanchez 59fadf410e Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2208-ticket_summary 2020-03-27 11:45:10 +01:00
Joan Sanchez d640b66ef5 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1934-ticket_stowaway 2020-03-27 11:22:00 +01:00
Bernat Exposito Domenech 74b27778ab add phones in ticket summary 2020-03-27 11:10:20 +01:00
Joan Sanchez 598ebe96d1 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2203-ticket_sale 2020-03-27 11:06:35 +01:00
Joan Sanchez d4ca58edad Updated back unit test 2020-03-27 09:10:30 +01:00
Joan Sanchez 835c415ba7 1934 - Moved procedure logic to method 2020-03-26 14:45:38 +01:00
Bernat Exposito Domenech 6928092594 fix ticket.sale state autocomplete 2020-03-26 12:00:07 +01:00
Joan Sanchez 9bae89a672 Updated unit test 2020-03-23 16:03:27 +01:00
Joan Sanchez 27b1376799 changes 2020-03-23 11:21:25 +01:00
Bernat Exposito Domenech f6ca9eee01 ticketlog in componentUpdate 2020-03-16 09:13:44 +01:00
Bernat Exposito Domenech fdd1c73485 refactor componentUpdate 2020-03-13 12:26:15 +01:00
Bernat Exposito Domenech 3ab80e1479 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2088-ticket_datosBasicos 2020-03-12 12:04:35 +01:00
Joan Sanchez 6d437d0e2e Allow empty agency on ticket creation 2020-03-10 11:46:58 +01:00
Joan Sanchez 24becf7872 Updated var names 2020-03-04 11:17:35 +01:00
Joan Sanchez d6278e0df9 2164 - Show confirmation only when data is not empty 2020-03-04 09:26:12 +01:00