Commit Graph

1021 Commits

Author SHA1 Message Date
Alex Moreno e01d676bb1 feat(ticket_basic-data_step-two): show visible and option withoutNegatives
gitea/salix/pipeline/head This commit looks good Details
2021-12-15 14:45:45 +01:00
Alex Moreno be3e8ddd98 feat(ticket_descriptor): add field client.id
gitea/salix/pipeline/head This commit looks good Details
2021-12-14 12:59:53 +01:00
Alex Moreno 5960d40891 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3426-ticket_index
gitea/salix/pipeline/head This commit looks good Details
2021-12-14 12:43:40 +01:00
Alex Moreno 9cfe6b5b7a feat(ticket): filter by route
gitea/salix/pipeline/head This commit looks good Details
2021-12-14 12:05:06 +01:00
Joan Sanchez f2a8992410 fix(ticketIndex): excluded collectionFk property from date ranges
gitea/salix/pipeline/head This commit looks good Details
Refs: 3431
2021-12-14 09:17:00 +01:00
Alex Moreno 75e32feb16 refactor ticket_sale
gitea/salix/pipeline/head This commit looks good Details
2021-12-01 11:39:48 +01:00
Alex Moreno d5c0be5a9d refactor(ticket_sale): logic and tests
gitea/salix/pipeline/head This commit looks good Details
2021-11-30 13:47:16 +01:00
Alex Moreno 85721dcf45 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3372-ticket_sale 2021-11-30 09:51:30 +01:00
Joan Sanchez 5c342ae463 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2021-11-30 09:11:40 +01:00
Alex Moreno 8ea3307230 feat(ticket_sale): allow multi-check for recalculatePrice
gitea/salix/pipeline/head This commit looks good Details
2021-11-29 08:30:36 +01:00
Joan Sanchez e4d7d957eb Rectified icons
gitea/salix/pipeline/head This commit looks good Details
2021-11-26 14:48:55 +01:00
Joan Sanchez 452d4557d1 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2021-11-26 14:11:33 +01:00
Joan Sanchez bcca33bc33 Updated icons 2021-11-26 13:04:07 +01:00
Joan Sanchez 8ede14ab40 fix(sales): update price on any change affecting the ticket total
gitea/salix/pipeline/head This commit looks good Details
Refs: 3363
2021-11-24 09:25:24 +01:00
Joan Sanchez 07dcdab1ef fix(sale): disabled clear icons
gitea/salix/pipeline/head This commit looks good Details
2021-11-23 09:57:19 +01:00
Joan Sanchez 46d7a6e765 Added unit tests
gitea/salix/pipeline/head This commit looks good Details
2021-11-19 09:24:49 +01:00
Joan Sanchez 8c5f0d3019 feat(createClaim): disallow claim creation for a ticket delivered more than seven days ago
Refs: 3278
2021-11-19 09:24:31 +01:00
Alex Moreno caf6320d53 feat(ticket): default ticketAction for salesAssistant
gitea/salix/pipeline/head This commit looks good Details
2021-11-18 14:27:05 +01:00
Joan Sanchez 2bc20242e6 fix(salesMonitor): allow scope days to zero
gitea/salix/pipeline/head This commit looks good Details
2021-11-16 13:43:30 +01:00
Vicent Llopis cd6f0057a1 test
gitea/salix/pipeline/head This commit looks good Details
2021-10-27 13:41:59 +02:00
Vicent Llopis b1b6d93c8e change column value : checkbox for text
gitea/salix/pipeline/head This commit looks good Details
2021-10-27 13:39:38 +02:00
Alex Moreno 1cb0cda3a8 fix(sale): delete :: in image
gitea/salix/pipeline/head This commit looks good Details
2021-10-19 10:26:00 +02:00
Joan Sanchez ee1a7952ad Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3094-invoice_csv
gitea/salix/pipeline/head This commit looks good Details
2021-10-18 09:44:27 +02:00
Carlos Jimenez Ruiz 05df98939b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3092-module_transactions
gitea/salix/pipeline/head This commit looks good Details
2021-10-15 14:47:34 +02:00
Joan Sanchez d5cf57fbb1 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev 2021-10-15 14:07:48 +02:00
Joan Sanchez 85b4730c6c feat(monitor): show client risk to future on tickets
gitea/salix/pipeline/head This commit looks good Details
Refs: 2624
2021-10-15 10:49:23 +02:00
Joan Sanchez e641a947b3 Updated unit tests
gitea/salix/pipeline/head This commit looks good Details
2021-10-08 09:51:42 +02:00
Joan Sanchez e6b60d73f1 Added unit tests
gitea/salix/pipeline/head This commit looks good Details
2021-10-07 13:36:23 +02:00
Joan Sanchez 4610ed83d9 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3094-invoice_csv
gitea/salix/pipeline/head There was a failure building this commit Details
2021-10-07 10:28:06 +02:00
Joan Sanchez 82a14088d0 Added options to invoiceOut
gitea/salix/pipeline/head There was a failure building this commit Details
2021-10-07 10:04:50 +02:00
Carlos Jimenez Ruiz 0b46e9ce35 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3092-module_transactions
gitea/salix/pipeline/head This commit looks good Details
2021-10-04 10:21:09 +02:00
Joan Sanchez 6b59bdd01c fix(descriptorMenu): show PDF regeneration option
gitea/salix/pipeline/head This commit looks good Details
2021-10-04 10:19:53 +02:00
Carlos Jimenez Ruiz 16b27c2074 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3092-module_transactions 2021-10-04 09:23:28 +02:00
Joan Sanchez 580231d30b Updated unit tests
gitea/salix/pipeline/head This commit looks good Details
2021-10-01 14:59:12 +02:00
Joan Sanchez 313db4960e refactor(invoice): Show generate PDF option if it was never generated before
Refs: 3162
2021-10-01 14:59:08 +02:00
Joan Sanchez 68178bdb1f Updated unit tests
gitea/salix/pipeline/head This commit looks good Details
2021-10-01 14:48:25 +02:00
Joan Sanchez f60c754c59 refactor(invoice): Show generate PDF option if it was never generated before
gitea/salix/pipeline/head There was a failure building this commit Details
Refs: 3162
2021-10-01 14:31:42 +02:00
Joan Sanchez 1ec20e250c feat(invoice): Send invoice and delivery-note on CSV format
gitea/salix/pipeline/head There was a failure building this commit Details
2021-10-01 12:41:31 +02:00
Carlos Jimenez Ruiz 156ecb32ec Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3092-module_transactions
gitea/salix/pipeline/head This commit looks good Details
2021-09-29 08:27:53 +02:00
Joan Sanchez 06b49f36b6 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2021-09-28 10:03:00 +02:00
Joan Sanchez 19d3b19e5a Updated translation
gitea/salix/pipeline/head This commit looks good Details
2021-09-28 09:59:00 +02:00
Joan Sanchez ee0e1e122b Removed crudModel default params
gitea/salix/pipeline/head This commit looks good Details
2021-09-24 13:02:20 +02:00
Joan Sanchez 4ea0f92c35 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3092-module_transactions
gitea/salix/pipeline/head This commit looks good Details
2021-09-24 12:54:22 +02:00
Joan Sanchez 4545a5c8fa fix(filter): single search results don't use scopeDates
gitea/salix/pipeline/head This commit looks good Details
2021-09-24 12:51:20 +02:00
Carlos Jimenez Ruiz 8c446edc9e Merge branch 'dev' into 3098-item_tag_productor
gitea/salix/pipeline/head This commit looks good Details
2021-09-24 08:02:19 +00:00
Carlos Jimenez Ruiz 5f0e2825b8 Merge branch 'dev' into 3059-ticket_index_filter
gitea/salix/pipeline/head This commit looks good Details
2021-09-24 07:46:09 +00:00
Carlos Jimenez Ruiz 8fc17f05c6 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3098-item_tag_productor
gitea/salix/pipeline/head This commit looks good Details
2021-09-23 17:35:07 +02:00
Carlos Jimenez Ruiz 368f54b872 refactor(tags): unified the style rules for tags under fetched-tags component and all display subName if present
gitea/salix/pipeline/head This commit looks good Details
2021-09-23 17:19:47 +02:00
Carlos Jimenez Ruiz 23ba5657c5 refactor(sales): ticket sales now shows item.subName 2021-09-22 15:14:29 +02:00
Joan Sanchez 08cba0a9c8 fix(filter): search limit by date range was not being applied
gitea/salix/pipeline/head This commit looks good Details
Refs: 3059
2021-09-21 15:49:59 +02:00
Javi Gallego 3365eadf5e Merge branch 'dev' into 2995-supplierAccount-modificaciones 2021-09-21 14:02:07 +02:00
Joan Sanchez 079f99ca0d fix(tickets): fixed ticket duplications on ticket summary and ticket index caused by pagination
gitea/salix/pipeline/head This commit looks good Details
Refs: 3093
2021-09-17 08:50:22 +02:00
Javi Gallego 8160912fe7 Merge branch 'dev' into 2995-supplierAccount-modificaciones
gitea/salix/pipeline/head This commit looks good Details
2021-09-08 10:41:26 +02:00
Joan Sanchez 13f78359d5 fix(bank): the search by bank was not differentiating between numerical values and string values
gitea/salix/pipeline/head This commit looks good Details
Refs: 3084
2021-09-03 14:00:47 +02:00
Joan Sanchez 0370cbf207 feat(Searchbar): You can now filter by a ticket collection
gitea/salix/pipeline/head This commit looks good Details
Refs: 3068
2021-09-01 11:27:24 +02:00
Joan Sanchez 74dfa9f757 3063 - Get item from card without a name
gitea/salix/pipeline/head This commit looks good Details
2021-08-30 11:23:46 +02:00
Javi Gallego cffe25d41f Merge branch 'dev' into 2995-supplierAccount-modificaciones
gitea/salix/pipeline/head There was a failure building this commit Details
2021-08-18 12:38:41 +02:00
Javi Gallego 78a98cd6b7 shrink-datetime
gitea/salix/pipeline/head There was a failure building this commit Details
2021-08-15 08:35:14 +02:00
Carlos Jimenez Ruiz e1fe2aa5b5 added the claim icon to the ticket summary lines
gitea/salix/pipeline/head Build started... Details
2021-08-13 12:30:22 +02:00
Carlos Jimenez Ruiz 3d2de99129 vn-popover containing non-descriptor components now relocates correctly for ticket.sale
gitea/salix/pipeline/head This commit looks good Details
2021-08-03 11:16:43 +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 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
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 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
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
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 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 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 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
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 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
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
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 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
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 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 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
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
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
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
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 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 fb798f4300 regenerate invoice added to descriptor path 2021-01-25 09:28:01 +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
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
Joan Sanchez f125f7c80d Changed weekly translation
gitea/salix/pipeline/head This commit looks good Details
2021-01-20 13:57:48 +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 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
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
Carlos Jimenez Ruiz 8373c6f5d1 filter by selection + unit tests for travel index 2020-11-13 13:04:22 +01: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
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
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
Joan Sanchez a93d9f91cc Updated unit tests
gitea/salix/pipeline/head This commit looks good Details
2020-11-10 10:38:25 +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
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 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
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 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
Joan Sanchez 3f8a675785 2499 - Allow zero quantity
gitea/salix/pipeline/head This commit looks good Details
2020-10-13 08:42:13 +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
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
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
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 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
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 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 ea077e8d4a added auto-load to some combos 2020-09-17 20:12:52 +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 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
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
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
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