Commit Graph

1306 Commits

Author SHA1 Message Date
Carlos Jimenez Ruiz 9578895f95 backend unit tests adapted
gitea/salix/pipeline/head This commit looks good Details
2021-07-29 17:40:45 +02:00
Carlos Jimenez Ruiz 8d682f4e03 chat notifications for many sales modifications 2021-07-29 17:20:57 +02:00
Carlos Jimenez Ruiz 88ecaff1d2 prevented an error if resultant length is 0
gitea/salix/pipeline/head This commit looks good Details
2021-07-27 16:17:47 +02:00
Joan Sanchez 9d855a80d5 3028 - Added visible column on ticket sales
gitea/salix/pipeline/head This commit looks good Details
2021-07-20 12:33:27 +02:00
Joan Sanchez 249f5074df Show client id
gitea/salix/pipeline/head This commit looks good Details
2021-07-02 10:57:17 +02:00
Joan Sanchez 3246101574 Updated unit tests
gitea/salix/pipeline/head This commit looks good Details
2021-07-01 14:03:28 +02:00
Joan Sanchez 319a168b89 Removed focus
gitea/salix/pipeline/head This commit looks good Details
2021-07-01 13:43:13 +02:00
Joan Sanchez 92b6318c79 Ammends
gitea/salix/pipeline/head This commit looks good Details
2021-07-01 13:31:04 +02:00
Joan Sanchez 7e836e570f 2983 - Invoice tickets
gitea/salix/pipeline/head This commit looks good Details
2021-06-30 16:10:26 +02:00
Joan Sanchez d30a3490fe Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2983-ticket_invoice
gitea/salix/pipeline/head This commit looks good Details
2021-06-30 15:21:47 +02:00
Joan Sanchez 33d03c8f21 Merge branch 'dev' into 2950-alertlevel_to_alertlevel_id
gitea/salix/pipeline/head This commit looks good Details
2021-06-30 06:15:05 +00:00
Carlos Jimenez Ruiz 08360bfdc4 deprecated alertLevel.alertLevel now using alertLevel.id
gitea/salix/pipeline/head This commit looks good Details
2021-06-29 18:01:33 +02:00
Carlos Jimenez Ruiz d67e36212f added validation for the dms id field
gitea/salix/pipeline/head This commit looks good Details
2021-06-29 11:59:21 +02:00
Carlos Jimenez Ruiz e2ff3ff17f validation message for dup entry 2021-06-28 13:30:49 +02:00
Carlos Jimenez Ruiz 0e47cf72e4 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2999-ticket_dms_import_from_existing 2021-06-28 11:19:07 +02:00
Joan Sanchez 65ac3fc205 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2997-export_production_rebuild
gitea/salix/pipeline/head This commit looks good Details
2021-06-28 08:58:27 +02:00
Joan Sanchez ef9f3b13e4 html fixes
gitea/salix/pipeline/head This commit looks good Details
2021-06-28 08:28:31 +02:00
Carlos Jimenez Ruiz 8b9bfb4ba0 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2999-ticket_dms_import_from_existing
gitea/salix/pipeline/head This commit looks good Details
2021-06-25 10:12:52 +02:00
Carlos Jimenez Ruiz 832452df95 ticketDms import 2021-06-25 10:12:41 +02:00
Carlos Jimenez Ruiz 2548fdc891 #3000 add buyer to ticket isEditable 2021-06-25 09:46:18 +02:00
Joan Sanchez 0941b2423e 2983 - Invoice tickets
gitea/salix/pipeline/head This commit looks good Details
2021-06-24 13:33:51 +02:00
Joan Sanchez 362c404aba Css fixes
gitea/salix/pipeline/head This commit looks good Details
2021-06-24 09:16:59 +02:00
Carlos Jimenez Ruiz 9389bbf779 front unit tests fix
gitea/salix/pipeline/head There was a failure building this commit Details
2021-06-23 13:32:23 +02:00
Carlos Jimenez Ruiz 8344a58ab8 updated client/worker/user IDs on tests
gitea/salix/pipeline/head There was a failure building this commit Details
2021-06-23 13:24:23 +02:00
Joan Sanchez deaade92b0 Shortened packing type
gitea/salix/pipeline/head This commit looks good Details
2021-06-22 14:27:45 +02:00
Carlos Jimenez Ruiz 4656b2e25a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2960-ticket_basicdata_add_alias
gitea/salix/pipeline/head This commit looks good Details
2021-06-18 15:54:41 +02:00
Carlos Jimenez Ruiz 1afae3d56d address nickname now gets updated when client or address updates 2021-06-18 15:54:33 +02:00
Joan Sanchez 8695fadc18 Merge branch 'dev' into 2948-ticket_sale_itemPackingType
gitea/salix/pipeline/head This commit looks good Details
2021-06-18 05:21:01 +00:00
Joan Sanchez bbbf008076 Added done() to async beforeAll()
gitea/salix/pipeline/head This commit looks good Details
2021-06-17 16:09:17 +02:00
Carlos Jimenez Ruiz b906a8e91d added ticket.nickname to basicdata
gitea/salix/pipeline/head This commit looks good Details
2021-06-17 11:52:12 +02:00
Javi Gallego e2f32a60fd cambio campos en front 2021-06-17 07:30:22 +02:00
Carlos Jimenez Ruiz 7370269e4d ticket.sale now shows Packing type 2021-06-16 17:06:11 +02:00
Carlos Jimenez Ruiz 88a5443d64 table style changes
gitea/salix/pipeline/head This commit looks good Details
2021-06-14 15:52:46 +02:00
Carlos Jimenez Ruiz e85b7b9817 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2931-entry_summary_pagination 2021-06-14 12:07:54 +02:00
Carlos Jimenez Ruiz f36b54f97b invoiceOut summary tickets pagination + refactor 2021-06-14 11:38:57 +02:00
Carlos Jimenez Ruiz 5d8a9938d6 formattedAddress tests amended for postcode 2021-06-13 19:16:35 +02:00
Carlos Jimenez Ruiz 48f80fad8f added postcode to summary + basic data translation 2021-06-13 19:11:05 +02:00
Carlos Jimenez Ruiz fc3af7b6a6 ticket expedition now shows scan worker and scanned date
gitea/salix/pipeline/head This commit looks good Details
2021-06-09 14:25:50 +02:00
Carlos Jimenez Ruiz f969323a86 ticket create now takes clientFk from params
gitea/salix/pipeline/head This commit looks good Details
2021-06-08 17:30:00 +02:00
Joan Sanchez edf18938a6 HOTFIX: clientGetDebt
gitea/salix/pipeline/head This commit looks good Details
2021-06-03 16:21:43 +02:00
Joan Sanchez 5962a68d15 HOTFIX: Sort by zone hour
gitea/salix/pipeline/head This commit looks good Details
2021-06-03 12:40:27 +02:00
Joan Sanchez a594e63566 Chip color
gitea/salix/pipeline/head This commit looks good Details
2021-06-01 11:39:40 +02:00
Joan Sanchez a24cfe0087 Merge branch 'dev' into 2891-ticket_sale_problems
gitea/salix/pipeline/head This commit looks good Details
2021-05-27 09:42:27 +00:00
Joan Sanchez 27cd54bef1 Updated icons title
gitea/salix/pipeline/head This commit looks good Details
2021-05-27 11:41:45 +02:00
Joan Sanchez 920e7b1daf E2E fixes
gitea/salix/pipeline/head This commit looks good Details
2021-05-26 13:05:58 +02:00
Carlos Jimenez Ruiz 3f167de10f Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2801_ticket_sale_restrictions
gitea/salix/pipeline/head This commit looks good Details
2021-05-26 09:14:30 +02:00
Carlos Jimenez Ruiz d6ef5352a2 sale module now has canEdit endpoint to check arrays of sales 2021-05-26 09:14:18 +02:00
Joan Sanchez 099ff657e4 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2891-ticket_sale_problems
gitea/salix/pipeline/head This commit looks good Details
2021-05-25 14:08:02 +02:00
Joan Sanchez f6a0bcb12c Updated unit tests
gitea/salix/pipeline/head This commit looks good Details
2021-05-25 13:33:17 +02:00
Joan Sanchez 26cc3a3dec 2891 - Show problems on tickets sales
gitea/salix/pipeline/head This commit looks good Details
2021-05-25 10:01:18 +02:00
Carlos Jimenez Ruiz 2a4ff5a97b fixed a problem where warehouseFk wasn't yet defined upon updateStock call
gitea/salix/pipeline/head This commit looks good Details
2021-05-24 10:31:51 +02:00
Carlos Jimenez Ruiz 9a1b6e4653 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2920-item_descriptor_user_warehouse
gitea/salix/pipeline/head This commit looks good Details
2021-05-21 15:33:23 +02:00
Carlos Jimenez Ruiz 5c18c5c94c ticket module descriptor now takes warehouseFk from the ticket 2021-05-21 15:31:28 +02:00
Joan Sanchez 60185bdf34 Merge branch 'dev' into 2891-ticket_sale_problems
gitea/salix/pipeline/head This commit looks good Details
2021-05-21 07:24:34 +00:00
Joan Sanchez a103c8d7fc 2891 - Get ticket problems for every sale
gitea/salix/pipeline/head This commit looks good Details
2021-05-21 08:49:32 +02:00
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