Commit Graph

563 Commits

Author SHA1 Message Date
Joan Sanchez fbc11b7a39 Merge branch 'dev' into 2921-notification_url
gitea/salix/pipeline/head This commit looks good Details
2021-05-20 08:23:45 +00:00
Javi Gallego df073cce2f refactor tod usa get sales
gitea/salix/pipeline/head This commit looks good Details
2021-05-19 17:04:13 +02:00
Carlos Jimenez Ruiz 2494af0113 removed unused relation from item @addSale 2021-05-19 15:33:35 +02:00
Carlos Jimenez Ruiz 5eb0ab8296 add and edit sales no longer intervene the prices
gitea/salix/pipeline/head This commit looks good Details
2021-05-19 15:25:49 +02:00
Carlos Jimenez Ruiz 72a0b774de add and get sales now sets item.price from packaging for EMB items
gitea/salix/pipeline/head This commit looks good Details
2021-05-19 14:15:28 +02:00
Joan Sanchez a5c3ba3926 2921 - Changed the ticket url of rocket notifications
gitea/salix/pipeline/head This commit looks good Details
2021-05-19 10:26:58 +02:00
Carlos Jimenez Ruiz 1e8ab4d348 added transactions to several endpoints 2021-05-14 19:21:04 +02:00
Joan Sanchez 6fdb91fdc8 Removed line
gitea/salix/pipeline/head This commit looks good Details
2021-05-13 10:20:22 +02:00
Joan Sanchez e6e91ced99 2905 - Restore ticket shipped and landed 2021-05-13 08:56:26 +02:00
Joan Sanchez 88616862cb Updated unit tests
gitea/salix/pipeline/head This commit looks good Details
2021-05-12 09:12:46 +02:00
Carlos Jimenez Ruiz 420f05bb03 mocked api client due to service instability
gitea/salix/pipeline/head This commit looks good Details
2021-04-16 12:40:41 +02:00
Carlos Jimenez Ruiz 847e0bd2c8 tests fixed for production sneaky changes 2021-03-30 14:43:21 +02:00
Joan Sanchez e2a9a64f88 #2871 and #2868. Included ticket filter unit test 2021-03-30 11:20:26 +02:00
Joan Sanchez eddd769af0 Excluded unit test
gitea/salix/pipeline/head This commit looks good Details
2021-03-29 08:39:33 +02:00
Joan Sanchez dbb6ccd89d Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/pipeline/head This commit looks good Details
2021-03-29 07:50:16 +02:00
Joan Sanchez 320e3143cd Ticket filter hotfix
gitea/salix/pipeline/head This commit looks good Details
2021-03-26 12:51:14 +01:00
Joan Sanchez 4dbcc0dd5c HOTFIX: Ticket filter changed ticketGetTotal() args
gitea/salix/pipeline/head This commit looks good Details
2021-03-26 12:32:32 +01:00
jorgebl e12be7bf0d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2817-translate_ticket_request_message 2021-03-18 13:40:56 +01:00
Joan Sanchez 565162740a Updated unit tests 2021-03-15 16:35:55 +01:00
Joan Sanchez 0ec6d273e6 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2734-invoice_report
gitea/salix/pipeline/head There was a failure building this commit Details
2021-03-15 13:49:16 +01:00
Joan Sanchez bd081f9fd6 2734 - Make invoice PDF refactor
gitea/salix/pipeline/head There was a failure building this commit Details
2021-03-15 13:43:22 +01:00
Joan Sanchez 92aa9eb933 Removed ticket total temporary table
gitea/salix/pipeline/head This commit looks good Details
2021-03-15 06:52:15 +01:00
Joan Sanchez c3bb099b85 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev 2021-03-15 06:50:42 +01:00
Joan Sanchez 6cb620a41d Ticket filter fix
gitea/salix/pipeline/head This commit looks good Details
2021-03-14 17:20:42 +01:00
Joan Sanchez 7b94cc2942 Ticket filter test
gitea/salix/pipeline/head This commit looks good Details
2021-03-14 17:12:31 +01:00
jorgebl c74b635a1a Translate and show url of item 2021-03-12 12:24:08 +01:00
Carlos Jimenez Ruiz 674b959bbc minor refactor
gitea/salix/pipeline/head This commit looks good Details
2021-03-11 15:14:08 +01:00
Joan Sanchez 1719f53111 2734 - Recreate invoice
gitea/salix/pipeline/head This commit looks good Details
2021-03-11 08:58:34 +01:00
Carlos Jimenez Ruiz 0cb7ddd9ce ticket.total with and witout VAT refactor 2021-03-10 19:25:26 +01:00
Carlos Jimenez Ruiz 3374356d58 both created tickets are now discarded after tests
gitea/salix/pipeline/head This commit looks good Details
2021-02-11 11:53:30 +01:00
Javi Gallego f87ea1b051 arrow-spacing
gitea/salix/pipeline/head There was a failure building this commit Details
2021-02-10 08:13:45 +01:00
Javi Gallego 3a3dae179c done
gitea/salix/pipeline/head There was a failure building this commit Details
2021-02-10 07:58:11 +01:00
Carlos Jimenez Ruiz 532cb582cf columns moved and no refresh on stateState changes 2021-02-03 17:01:43 +01:00
Javi Gallego 7bdfb36f25 minor refactor
gitea/salix/pipeline/head This commit looks good Details
2021-01-22 14:30:46 +01:00
Javi Gallego aab9797d3f Merge branch 'dev' into 2479-factura-ticket
gitea/salix/pipeline/head This commit looks good Details
2021-01-21 13:40:55 +01:00
Javi Gallego 3dc50e8a16 test ok
gitea/salix/pipeline/head This commit looks good Details
2021-01-21 13:39:40 +01:00
Carlos Jimenez Ruiz 01191b3f0f excluded faling tests for future fixing 2021-01-20 14:43:20 +01:00
Javi Gallego 4cdbb85e30 primer comit
gitea/salix/pipeline/head This commit looks good Details
2021-01-20 13:53:49 +01:00
Carlos Jimenez Ruiz 7ec1e4272a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2564-item_priceFixed 2021-01-19 20:56:40 +01:00
Joan Sanchez 8c8891f8e3 Requested changes
gitea/salix/pipeline/head There was a failure building this commit Details
2021-01-19 13:06:10 +01:00
Carlos Jimenez Ruiz 8d6dd3e03a minor refactors 2021-01-18 14:17:01 +01:00
Carlos Jimenez Ruiz 4e7d64e5ca re-enabled working unit test
gitea/salix/pipeline/head This commit looks good Details
2020-12-31 11:17:42 +01:00
Joan Sanchez 910caf5689 2661 - Added clone options
gitea/salix/pipeline/head This commit looks good Details
2020-12-28 14:53:26 +01:00
Joan Sanchez 42cd2356a2 Refactor v2
gitea/salix/pipeline/head There was a failure building this commit Details
2020-12-18 17:23:04 +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
Joan Sanchez 1ba1d27ba0 2576 - Photo upload component
gitea/salix/pipeline/head There was a failure building this commit Details
2020-11-27 13:10:39 +01:00
Bernat Exposito 78f25e0b46 export production 2020-11-25 12:37:44 +01:00
Joan Sanchez ac5f30924a Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2020-11-18 08:20:46 +01:00
Joan Sanchez 0fc01b2316 1419 - Claim update discount hotfix
gitea/salix/pipeline/head This commit looks good Details
2020-11-18 08:16:37 +01:00
Joan Sanchez 637116b17d Added descriptor-menu component
gitea/salix/pipeline/head There was a failure building this commit Details
2020-11-09 14:52:25 +01:00
Javi Gallego a472ce9a81 Merge branch 'dev' into 2510-client-address-create-test
gitea/salix/pipeline/head This commit looks good Details
2020-10-30 17:24:20 +01:00
Javi Gallego b50ae7b8ca testback arreglados
gitea/salix/pipeline/head This commit looks good Details
2020-10-30 15:50:59 +01:00
Carlos Jimenez Ruiz 2f6b3f0c38 small refactors for #2512 2020-10-30 10:45:55 +01:00
Javi Gallego 31b5a140d4 test completados 2020-10-30 10:07:53 +01:00
Javi Gallego 3fdc9c315d Merge branch 'dev' into 2510-client-address-create-test
gitea/salix/pipeline/head This commit looks good Details
2020-10-30 08:40:47 +01:00
Joan Sanchez 3779a7c7a5 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev 2020-10-22 13:00:48 +02:00
Joan Sanchez f87a7664e5 Added loggable utils
gitea/salix/pipeline/head This commit looks good Details
2020-10-22 11:24:53 +02:00
Joan Sanchez fc9b9eb718 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2020-10-22 07:49:04 +02:00
Joan Sanchez d3532608e1 Changed oldValue
gitea/salix/pipeline/head This commit looks good Details
2020-10-21 14:05:14 +02:00
Joan Sanchez 628154b7e8 Trigger jenkins
gitea/salix/pipeline/head This commit looks good Details
2020-10-21 13:40:54 +02:00
Joan Sanchez c87783b446 2528 - Rocket notifications hotfix
gitea/salix/pipeline/head This commit looks good Details
2020-10-21 13:25:52 +02:00
Javi Gallego ef7a886d86 Merge branch 'dev' into 2510-client-address-create-test
gitea/salix/pipeline/head This commit looks good Details
2020-10-21 10:13:04 +02:00
Joan Sanchez 3730bf86cc Updated destinatary
gitea/salix/pipeline/head This commit looks good Details
2020-10-20 16:05:05 +02:00
Joan Sanchez 86d3e2d689 Changed message destinatary
gitea/salix/pipeline/head This commit looks good Details
2020-10-20 16:03:07 +02:00
Joan Sanchez 611e1a3802 Updated unit test
gitea/salix/pipeline/head This commit looks good Details
2020-10-20 15:13:12 +02:00
Joan Sanchez f7e9372bf0 2525 - Change to past date 2020-10-20 15:12:00 +02:00
Joan Sanchez ffcb3629c5 Updated unit test
gitea/salix/pipeline/head This commit looks good Details
2020-10-20 15:01:02 +02:00
Joan Sanchez 7d0790684b 2525 - Change to past date
gitea/salix/pipeline/head This commit looks good Details
2020-10-20 14:54:23 +02:00
Javi Gallego 4aea284703 WIP: a falta de e2e
gitea/salix/pipeline/head This commit looks good Details
2020-10-20 14:42:23 +02:00
Carlos Jimenez Ruiz b96007aa62 fixed login/out problems at random + others
gitea/salix/pipeline/head This commit looks good Details
2020-10-16 11:16:24 +02:00
Carlos Jimenez Ruiz c622175192 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2488-jasmine_true_random
gitea/salix/pipeline/head This commit looks good Details
2020-10-15 18:57:33 +02:00
Carlos Jimenez Ruiz dd6035606f some more tests fixed + refactors 2020-10-15 18:57:27 +02:00
Carlos Jimenez Ruiz 64b65d204a excluded confirm with no easy fix for pollution 2020-10-14 11:16:23 +02:00
Carlos Jimenez Ruiz b6b84cfea7 more tests fixed + small refactors 2020-10-08 16:00:19 +02:00
Joan Sanchez 355f95ae40 2473 - Added ticket restore option
gitea/salix/pipeline/head This commit looks good Details
2020-10-08 13:42:20 +02:00
Joan Sanchez eceb33cce0 2473 - Added restore method
gitea/salix/pipeline/head This commit looks good Details
2020-10-07 11:00:26 +02:00
Carlos Jimenez Ruiz 89fb980f14 some tests fixed 2020-10-06 10:15:27 +02:00
Carlos Jimenez Ruiz 27d2c59358 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2488-jasmine_true_random 2020-10-05 16:09:30 +02:00
Bernat Exposito Domenech 161313ad15 refactor getComponentSum
gitea/salix/pipeline/head This commit looks good Details
2020-10-02 13:58:48 +02:00
Carlos Jimenez Ruiz ff3b75267a priceDifference test fix + refactor 2020-10-02 09:39:58 +02:00
Carlos Jimenez Ruiz 1e55632b94 refactor & fix regularize claim and prices Diff
gitea/salix/pipeline/head This commit looks good Details
2020-09-29 13:28:02 +02:00
Carlos Jimenez Ruiz 40abd68734 fix byWarehouse and ticket.filter tests
gitea/salix/pipeline/head This commit looks good Details
2020-09-29 13:11:11 +02:00
Carlos Jimenez Ruiz 6afee4924c Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2457-fix_regularizeClaim_unit_test 2020-09-29 08:44:33 +02:00
Joan Sanchez a1349de32d Merge branch 'dev' into 2381-mariaDB
gitea/salix/pipeline/head This commit looks good Details
2020-09-28 06:18:53 +00:00
Joan Sanchez 3e2f85dbd2 Merge branch 'dev' into 2458-ticket_index_pending
gitea/salix/pipeline/head This commit looks good Details
2020-09-28 06:13:39 +00:00
Joan Sanchez 0438171a47 Merge branch 'dev' into 2381-mariaDB
gitea/salix/pipeline/head This commit looks good Details
2020-09-28 06:09:48 +00:00
Bernat Exposito Domenech 790c9bfe6f update models and fixtures
gitea/salix/pipeline/head This commit looks good Details
2020-09-25 14:50:04 +02:00
Joan Sanchez f1d36df558 #2458 - Removed states from pending tickets
gitea/salix/pipeline/head This commit looks good Details
2020-09-24 15:00:00 +02:00
Joan Sanchez de3c7acb08 Merge branch 'dev' into 2381-mariaDB
gitea/salix/pipeline/head This commit looks good Details
2020-09-24 12:30:44 +00:00
Carlos Jimenez Ruiz 87e4765a1c fixed ticket-weekly backend unit test
gitea/salix/pipeline/head This commit looks good Details
2020-09-22 16:53:47 +02:00
Joan Sanchez 89667a18c9 Handle ticket without old state
gitea/salix/pipeline/head This commit looks good Details
2020-09-22 07:50:30 +02:00
Juan Ferrer 6abd707a6d Tests fixed
gitea/salix/pipeline/head This commit looks good Details
2020-09-21 19:16:51 +02:00
Juan Ferrer 3880e21ce3 Test fixes 2020-09-21 16:09:34 +02:00
Carlos Jimenez Ruiz bde6c4495d e2e path updated + 2 new tasks for broken tests
gitea/salix/pipeline/head This commit looks good Details
2020-09-16 16:10:43 +02:00
Carlos Jimenez Ruiz 5b69ce983c salesPersonUser replaces salesPerson relation
gitea/salix/pipeline/head This commit looks good Details
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
gitea/salix/pipeline/head This commit looks good Details
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
gitea/salix/pipeline/head This commit looks good Details
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
gitea/salix/pipeline/head This commit looks good Details
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
gitea/salix/pipeline/head This commit looks good Details
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
gitea/salix/pipeline/head This commit looks good Details
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
gitea/salix/pipeline/head This commit looks good Details
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
gitea/salix/pipeline/head This commit looks good Details
2020-09-03 15:11:16 +02:00
Javi Gallego b4952002a3 Merge branch 'dev' into 2411-ticket-expedition-añadir-campo-packagingFk
gitea/salix/pipeline/head This commit looks good Details
2020-09-01 06:49:09 +00:00
Joan Sanchez 6297d09de2 Updated syntax
gitea/salix/pipeline/head This commit looks good Details
2020-08-31 12:14:39 +02:00
Joan Sanchez baf9ec6e70 2416 - Item request - Added state filter
gitea/salix/pipeline/head This commit looks good Details
2020-08-31 08:32:30 +02:00
Javi Gallego 8b26c41b7f campo packageFk
gitea/salix/pipeline/head This commit looks good Details
2020-08-28 17:06:27 +02:00
Joan Sanchez 4d8a84e774 Fixed back unit tests
gitea/salix/pipeline/head This commit looks good Details
2020-08-20 08:45:03 +02:00
Joan Sanchez f13c47ce6d Ticket problems filter fix
gitea/salix/pipeline/head This commit looks good Details
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
gitea/salix/pipeline/head This commit looks good Details
2020-08-13 10:43:25 +02:00
Joan Sanchez 88c5b6f8a6 Changed ticket problems min date
gitea/salix/pipeline/head This commit looks good Details
2020-08-13 08:23:55 +02:00
Carlos Jimenez Ruiz 9402f368f6 ticket index and zone descriptor refactor
gitea/salix/pipeline/head This commit looks good Details
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
gitea/salix/pipeline/head There was a failure building this commit Details
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
gitea/salix/pipeline/head There was a failure building this commit Details
2020-07-07 12:34:04 +00:00
Joan Sanchez 53d672152b Merge branch 'dev' into 2343-exportar_produccion
gitea/salix/pipeline/head This commit looks good Details
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
gitea/salix/pipeline/head There was a failure building this commit Details
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
gitea/salix/pipeline/head This commit looks good Details
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
gitea/salix/pipeline/head There was a failure building this commit Details
2020-07-01 11:57:16 +02:00
Javi Gallego 039eec7d26 test excepto fallo e2e
gitea/salix/pipeline/head There was a failure building this commit Details
2020-06-30 10:16:22 +02:00
Javi Gallego db06626675 refactor
gitea/salix/pipeline/head This commit has test failures Details
2020-06-29 14:26:27 +02:00
Bernat Exposito Domenech faee28cb01 fix bugs in ticket weekly
gitea/salix/pipeline/head This commit looks good Details
2020-06-29 09:35:18 +02:00
Bernat Exposito Domenech ea1eb16060 export structure
gitea/salix/pipeline/head This commit looks good Details
2020-06-29 07:32:08 +02:00
Javi Gallego 962436b8bb 2344 ticket sale descuento usuario
gitea/salix/pipeline/head This commit has test failures Details
2020-06-25 17:12:53 +02:00
Joan Sanchez d4c78b46c1 1368 - First sale refactor
gitea/salix/pipeline/head There was a failure building this commit Details
2020-06-23 13:40:49 +02:00
Carlos Jimenez Ruiz e6a72d0f09 clean code refactor
gitea/salix/pipeline/head This commit looks good Details
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
gitea/salix/pipeline/head This commit looks good Details
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
gitea/salix/pipeline/head This commit looks good Details
2020-06-16 15:11:24 +02:00
Joan Sanchez dddfe2773a 2293 - getVolume() call to saleVolume
gitea/salix/pipeline/head There was a failure building this commit Details
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
gitea/salix/pipeline/head This commit looks good Details
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
gitea/salix/pipeline/head This commit looks good Details
2020-06-10 12:13:07 +02:00
Joan Sanchez 1fed4c7913 Contextmenu fixes
gitea/salix/pipeline/head This commit looks good Details
2020-06-09 12:16:40 +02:00
Carlos Jimenez Ruiz d8593ea3e0 Merge pull request '2176-contextmenu' (#302) from 2176-contextmenu into dev
gitea/salix/pipeline/head This commit looks good Details
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
gitea/salix/pipeline/head This commit has test failures Details
2020-06-08 12:14:27 +02:00
Joan Sanchez 181f2f0148 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2176-contextmenu
gitea/salix/pipeline/head This commit has test failures Details
2020-06-08 08:19:18 +02:00
Javi Gallego faa053a3d2 Merge branch 'dev' into 2035-el-parametro-vShowExpiredZones
gitea/salix/pipeline/head This commit looks good Details
2020-06-05 10:01:52 +02:00
Javi Gallego b40be5cca9 2035
gitea/salix/pipeline/head Build queued... Details
2020-06-05 10:01:21 +02:00
Bernat Exposito Domenech a81862baad set deleteded skiped
gitea/salix/pipeline/head This commit looks good Details
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
gitea/salix/pipeline/head This commit looks good Details
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2020-06-03 10:54:41 +00:00
Joan Sanchez 613937dc8d Fixed order
gitea/salix/pipeline/head This commit looks good Details
2020-06-03 12:21:03 +02:00
Joan Sanchez 18edd523d2 Excluded failing test
gitea/salix/pipeline/head There was a failure building this commit Details
2020-06-03 11:40:18 +02:00
Joan Sanchez b7ceeae65a Excluded back unit tests. TLS error
gitea/salix/pipeline/head There was a failure building this commit Details
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
gitea/salix/pipeline/head There was a failure building this commit Details
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2020-06-02 09:28:14 +00:00
Bernat Exposito Domenech aac47e52e9 update log
gitea/salix/pipeline/head This commit looks good Details
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
gitea/salix/pipeline/head This commit looks good Details
2020-06-02 10:56:40 +02:00
Joan Sanchez 1e4f36b775 Updated back unit test
gitea/salix/pipeline/head This commit looks good Details
2020-06-02 09:34:42 +02:00
Joan Sanchez 052c51cee5 2282 - Change stowaway state to FIXING
gitea/salix/pipeline/head Something is wrong with the build of this commit Details
2020-06-01 12:47:04 +02:00
Joan Sanchez 3f1109aee3 Test changes
gitea/salix/pipeline/head There was a failure building this commit Details
2020-05-29 12:10:04 +02:00
Joan Sanchez 90ae1562dd Added filters
gitea/salix/pipeline/head This commit looks good Details
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
gitea/salix/pipeline/head This commit looks good Details
2020-05-26 10:37:52 +02:00
Joan Sanchez 4d2d57d646 2265 Changes to filter
gitea/salix/pipeline/head This commit looks good Details
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
gitea/salix/pipeline/head This commit looks good Details
Reviewed-by: Juan Ferrer <juan@verdnatura.es>
2020-05-19 10:21:33 +00:00
Javi Gallego a7e6e3d4b7 cr juan
gitea/salix/pipeline/head This commit looks good Details
2020-05-19 08:46:42 +02:00
Bernat Exposito Domenech 2681060878 update mehod ticket summary
gitea/salix/pipeline/head This commit looks good Details
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
gitea/salix/pipeline/head This commit has test failures Details
2020-05-15 12:17:34 +02:00
Javi Gallego 6dacf20bd9 ticket.index modificar orden de las secciones
gitea/salix/pipeline/head This commit looks good Details
2020-04-23 17:59:46 +02:00
Javi Gallego dbb2257430 test de zone_getLanded y zone_getFromGeo
gitea/salix/pipeline/head This commit looks good Details
2020-04-20 13:49:33 +02:00
Javi Gallego 09e425c33c 2174 ticket.weekly con campo agencyModeFk con E2E
gitea/salix/pipeline/head This commit looks good Details
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
gitea/salix/pipeline/head This commit looks good Details
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
gitea/salix/pipeline/head This commit looks good Details
2020-03-27 11:22:00 +01:00
Bernat Exposito Domenech 74b27778ab add phones in ticket summary
gitea/salix/pipeline/head This commit looks good Details
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
gitea/salix/pipeline/head This commit looks good Details
2020-03-27 11:06:35 +01:00
Joan Sanchez d4ca58edad Updated back unit test
gitea/salix/pipeline/head This commit looks good Details
2020-03-27 09:10:30 +01:00
Joan Sanchez 835c415ba7 1934 - Moved procedure logic to method
gitea/salix/pipeline/head This commit has test failures Details
2020-03-26 14:45:38 +01:00
Bernat Exposito Domenech 6928092594 fix ticket.sale state autocomplete
gitea/salix/pipeline/head This commit looks good Details
2020-03-26 12:00:07 +01:00
Joan Sanchez 9bae89a672 Updated unit test
gitea/salix/pipeline/head This commit looks good Details
2020-03-23 16:03:27 +01:00
Joan Sanchez 27b1376799 changes
gitea/salix/pipeline/head This commit has test failures Details
2020-03-23 11:21:25 +01:00
Bernat Exposito Domenech f6ca9eee01 ticketlog in componentUpdate
gitea/salix/pipeline/head This commit looks good Details
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
gitea/salix/pipeline/head This commit looks good Details
2020-03-10 11:46:58 +01:00
Joan Sanchez 24becf7872 Updated var names
gitea/salix/pipeline/head This commit looks good Details
2020-03-04 11:17:35 +01:00
Joan Sanchez d6278e0df9 2164 - Show confirmation only when data is not empty
gitea/salix/pipeline/head This commit looks good Details
2020-03-04 09:26:12 +01:00
Joan Sanchez 7e694c3e80 2073 - Filter by pending tickets
gitea/salix/pipeline/head This commit looks good Details
2020-03-02 11:35:43 +01:00
Bernat Exposito Domenech 42b151c849 fix isEditable spec
gitea/salix/pipeline/head This commit has test failures Details
2020-03-02 09:43:22 +01:00
Bernat Exposito Domenech 63cd436d3c fix request changes 2020-03-02 08:30:33 +01:00
Bernat Exposito Domenech 4561b6eeef refactor ticket.isEditable
gitea/salix/2092-ticket_isEditable_refactor This commit looks good Details
2020-02-27 12:31:38 +01:00
Bernat Exposito Domenech 85db094f1d componentUpdate 2020-02-25 12:36:33 +01:00
Bernat Exposito Domenech 2fdd275085 log in ticketUpdate 2020-02-25 11:43:50 +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
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 2f089681df Don't throw error if no salesPerson is assigned 2020-02-20 12:52:05 +01:00