Commit Graph

1451 Commits

Author SHA1 Message Date
Joan Sanchez 6f245698f2 Merge branch 'dev' into 2620-mostrar-disponible
gitea/salix/pipeline/head This commit looks good Details
2021-05-21 06:29:43 +00:00
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 2e7d56cc26 Test fixes
gitea/salix/pipeline/head There was a failure building this commit Details
2021-05-12 12:11:27 +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
Joan Sanchez 8f3d2d892d Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2021-05-03 12:13:20 +02:00
Joan Sanchez 03e77685a1 SMS hotfix
gitea/salix/pipeline/head This commit looks good Details
2021-05-03 12:09:12 +02:00
Carlos Jimenez Ruiz 65457d6dac Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2167-entry_buy
gitea/salix/pipeline/head This commit looks good Details
2021-04-28 10:32:35 +02:00
Carlos Jimenez Ruiz daa94e4eb5 entry buy index 2021-04-28 10:32:24 +02:00
Javi Gallego 9ee1385cd1 test ok
gitea/salix/pipeline/head This commit looks good Details
2021-04-26 12:33:33 +02:00
Javi Gallego 4a7a4f6dcf test ok
gitea/salix/pipeline/head This commit looks good Details
2021-04-22 09:06:08 +02:00
Carlos Jimenez Ruiz 857c508391 Merge branch 'dev' into 2729-prices_popover
gitea/salix/pipeline/head This commit looks good Details
2021-04-19 07:59:09 +00: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 9a4c056059 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2729-prices_popover 2021-04-16 10:07:18 +02:00
Joan Sanchez bf976a3e8f 2729 - Prices popover refactor 2021-04-15 14:30:30 +02:00
Joan Sanchez 6b8074e32f 2878 - Splitted method into activeWithRole and activeWithInheritedRole
gitea/salix/pipeline/head This commit looks good Details
2021-04-13 14:08:10 +02:00
Carlos Jimenez Ruiz 6f0c48847a Merge branch 'dev' into 2815-ticket_without_state
gitea/salix/pipeline/head This commit looks good Details
2021-04-08 11:53:25 +00:00
Joan Sanchez af0307a419 2859 - Force translation for SMS
gitea/salix/pipeline/head This commit looks good Details
2021-04-08 13:39:11 +02:00
Joan Sanchez e40911e833 2815 - Fix ticket without state
gitea/salix/pipeline/head This commit looks good Details
2021-04-07 13:39:36 +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 3f0fe15763 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2021-03-29 07:50:34 +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
Carlos Jimenez Ruiz 41bb4cbaab deprecated vat and subTotal related methods + tests fixed 2021-03-24 16:43:54 +01:00
jorgebl e96fd3d1f7 Changed message
gitea/salix/pipeline/head This commit looks good Details
2021-03-22 16:11:52 +01:00
Joan Sanchez 985bcc61b1 Rollback
gitea/salix/pipeline/head This commit looks good Details
2021-03-22 09:11:02 +01:00
Joan Sanchez 59bf458ca5 Removed xdescribe 2021-03-22 09:10:45 +01:00
Joan Sanchez 29979d5367 Rollback
gitea/salix/pipeline/head This commit looks good Details
2021-03-22 09:10:12 +01:00
Joan Sanchez 7ac4d67f97 Empty value not being logged in
gitea/salix/pipeline/head This commit looks good Details
2021-03-22 09:08:27 +01:00
Joan Sanchez 6210e60896 2669 - Changes to the translate values function
gitea/salix/pipeline/head This commit looks good Details
2021-03-19 19:20:19 +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
Carlos Jimenez Ruiz 7c34555afd Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2787-change_css_date_time
gitea/salix/pipeline/head This commit looks good Details
2021-03-12 12:30:55 +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
Carlos Jimenez Ruiz 05ee2ee2d3 ticket.sale front unit test fix
gitea/salix/pipeline/head This commit looks good Details
2021-03-11 10:44:34 +01:00
Joan Sanchez 1ed4dd27d6 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2734-invoice_report
gitea/salix/pipeline/head This commit looks good Details
2021-03-11 08:59:02 +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
Joan Sanchez ab755e29c7 Merge branch 'dev' into 2787-change_css_date_time
gitea/salix/pipeline/head This commit looks good Details
2021-03-09 14:01:04 +00:00
Carlos Jimenez Ruiz 5c776c0f11 Merge branch 'dev' into 2703-ticket_step_one
gitea/salix/pipeline/head This commit looks good Details
2021-03-08 09:48:38 +00:00
Joan Sanchez e50dcf467f Requested changes
gitea/salix/pipeline/head This commit looks good Details
2021-03-03 12:21:04 +01:00
jorgebl 2ba7e922e6 Put time in 00:00 when field "shipped" change
gitea/salix/pipeline/head This commit looks good Details
2021-03-03 10:57:00 +01:00
Joan Sanchez 718021cff8 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2595-invoiceIn-index 2021-03-01 11:49:31 +01:00
jorgebl 0d7a41f862 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2804-ticket_descriptor_salesPerson
gitea/salix/pipeline/head This commit looks good Details
2021-02-25 15:52:18 +01:00
jorgebl b9594f5238 Add descriptor popover 2021-02-25 15:51:51 +01:00
jorgebl 56424925e9 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2787-change_css_date_time
gitea/salix/pipeline/head This commit looks good Details
2021-02-22 13:02:32 +01:00
Jorge Padawan aaf77677d1 Aligned title with column
gitea/salix/pipeline/head Build queued... Details
2021-02-16 15:50:48 +01:00
Jorge Padawan ac4a19841d Added shrink for date
gitea/salix/pipeline/head There was a failure building this commit Details
2021-02-16 15:40:20 +01:00
Jorge Padawan 4bcb948aff Updated code for better read 2021-02-12 16:41:29 +01:00
Jorge Padawan 1512a34a73 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2764-Ticket_sale_consignee
gitea/salix/pipeline/head This commit looks good Details
2021-02-12 11:57:54 +01:00
Joan Sanchez c270ec6207 Contextmenu fixes
gitea/salix/pipeline/head There was a failure building this commit Details
2021-02-11 15:06:41 +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
Jorge Padawan c3109c142a Line breaks have been put for better understanding
gitea/salix/pipeline/head This commit looks good Details
2021-02-05 13:11:18 +01:00
Jorge Padawan 25de8904b6 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2764-Ticket_sale_consignee
gitea/salix/pipeline/head There was a failure building this commit Details
2021-02-05 13:04:52 +01:00
Jorge Padawan 8dc291798f Added tooltip on address and removed workhouse 2021-02-05 13:04:32 +01:00
Joan Sanchez 3dd8ff5194 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2021-02-05 08:28:32 +01:00
Joan Sanchez 5bd7e4a67f Translation fix
gitea/salix/pipeline/head This commit looks good Details
2021-02-05 08:05:57 +01:00
Joan Sanchez f041e0d897 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2021-02-04 18:44:25 +01:00
Carlos Jimenez Ruiz a9b0a5c2bd order fixed
gitea/salix/pipeline/head This commit looks good Details
2021-02-04 10:04:16 +01:00
Carlos Jimenez Ruiz 532cb582cf columns moved and no refresh on stateState changes 2021-02-03 17:01:43 +01:00
Joan Sanchez a845f53f0a Bug fixes
gitea/salix/pipeline/head This commit looks good Details
2021-02-03 12:43:30 +01:00
Jorge Padawan 81f5192d08 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2692-add_advanced_search_engine2
gitea/salix/pipeline/head This commit looks good Details
2021-01-29 08:55:17 +01:00
Jorge Padawan 69e8dfc334 Merge branch '2692-add_advanced_search_engine2' of https://gitea.verdnatura.es/verdnatura/salix into 2692-add_advanced_search_engine2 2021-01-28 16:10:23 +01:00
Carlos Jimenez Ruiz 5c466e1163 vn-fetched-tags visual refactor 2021-01-28 15:10:47 +01:00
Carlos Jimenez Ruiz 3f12bfe8ae Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2745-ticket_descriptor_regenerate_invoice_e2e
gitea/salix/pipeline/head This commit looks good Details
2021-01-25 09:28:07 +01:00
Carlos Jimenez Ruiz fb798f4300 regenerate invoice added to descriptor path 2021-01-25 09:28:01 +01:00
Javi Gallego 228a642634 Merge branch 'dev' into 2479-factura-ticket 2021-01-22 14:31:28 +01:00
Javi Gallego 7bdfb36f25 minor refactor
gitea/salix/pipeline/head This commit looks good Details
2021-01-22 14:30:46 +01:00
Carlos Jimenez Ruiz 5ea222dc00 fixed translations
gitea/salix/pipeline/head This commit looks good Details
2021-01-22 12:02:03 +01:00
Joan Sanchez ad7be8f9b4 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2021-01-22 07:27:51 +01:00
Joan Sanchez 1c7325c1c0 2739 - Invoice fix
gitea/salix/pipeline/head This commit looks good Details
2021-01-22 07:26:29 +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 2f5eaf7318 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2564-item_priceFixed
gitea/salix/pipeline/head This commit looks good Details
2021-01-20 14:51:37 +01:00
Carlos Jimenez Ruiz 01191b3f0f excluded faling tests for future fixing 2021-01-20 14:43:20 +01:00
Joan Sanchez f125f7c80d Changed weekly translation
gitea/salix/pipeline/head This commit looks good Details
2021-01-20 13:57:48 +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 dfbf114161 Merge branch 'dev' into 2708-travel_extracommunity
gitea/salix/pipeline/head There was a failure building this commit Details
2021-01-19 12:10:06 +00: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 464366fdbe Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2564-item_priceFixed 2021-01-18 17:17:02 +01:00
Carlos Jimenez Ruiz 8d6dd3e03a minor refactors 2021-01-18 14:17:01 +01:00
Joan Sanchez 239e64db48 Updated unit test
gitea/salix/pipeline/head This commit looks good Details
2021-01-18 09:08:50 +01:00
Joan Sanchez 783a8dee48 2724 - Fix: Create new service type
gitea/salix/pipeline/head There was a failure building this commit Details
2021-01-18 08:55:57 +01:00
Jorge Padawan 9ca2e677bd Fix for good practique code 2021-01-12 10:15:33 +01:00
Jorge Padawan 809811ea10 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2650-add_button_edit_on_summaries
gitea/salix/pipeline/head This commit looks good Details
2021-01-12 07:40:10 +01:00
Joan Sanchez 7568a1c066 Updated unit tests
gitea/salix/pipeline/head This commit looks good Details
2021-01-11 14:54:24 +01:00
Jorge Padawan af55e2cc32 Add tooltip and modified sref for previews 2021-01-11 10:36:20 +01:00
Joan Sanchez 035bdfb1ad Rounded box
gitea/salix/pipeline/head This commit looks good Details
2021-01-11 10:08:33 +01:00
Joan Sanchez ffdc753ad4 2691 - Added "or" between date ranges and scope days
gitea/salix/pipeline/head This commit looks good Details
2021-01-11 08:48:53 +01:00
Jorge Padawan 5a30bf5fa4 2650 add links to edit on summaries 2021-01-08 15:43:33 +01:00
Joan Sanchez f8ba2534cc 2691 - Scope days changes
gitea/salix/pipeline/head This commit looks good Details
2021-01-08 14:32:48 +01:00
Joan Sanchez e5b13267e2 2605 - Ticket request send chat notification
gitea/salix/pipeline/head This commit looks good Details
2021-01-05 15:03:35 +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 c192a0e125 Merge pull request '2667-create_entryObservation' (#490) from 2667-create_entryObservation into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #490
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2020-12-24 08:59:33 +00:00
Jorge Padawan 259842c22d Retirado el parametro required por no utilizarse
gitea/salix/pipeline/head This commit looks good Details
2020-12-23 13:32:58 +01:00
Joan Sanchez 87f9a39e50 Merge branch 'dev' into 2666-closure_invalid_email
gitea/salix/pipeline/head This commit looks good Details
2020-12-23 12:29:36 +00:00
Bernat Exposito a21476e3df fix searchbar index
gitea/salix/pipeline/head This commit looks good Details
2020-12-23 12:42:41 +01:00
Joan Sanchez 6416b0ad79 2666 - Closure invalid email notification
gitea/salix/pipeline/head This commit looks good Details
2020-12-22 14:56:21 +01:00
Carlos Jimenez Ruiz 482cbd7195 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2622-route_tickets_refactor
gitea/salix/pipeline/head This commit looks good Details
2020-12-21 12:39:26 +01:00
Carlos Jimenez Ruiz 369a79b79f route.tickets refactor
gitea/salix/pipeline/head This commit looks good Details
2020-12-21 12:37:36 +01:00
Joan Sanchez 6717853efb Updated front tests
gitea/salix/pipeline/head This commit looks good Details
2020-12-18 18:02:41 +01:00
Joan Sanchez d8a2184695 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2576-photo_uploader 2020-12-18 17:24:30 +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
Carlos Jimenez Ruiz 0258c4a276 ticket module refactors 2020-12-16 10:21:20 +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
Bernat Exposito a1d8b3175e ticket descriptor translate
gitea/salix/pipeline/head This commit looks good Details
2020-12-09 15:26:57 +01:00
Bernat Exposito 96f603a44b refactor descriptors
gitea/salix/pipeline/head This commit looks good Details
2020-12-04 13:40:58 +01:00
Bernat Exposito aaee855da3 fix ticket component
gitea/salix/pipeline/head Build started... Details
2020-12-03 10:26:49 +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 06e7583f2b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2645-export_production
gitea/salix/pipeline/head This commit looks good Details
2020-11-25 12:47:17 +01:00
Bernat Exposito 78f25e0b46 export production 2020-11-25 12:37:44 +01:00
Joan Sanchez 8eb14a8bdc 2588 - No ellipsize on summary notes or address
gitea/salix/pipeline/head This commit looks good Details
2020-11-24 14:56:10 +01:00
Joan Sanchez d9e14a0c3a 2629 - Open ticket lines on new window
gitea/salix/pipeline/head This commit looks good Details
2020-11-24 12:10:02 +01:00
Joan Sanchez 80bae4de0a 2607 - Changed preview icon
gitea/salix/pipeline/head This commit looks good Details
2020-11-24 08:22:54 +01:00
Joan Sanchez 2469ce827e Removed commented code
gitea/salix/pipeline/head This commit looks good Details
2020-11-23 14:02:07 +01:00
Joan Sanchez c654e14cfe 2611 - Summary go to entity
gitea/salix/pipeline/head This commit looks good Details
2020-11-23 13:41:51 +01:00
Carlos Jimenez Ruiz 79ab228bca ticket descriptor path updated
gitea/salix/pipeline/head This commit looks good Details
2020-11-18 15:00:41 +01:00
Joan Sanchez 9f5ba5bb85 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2575-image_download
gitea/salix/pipeline/head This commit looks good Details
2020-11-18 10:44:00 +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 8a3f5345f4 Merge branch 'dev' into 2575-image_download
gitea/salix/pipeline/head This commit looks good Details
2020-11-16 13:54:47 +00:00
Carlos Jimenez Ruiz 8373c6f5d1 filter by selection + unit tests for travel index 2020-11-13 13:04:22 +01:00
Bernat Exposito 6fc14d569c Merge branch 'dev' into 2575-image_download
gitea/salix/pipeline/head This commit looks good Details
2020-11-13 08:32:39 +00:00
Joan Sanchez 0edd6071c8 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2020-11-13 07:43:02 +01:00
Joan Sanchez d174d7b15b Contextmenu filter hotfix
gitea/salix/pipeline/head This commit looks good Details
2020-11-13 07:38:18 +01:00
Joan Sanchez cb8e9655af Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2020-11-13 07:22:12 +01:00
Carlos Jimenez Ruiz b9e3db61db ticket advanced search grouped state translations
gitea/salix/pipeline/head This commit looks good Details
2020-11-12 13:33:33 +01:00
Joan Sanchez 23e8d64678 Contextmenu hotfix
gitea/salix/pipeline/head This commit looks good Details
2020-11-12 13:18:31 +01:00
Bernat Exposito 2454999938 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2575-image_download 2020-11-12 08:14:55 +01:00
Carlos Jimenez Ruiz 6cd1332a18 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2500-display_dates
gitea/salix/pipeline/head This commit looks good Details
2020-11-11 14:45:22 +01:00
Joan Sanchez b6f29d205c Merge branch 'dev' into 2425-ticket_descriptor_menu
gitea/salix/pipeline/head This commit looks good Details
2020-11-11 13:06:14 +00:00
Bernat Exposito eb8931bca5 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2575-image_download
gitea/salix/pipeline/head This commit looks good Details
2020-11-11 13:57:37 +01:00
Joan Sanchez 378982389a Requested chagnes
gitea/salix/pipeline/head This commit looks good Details
2020-11-11 13:44:42 +01:00
Joan Sanchez 75ff7c297f Removed max width
gitea/salix/pipeline/head This commit looks good Details
2020-11-11 12:37:59 +01:00
Joan Sanchez 024fda0f65 2591 - Data checked icon 2020-11-11 12:37:45 +01:00
Carlos Jimenez Ruiz 5d70794326 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2500-display_dates
gitea/salix/pipeline/head This commit looks good Details
2020-11-11 12:02:49 +01:00
Joan Sanchez 9d5765724b Removed max width
gitea/salix/pipeline/head This commit looks good Details
2020-11-11 09:17:34 +01:00
Joan Sanchez 5a08798b22 2591 - Data checked icon
gitea/salix/pipeline/head This commit looks good Details
2020-11-11 09:11:11 +01:00
Joan Sanchez d959dbc058 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2425-ticket_descriptor_menu
gitea/salix/pipeline/head This commit looks good Details
2020-11-11 07:34:34 +01:00
Carlos Jimenez Ruiz e22e74a725 expanded date columns + order index translations
gitea/salix/pipeline/head This commit looks good Details
2020-11-10 16:47:39 +01:00
Bernat Exposito 44d3cf748b change id in ticketLastState model
gitea/salix/pipeline/head This commit looks good Details
2020-11-10 11:44:41 +01:00
Joan Sanchez a93d9f91cc Updated unit tests
gitea/salix/pipeline/head This commit looks good Details
2020-11-10 10:38:25 +01:00
Carlos Jimenez Ruiz 282adfa7b6 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2425-ticket_descriptor_menu
gitea/salix/pipeline/head There was a failure building this commit Details
2020-11-09 16:06:29 +01:00
Carlos Jimenez Ruiz 54d31f15bb fixed collection tests pollution
gitea/salix/pipeline/head This commit looks good Details
2020-11-09 14:53:26 +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 28ec55b440 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2482-fix_worker_timeControl_e2e
gitea/salix/pipeline/head This commit looks good Details
2020-10-30 10:46:05 +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
Bernat Exposito Domenech ea03d06a62 Merge branch '2522-ticket_component' of https://gitea.verdnatura.es/verdnatura/salix into 2522-ticket_component
gitea/salix/pipeline/head This commit looks good Details
2020-10-29 11:46:57 +01:00
Bernat Exposito Domenech 551feed16f fix translate 2020-10-29 11:46:37 +01:00
Bernat Exposito 361af260a5 Merge branch 'dev' into 2522-ticket_component
gitea/salix/pipeline/head This commit looks good Details
2020-10-29 10:11:24 +00:00
Bernat Exposito Domenech 42d16d0258 ticket component refactor
gitea/salix/pipeline/head This commit looks good Details
2020-10-29 11:09:58 +01:00
Joan Sanchez 109fcb3ca4 2532 - Added icon taxDataChecked on ticket index
gitea/salix/pipeline/head This commit looks good Details
2020-10-28 09:57:39 +01:00
Bernat Exposito Domenech 15a906af24 link zone in ticket summary
gitea/salix/pipeline/head This commit looks good Details
2020-10-27 08:45:34 +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 7dfe7ee379 Merge branch 'dev' into 2510-client-address-create-test 2020-10-21 12:35:09 +02:00
Joan Sanchez 3c37f0e993 Merge branch 'dev' into 2428-anchor_directive
gitea/salix/pipeline/head This commit looks good Details
2020-10-21 08:32:31 +00: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
Joan Sanchez 0acb1e649d Updated unit test
gitea/salix/pipeline/head This commit looks good Details
2020-10-20 10:46:04 +02:00
Joan Sanchez d68aacc78a 2525 - Ticket basic data validate zone 2020-10-20 10:46:03 +02:00
Joan Sanchez ef42e95cef Updated unit test
gitea/salix/pipeline/head This commit looks good Details
2020-10-20 10:29:16 +02:00
Joan Sanchez c61c25fb91 2525 - Ticket basic data validate zone
gitea/salix/pipeline/head There was a failure building this commit Details
2020-10-20 10:19:12 +02:00
Joan Sanchez 011bba1660 Added vn-anchor to client and ticket index
gitea/salix/pipeline/head There was a failure building this commit Details
2020-10-19 09:05:38 +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 2045e35170 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2473-restore_ticket
gitea/salix/pipeline/head This commit looks good Details
2020-10-13 15:41:04 +02:00
Carlos Jimenez Ruiz 984a91d544 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2488-jasmine_true_random 2020-10-13 11:04:23 +02:00
Joan Sanchez 3f8a675785 2499 - Allow zero quantity
gitea/salix/pipeline/head This commit looks good Details
2020-10-13 08:42:13 +02:00
Carlos Jimenez Ruiz b6b84cfea7 more tests fixed + small refactors 2020-10-08 16:00:19 +02:00
Joan Sanchez 498841b274 Added unit test
gitea/salix/pipeline/head This commit looks good Details
2020-10-08 14:22:55 +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 0dbdb5103e 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-06 10:16:08 +02:00
Carlos Jimenez Ruiz 89fb980f14 some tests fixed 2020-10-06 10:15:27 +02:00
Joan Sanchez 085df7119f Merge branch 'dev' into 2492-index_refactor
gitea/salix/pipeline/head This commit looks good Details
2020-10-06 06:51:11 +00:00
Joan Sanchez 0b8d8a4f65 Added focus directive to searchbar
gitea/salix/pipeline/head This commit looks good Details
2020-10-06 08:17:12 +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
Javi Gallego 0294d2a845 Merge branch 'dev' into 2443 2020-10-05 09:07:00 +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 9dca47be97 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2484-Sale_priceDifference_test_fails 2020-10-02 09:40:15 +02:00
Carlos Jimenez Ruiz ff3b75267a priceDifference test fix + refactor 2020-10-02 09:39:58 +02:00
Javi Gallego 8d1709ea51 Merge branch 'dev' into 2443
gitea/salix/pipeline/head This commit looks good Details
2020-10-01 16:46:33 +02:00
Javi Gallego 2714857227 Merge branch 'dev' into 2443
gitea/salix/pipeline/head This commit looks good Details
2020-09-30 14:07:38 +02:00
Bernat Exposito Domenech 1bff4e3c4e fix test and refactor transferlines
gitea/salix/pipeline/head This commit looks good Details
2020-09-30 12:24:33 +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
Javi Gallego c909470f41 merge
gitea/salix/pipeline/head This commit looks good Details
2020-09-25 08:10:37 +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
Joan Sanchez 75ac6ad8d3 Updated unit test
gitea/salix/pipeline/head This commit looks good Details
2020-09-23 14:20:41 +02:00
Joan Sanchez a8589d6945 Autocomplete warehouse on agency selection
gitea/salix/pipeline/head There was a failure building this commit Details
2020-09-23 14:13:44 +02:00
Joan Sanchez c49614b8cf Merge branch 'dev' into 2449-ticket_basicData
gitea/salix/pipeline/head This commit looks good Details
2020-09-23 09:23:09 +00:00
Joan Sanchez 5ec5979a3e Updated tests
gitea/salix/pipeline/head This commit looks good Details
2020-09-23 11:21:25 +02: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
Joan Sanchez ae3d00bad1 Added new method
gitea/salix/pipeline/head There was a failure building this commit Details
2020-09-22 07:38:20 +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
Juan Ferrer fc6a19b60d Merge branch 'dev' into 2177-userModule 2020-09-21 14:10:15 +02:00
Carlos Jimenez Ruiz ed905341b3 removed autoload for where/searchF
gitea/salix/pipeline/head This commit looks good Details
2020-09-21 11:17:40 +02:00
Javi Gallego 8fb674819a ticket service
gitea/salix/pipeline/head This commit looks good Details
2020-09-21 10:35:39 +02:00
Joan Sanchez fa344f4ff6 2449 - Autocompletion
gitea/salix/pipeline/head There was a failure building this commit Details
2020-09-19 13:02:00 +02:00
Carlos Jimenez Ruiz 5d461b119c tests fix
gitea/salix/pipeline/head This commit looks good Details
2020-09-18 11:50:20 +02:00
Carlos Jimenez Ruiz c5dc84cbc2 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1988-autocomplete_prefetch
gitea/salix/pipeline/head This commit looks good Details
2020-09-17 20:16:29 +02:00
Carlos Jimenez Ruiz ea077e8d4a added auto-load to some combos 2020-09-17 20:12:52 +02:00
Javi Gallego 1b13e58e10 item basic-data añadir isFragile
gitea/salix/pipeline/head This commit looks good Details
2020-09-17 09:58:00 +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 031e40df51 removed unused dash if empty
gitea/salix/pipeline/head This commit looks good Details
2020-09-14 16:34:11 +02:00
Carlos Jimenez Ruiz 1eb088521c ticket.index ref and state columns merged
gitea/salix/pipeline/head This commit looks good Details
2020-09-14 16:08:37 +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
Juan Ferrer 4b5d2cd0dd 2177 account module
gitea/salix/pipeline/head There was a failure building this commit Details
LDAP test

RC1

SQL version changed

Tests fixes

Back & front tests fixed

All tests passed

Front and back tests plus some fixes
2020-09-11 14:36:16 +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
Carlos Jimenez Ruiz 12ceedd80c corrected some typos
gitea/salix/pipeline/head This commit looks good Details
2020-09-10 10:46:56 +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
Joan Sanchez 004c9d7341 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2020-09-09 08:27:08 +02: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
Carlos Jimenez Ruiz a00f64e7a2 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2402-entry_create 2020-09-03 16:29:38 +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
Joan Sanchez a3382300f9 2402 - Added create entry section
gitea/salix/pipeline/head This commit looks good Details
2020-09-02 14:08:56 +02:00
Carlos Jimenez Ruiz 605fbe7999 refactor
gitea/salix/pipeline/head This commit looks good Details
2020-09-02 13:09:30 +02:00
Carlos Jimenez Ruiz 1c0d5dbd76 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2341-Entry_lastBuy_section 2020-09-02 09:42:13 +02:00
Carlos Jimenez Ruiz 742a1c9ea8 removed focus on test 2020-09-02 09:42:10 +02:00
Joan Sanchez 33aec33cba Updated unit test
gitea/salix/pipeline/head This commit looks good Details
2020-09-02 08:12:32 +02:00
Joan Sanchez ecb98dfac5 Descriptor fix
gitea/salix/pipeline/head There was a failure building this commit Details
2020-09-01 12:10:32 +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
Javi Gallego a567738f2c set addressFk
gitea/salix/pipeline/head This commit looks good Details
2020-09-01 08:33:11 +02: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 30a4bbfe1a Css changes
gitea/salix/pipeline/head This commit looks good Details
2020-08-26 12:41:38 +02:00
Joan Sanchez 80e1577d4f Updated e2e
gitea/salix/pipeline/head This commit looks good Details
2020-08-20 09:50:22 +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 e974f638dd 2361 ticket sale multi check fix-ish +popover size
gitea/salix/pipeline/head This commit looks good Details
2020-07-30 16:05:48 +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
Carlos Jimenez Ruiz e2481366a2 removed on response if just accept
gitea/salix/pipeline/head This commit looks good Details
2020-07-29 10:47:48 +02:00
Carlos Jimenez Ruiz c62801e741 modules component to vnComponent working
gitea/salix/pipeline/head This commit looks good Details
2020-07-24 14:22:30 +02:00
Carlos Jimenez Ruiz 6913f2db72 $httpBackend.when and .expect no longer misused
gitea/salix/pipeline/head This commit looks good Details
2020-07-23 17:10:07 +02:00
Carlos Jimenez Ruiz 4ca004f833 angular.mock.injet shorten to inject 2020-07-23 16:46:16 +02:00
Carlos Jimenez Ruiz 7d5dc776c1 replaced most of the translate.instant for $t 2020-07-23 16:07:08 +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 c04d9b0854 Merge branch 'dev' into 2338-ticket_weekly
gitea/salix/pipeline/head This commit looks good Details
2020-07-08 16:22:54 +00:00
Joan Sánchez b00f6e6d04 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head There was a failure building this commit Details
2020-07-07 15:13:01 +02:00
Joan Sánchez 7efba25603 Removed role salesPerson for a ticket request
gitea/salix/pipeline/head This commit looks good Details
2020-07-07 15:12:36 +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 663b5fb9aa descriptor can now have 4 quicklinks
gitea/salix/pipeline/head This commit looks good Details
2020-07-03 13:28:49 +02:00
Joan Sanchez 23664dd3c5 Refresh total on sale changes
gitea/salix/pipeline/head This commit looks good Details
2020-07-01 15:00:48 +02: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 78ee6f1aff Updated unit tests
gitea/salix/pipeline/head There was a failure building this commit Details
2020-07-01 12:53:56 +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
Joan Sanchez defe7e7a17 Added front unit tests 2020-07-01 11:57:01 +02:00
Carlos Jimenez Ruiz 1dfd0c26ef Merge branch '1368-ticket_sale_refactor' of https://gitea.verdnatura.es/verdnatura/salix into 1368-ticket_sale_refactor 2020-06-30 11:15:28 +02:00
Carlos Jimenez Ruiz b451b400bf e2e toolkit 2020-06-30 11:15:20 +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
Joan Sanchez a0f625d019 Changed methods order, minor fixes 2020-06-30 10:01:30 +02:00
Joan Sanchez c9d94ca814 Reset watcher changes if there's no new data to save
gitea/salix/pipeline/head There was a failure building this commit Details
2020-06-30 09:37:09 +02:00
Javi Gallego db06626675 refactor
gitea/salix/pipeline/head This commit has test failures Details
2020-06-29 14:26:27 +02:00
Joan Sanchez 2c23f3417a Sale selection fixes
gitea/salix/pipeline/head There was a failure building this commit Details
2020-06-29 11:43:53 +02:00
Joan Sanchez 789769ad7d Destroy edit prop fix
gitea/salix/pipeline/head There was a failure building this commit Details
2020-06-29 09:38:42 +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
Javi Gallego 87de2bd2fb Merge branch 'dev' into #2344-ticket-sale--descuento--al-usuario
gitea/salix/pipeline/head This commit has test failures Details
2020-06-29 07:37:27 +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 a8377950f5 Fixes
gitea/salix/pipeline/head There was a failure building this commit Details
2020-06-23 16:39:20 +02:00
Carlos Jimenez Ruiz 9d88b9359a removed unused column
gitea/salix/pipeline/head This commit looks good Details
2020-06-23 16:07:07 +02:00
Carlos Jimenez Ruiz 984e8fd794 added total price of services
gitea/salix/pipeline/head This commit looks good Details
2020-06-23 14:53:41 +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
Bernat Exposito Domenech ee2a4771ff delete coment code
gitea/salix/pipeline/head This commit looks good Details
2020-06-23 11:22:33 +02:00
Bernat Exposito Domenech 6a021b5767 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2061-ticket_descriptor 2020-06-23 10:00:50 +02:00
Joan Sanchez 356c1a7b45 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head Something is wrong with the build of this commit Details
2020-06-22 11:54:50 +02:00
Joan Sanchez 4ad3334de6 Allow change to discount 0%
gitea/salix/pipeline/head This commit looks good Details
2020-06-22 11:49:44 +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 3c2a392cb8 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-18 13:51:00 +02:00
Carlos Jimenez Ruiz 4d97357213 update estate without model.refresh() 2020-06-18 13:50:52 +02:00
Joan Sanchez 765d3c7553 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2020-06-18 07:19:57 +02:00
Joan Sanchez 43a48994e0 Image path fix
gitea/salix/pipeline/head This commit looks good Details
2020-06-17 16:33:58 +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
Bernat Exposito Domenech ebcbd5068f add restrictions in ticket descriptor
gitea/salix/pipeline/head This commit looks good Details
2020-06-17 09:49:14 +02:00
Carlos Jimenez Ruiz fb37e156d4 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2319_show_delivery_note 2020-06-17 09:22:09 +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
Carlos Jimenez Ruiz b44942c7d7 open delivery notes on ticket index 2020-06-16 12:36:34 +02:00
Bernat Exposito e335775cdb Merge pull request '2325 - Search address' (#308) from 2325-address_searchbar into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-by: Bernat Exposito <bernat@verdnatura.es>
2020-06-15 06:24:23 +00:00
Bernat Exposito 70d5c641ad Merge pull request '2293 - getVolume() call to saleVolume' (#309) from 2293-getVolume into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-by: Bernat Exposito <bernat@verdnatura.es>
2020-06-15 06:16:55 +00:00
Joan Sanchez 25b1c6bd8f 2239 - Added services
gitea/salix/pipeline/head This commit looks good Details
2020-06-12 14:28:29 +02:00
Joan Sanchez 36ec930878 Updated test
gitea/salix/pipeline/head This commit looks good Details
2020-06-12 12:01:53 +02:00
Joan Sanchez 3d388ad226 Updated unit test
gitea/salix/pipeline/head There was a failure building this commit Details
2020-06-12 11:39:33 +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
Joan Sanchez 48034b234f 2325 - Search address
gitea/salix/pipeline/head This commit looks good Details
2020-06-12 10:53:33 +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 4b262dc3cc Disabled contextmenu option
gitea/salix/pipeline/head This commit looks good Details
2020-06-09 13:18:29 +02:00
Joan Sanchez 1fed4c7913 Contextmenu fixes
gitea/salix/pipeline/head This commit looks good Details
2020-06-09 12:16:40 +02:00
Joan Sanchez 7d53f274de Merge pull request '2303-fix_descriptor_show' (#300) from 2303-fix_descriptor_show into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2020-06-08 14:08:56 +00: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 05b5c452a9 Removed attribute
gitea/salix/pipeline/head This commit looks good Details
2020-06-08 13:17:18 +02: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
Bernat Exposito Domenech e24c5b00e9 fix descriptors
gitea/salix/pipeline/head This commit looks good Details
2020-06-08 11:05:17 +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 762c39eb23 :: para watcher
gitea/salix/pipeline/head There was a failure building this commit Details
2020-06-08 07:52:30 +02:00
Bernat Exposito Domenech 56c9b08101 fix show.descriptor
gitea/salix/pipeline/head This commit looks good Details
2020-06-08 07:52:23 +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 fac64c45c0 Merge pull request 'zone delete' (#285) from 2244-zone_descriptor into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2020-06-02 09:18:24 +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
Bernat Exposito 0fe2212f64 Merge pull request '2282-setDeleted_stowaway' (#287) from 2282-setDeleted_stowaway into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-by: Bernat Exposito <bernat@verdnatura.es>
2020-06-02 08:24:59 +00:00
Joan Sanchez 21bb4a778c Merge pull request '2278-ticket_summary_invoiceOut' (#286) from 2278-ticket_summary_invoiceOut into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2020-06-02 08:11:44 +00:00
Joan Sanchez 1926f90f4b Merge pull request 'add column in ticket split' (#279) from 2236-ticket_sale_split into dev
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2020-06-02 07:47:50 +00: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
Bernat Exposito Domenech 546272cc3f zone delete
gitea/salix/pipeline/head This commit looks good Details
2020-06-02 08:59:04 +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 f28f88a100 ticket summary invoiceOut popover
gitea/salix/pipeline/head This commit looks good Details
2020-05-27 12:29:01 +02:00
Carlos Jimenez Ruiz 98157fc45a Merge pull request '2141-print_reply_to' (#272) from 2141-print_reply_to into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-by: Carlos Jimenez <carlosjr@verdnatura.es>
2020-05-27 07:10:27 +00:00
Bernat Exposito Domenech 8be929c1da log tiquet request 2020-05-27 08:07:14 +02:00
Bernat Exposito Domenech 60d50afb2e fix traduction
gitea/salix/pipeline/head This commit looks good Details
2020-05-26 12:20:06 +02:00
Javi Gallego 5188f80da5 Merge branch 'dev' into 2234-getVisibleAvailable
gitea/salix/pipeline/head This commit looks good Details
2020-05-26 10:47:48 +02:00
Bernat Exposito Domenech e7fc70a4b4 add column in ticket split
gitea/salix/pipeline/head This commit looks good Details
2020-05-26 10:43:53 +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
Carlos Jimenez Ruiz d02655d4d3 Merge pull request '2273 - Fixed transfer sales' (#273) from 2273-transfer_sales_fix into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-by: Carlos Jimenez <carlosjr@verdnatura.es>
2020-05-25 12:58:08 +00:00
Joan Sanchez 73a6148a77 2273 - Fixed transfer sales
gitea/salix/pipeline/head This commit looks good Details
2020-05-25 14:45:26 +02:00
Joan Sanchez d60f8721f1 1490 - Don't update with empty value
gitea/salix/pipeline/head This commit looks good Details
2020-05-25 13:49:24 +02:00
Joan Sanchez 4878c0dc46 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2141-print_reply_to
gitea/salix/pipeline/head There was a failure building this commit Details
2020-05-25 07:25:21 +02:00
Joan Sanchez e9e7ae08f2 Locale refactor
gitea/salix/pipeline/head There was a failure building this commit Details
2020-05-22 15:20:55 +02:00
Carlos Jimenez Ruiz 55c4ccdb29 Merge pull request 'searchbar translates' (#261) from 2247-refactor_searchBar into dev
gitea/salix/pipeline/head There was a failure building this commit Details
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
Reviewed-by: Carlos Jimenez <carlosjr@verdnatura.es>
2020-05-20 08:40:02 +00:00