Commit Graph

3838 Commits

Author SHA1 Message Date
Carlos Jimenez Ruiz e025368af1 updaloadFile transaction commit conditional
gitea/salix/pipeline/head This commit looks good Details
2021-03-30 10:17:16 +02:00
Carlos Jimenez Ruiz dbf5296041 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2869-getSuggestedTickets_started_to_created
gitea/salix/pipeline/head This commit looks good Details
2021-03-30 09:56:12 +02:00
Carlos Jimenez Ruiz 70f6728c8f started to created date changes
gitea/salix/pipeline/head This commit looks good Details
2021-03-30 09:55:51 +02:00
Carlos Jimenez Ruiz 8797444553 importTicketSales refactor + tests
gitea/salix/pipeline/head This commit looks good Details
2021-03-29 15:42:29 +02:00
Carlos Jimenez Ruiz c1f457c263 allowContentTypes and removeFile refactors 2021-03-29 15:42:14 +02:00
Carlos Jimenez Ruiz 740cc79bc0 uploadFile refactor 2021-03-29 15:19:43 +02:00
Carlos Jimenez Ruiz de2a17e840 removeFile and filter refactors 2021-03-29 15:18:49 +02:00
Carlos Jimenez Ruiz 8d8bdacd86 updateClaimAction refactor + tests 2021-03-29 15:18:14 +02:00
Carlos Jimenez Ruiz 3054cbcadb updateClaim refactor + tests 2021-03-29 15:17:10 +02:00
Carlos Jimenez Ruiz c4cbc064c9 regularice claim refactor + test 2021-03-29 15:15:58 +02:00
Carlos Jimenez Ruiz ee79f23185 createFromSales refactor + tests 2021-03-29 15:14:23 +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 13d71b590a 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:33:49 +02:00
Joan Sanchez 407c0e6280 Supplier "Contacts" changes
gitea/salix/pipeline/head This commit looks good Details
2021-03-29 07:33:20 +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 767665e3c9 endpoint indentation + type updated yo array of objects
gitea/salix/pipeline/head This commit looks good Details
2021-03-26 10:39:19 +01:00
Carlos Jimenez Ruiz f46c18b6b0 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2844-item_lastEntries_sum 2021-03-26 10:33:58 +01:00
Carlos Jimenez Ruiz 3c8ed85e69 sum is now made on backend and html amends 2021-03-26 10:33:53 +01:00
Carlos Jimenez Ruiz 1cc4e60bad Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2840-ticket_card_sale_deprecations
gitea/salix/pipeline/head This commit looks good Details
2021-03-24 16:45:57 +01:00
Carlos Jimenez Ruiz 41bb4cbaab deprecated vat and subTotal related methods + tests fixed 2021-03-24 16:43:54 +01:00
jorgebl 393b9ba38c Correct name 2021-03-24 14:17:27 +01:00
jorgebl 81fbc81314 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2844-item_lastEntries_sum
gitea/salix/pipeline/head This commit looks good Details
2021-03-24 13:54:41 +01:00
jorgebl e01b7420d9 Added total cost of item 2021-03-24 13:54:29 +01:00
Joan Sanchez e767e95729 Loggable fixes
gitea/salix/pipeline/head This commit looks good Details
2021-03-24 13:09:35 +01:00
Joan Sanchez c65fbef3df Merge branch 'dev' into 2819-notify_assignment
gitea/salix/pipeline/head This commit looks good Details
2021-03-24 11:47:38 +00:00
Joan Sanchez 32805dbafb Added model unit test
gitea/salix/pipeline/head This commit looks good Details
2021-03-24 12:45:26 +01:00
Joan Sanchez 0e9b3bd39a Missing translation
gitea/salix/pipeline/head This commit looks good Details
2021-03-24 11:12:36 +01:00
Carlos Jimenez Ruiz 409f56ec7f e2e path resurrected for route tickets
gitea/salix/pipeline/head This commit looks good Details
2021-03-23 17:19:05 +01:00
Joan Sanchez b3d333368b #2819 - Notify worker assignment
gitea/salix/pipeline/head This commit looks good Details
2021-03-23 16:19:45 +01:00
Carlos Jimenez Ruiz 89d123c7f8 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2705-route_tickets_refactor
gitea/salix/pipeline/head This commit looks good Details
2021-03-23 13:19:30 +01:00
Carlos Jimenez Ruiz a78a73486a updated routes fixtures and fixed tests
gitea/salix/pipeline/head This commit looks good Details
2021-03-23 13:19:11 +01:00
jorgebl 868a0dbff7 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2811-entry_latest_buys
gitea/salix/pipeline/head This commit looks good Details
2021-03-23 09:43:34 +01:00
Carlos Jimenez Ruiz 84378fd607 tickets already in route are no longer shown + tests
gitea/salix/pipeline/head This commit looks good Details
2021-03-22 16:13:12 +01:00
jorgebl e96fd3d1f7 Changed message
gitea/salix/pipeline/head This commit looks good Details
2021-03-22 16:11:52 +01:00
Carlos Jimenez Ruiz 0023a88bfc restored the auto state to its previous version
gitea/salix/pipeline/head There was a failure building this commit Details
2021-03-22 11:32:57 +01:00
jorgebl 7e903f91a5 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2811-entry_latest_buys
gitea/salix/pipeline/head This commit looks good Details
2021-03-22 10:32:33 +01:00
Carlos Jimenez Ruiz 1e247e63a9 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2705-route_tickets_refactor 2021-03-22 10:32:07 +01:00
Joan Sanchez eb12126603 Rollback test changes
gitea/salix/pipeline/head This commit looks good Details
2021-03-22 10:27:07 +01:00
jorgebl 322a12e65c Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2811-entry_latest_buys 2021-03-22 10:24:01 +01:00
jorgebl 5f95bf4e15 Removed vn-horizontal and styles in the spans 2021-03-22 10:23:52 +01:00
Joan Sanchez 6da84e46c1 Added throw error
gitea/salix/pipeline/head This commit looks good Details
2021-03-22 10:20:04 +01:00
jorgebl b7b86cd719 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2811-entry_latest_buys 2021-03-22 09:39:06 +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
Carlos Jimenez Ruiz 674d5df96c Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2705-route_tickets_refactor 2021-03-18 15:03:00 +01:00
jorgebl 18a9d0c786 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2811-entry_latest_buys
gitea/salix/pipeline/head This commit looks good Details
2021-03-18 13:48:37 +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
Carlos Jimenez Ruiz af7f885d2b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2705-route_tickets_refactor 2021-03-16 14:36:14 +01:00
Carlos Jimenez Ruiz 117ea137c1 ticket index auto-state false for single results 2021-03-16 12:08:48 +01:00
Carlos Jimenez Ruiz 1d521fa9a8 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2705-route_tickets_refactor 2021-03-16 10:57:24 +01:00
jorgebl 684705e3ec Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2811-entry_latest_buys 2021-03-16 08:44:09 +01:00
jorgebl 1fc53f5565 QA removed styles in the html and put the translate 2021-03-16 08:44:05 +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 afb8df1429 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2842-npm_maintenance 2021-03-15 11:32:57 +01:00
Carlos Jimenez Ruiz fb418edc7b backend modifications for route tickets 2021-03-15 11:32:17 +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 2b8286eb28 deprecated dependencies, replaced babel/polyfill
gitea/salix/pipeline/head This commit looks good Details
2021-03-12 17:15:26 +01:00
jorgebl d2879087ff Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2817-translate_ticket_request_message
gitea/salix/pipeline/head This commit looks good Details
2021-03-12 12:41:06 +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
jorgebl fdecf6510f Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2811-entry_latest_buys
gitea/salix/pipeline/head This commit looks good Details
2021-03-12 10:02:56 +01:00
Joan Sanchez f92db8c5a0 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2752-entry_import_buys
gitea/salix/pipeline/head This commit looks good Details
2021-03-12 08:52:07 +01:00
Joan Sanchez 4c7d95f001 Requested changes + e2e updated
gitea/salix/pipeline/head This commit looks good Details
2021-03-12 08:45:41 +01:00
Joan Sanchez be37334f49 Requested changes 2021-03-12 08:17:56 +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 4c0d583556 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2824-ticket_totalWith_and_without_VAT 2021-03-10 19:25:43 +01:00
Carlos Jimenez Ruiz 0cb7ddd9ce ticket.total with and witout VAT refactor 2021-03-10 19:25:26 +01:00
Joan Sanchez e29dd4db42 Updated it description
gitea/salix/pipeline/head This commit looks good Details
2021-03-10 11:14:50 +01:00
Joan Sanchez a0358044a1 Acl fix
gitea/salix/pipeline/head This commit looks good Details
2021-03-10 11:11:04 +01:00
Joan Sanchez a7c2e08f8f ACl fixes
gitea/salix/pipeline/head This commit looks good Details
2021-03-10 11:04:56 +01:00
Joan Sanchez b39ec70a2c Merge branch 'dev' into 2752-entry_import_buys
gitea/salix/pipeline/head This commit looks good Details
2021-03-10 09:54:14 +00:00
Joan Sanchez c144d9ed47 Unit test changed query path
gitea/salix/pipeline/head This commit looks good Details
2021-03-10 10:53:22 +01:00
Joan Sanchez a4d2c531a3 Changes
gitea/salix/pipeline/head There was a failure building this commit Details
2021-03-10 10:29:58 +01:00
jorgebl 2f68509e65 WIP: added styles 2021-03-10 09:49:24 +01:00
jorgebl 45f9c1188d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2811-entry_latest_buys 2021-03-10 09:48:17 +01:00
Joan Sanchez 2a2e276c6b Added back unit test plus fixes
gitea/salix/pipeline/head This commit looks good Details
2021-03-10 09:01:32 +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
Joan Sanchez 31205f4556 Added front unit test 2021-03-09 13:39:22 +01:00
Joan Sanchez 5cbd8d632d Changes 2021-03-09 10:01:40 +01:00
Joan Sanchez 9da59949fd Merge branch 'dev' into 2733-supplier_descriptor_icon
gitea/salix/pipeline/head This commit looks good Details
2021-03-09 08:31:03 +00:00
jorgebl 59882cca77 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2733-supplier_descriptor_icon
gitea/salix/pipeline/head This commit looks good Details
2021-03-09 09:26:02 +01:00
jorgebl 2d36d4e610 Added line break in vn-icon 2021-03-09 09:25:10 +01:00
Joan Sanchez ff6c80aa7e Merge branch 'dev' into 2832-summary_validate_h4
gitea/salix/pipeline/head This commit looks good Details
2021-03-09 08:24:10 +00:00
jorgebl 1922280c61 QA rename some descriptions in test and reworked the test
gitea/salix/pipeline/head This commit looks good Details
2021-03-08 17:49:04 +01:00
jorgebl 1379691576 Added icon for supplier descriptor
gitea/salix/pipeline/head This commit looks good Details
2021-03-08 13:52:11 +01:00
jorgebl 43dc158d7c Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2832-summary_validate_h4
gitea/salix/pipeline/head This commit looks good Details
2021-03-08 13:17:38 +01:00
jorgebl 5cb959f5b8 removed controller.data from submit
gitea/salix/pipeline/head This commit looks good Details
2021-03-08 13:12:13 +01:00
jorgebl 27816b29e7 Removed ids on controller.data
gitea/salix/pipeline/head This commit looks good Details
2021-03-08 13:06:35 +01:00
jorgebl 134365dd9c Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2831-item_botanical_refactor
gitea/salix/pipeline/head This commit looks good Details
2021-03-08 12:55:44 +01:00
jorgebl d09e47835e Rename the statements for correctly description the action 2021-03-08 12:40:13 +01:00
jorgebl 6e08a66343 Added acl action for logistic boss and show the recent data added on species and genus in their fields in item botanical 2021-03-08 12:38:54 +01:00
jorgebl 32ea2dbda6 Added permisions from models in table salix ACL 2021-03-08 12:32:35 +01: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 2aff48c42d 2837 - Updated fonts
gitea/salix/pipeline/head This commit looks good Details
2021-03-08 09:34:58 +01:00
jorgebl 192d7627b0 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2832-summary_validate_h4 2021-03-08 09:12:34 +01:00
jorgebl 28b9da82ed change conditional 2021-03-08 09:12:10 +01:00
Joan Sanchez d7651ba4ac 2837 - Updated fonts
gitea/salix/pipeline/head This commit looks good Details
2021-03-08 07:53:00 +01:00
jorgebl 1fd18cae5a QA
gitea/salix/pipeline/head This commit looks good Details
2021-03-05 11:40:01 +01:00
jorgebl 4ae418698b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2788-add-ellipsize_log-component 2021-03-05 11:39:25 +01:00
Joan Sanchez 7ec9ddb6d9 Translation fix
gitea/salix/pipeline/head This commit looks good Details
2021-03-05 09:23:31 +01:00
jorgebl b6bf61f410 description put correctly
gitea/salix/pipeline/head This commit looks good Details
2021-03-05 09:09:09 +01:00
jorgebl 63ac492845 Added message for duplicated names
gitea/salix/pipeline/head This commit looks good Details
2021-03-05 08:45:14 +01:00
jorgebl 4cc3fc90c5 conditionals if name already exists 2021-03-04 21:30:56 +01:00
jorgebl 5ebd70a8f0 Fixed error filter on itemBotanical when item hasn't specie and genus data + front test 2021-03-04 20:11:10 +01:00
jorgebl 12ad71d0fe translate some words 2021-03-04 20:08:07 +01:00
jorgebl 300f78f31e added permisions logistic boss 2021-03-04 20:07:45 +01:00
jorgebl 92db67292c Removed botanical field and changes "edi" for "vn"
gitea/salix/pipeline/head This commit looks good Details
2021-03-04 07:56:31 +01:00
Joan Sanchez 0b532880c0 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2752-entry_import_buys
gitea/salix/pipeline/head This commit looks good Details
2021-03-04 07:54:15 +01:00
jorgebl cdd903dedf removed line break because the app interpretate it's a space 2021-03-03 15:09:01 +01:00
jorgebl 763eb412c0 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2788-add-ellipsize_log-component 2021-03-03 13:39:47 +01:00
jorgebl 56154181aa QA done 2021-03-03 13:39:25 +01:00
Joan Sanchez b22f58ae80 Issued filter fix
gitea/salix/pipeline/head This commit looks good Details
2021-03-03 12:28:37 +01: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 7c7aba86a8 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2595-invoiceIn-index
gitea/salix/pipeline/head There was a failure building this commit Details
2021-03-03 09:36:55 +01:00
Joan Sanchez e52f0eea92 Added front unit tests
gitea/salix/pipeline/head There was a failure building this commit Details
2021-03-03 07:44:09 +01:00
jorgebl 60ca3e87a5 Test git 2021-03-02 16:53:54 +01:00
jorgebl 3c82a4997b Test gitea 2021-03-02 16:52:14 +01:00
Joan Sanchez fed3657487 Export changes & backtest fixes
gitea/salix/pipeline/head There was a failure building this commit Details
2021-03-02 14:59:02 +01:00
jorgebl 022d31c952 remove line break
gitea/salix/pipeline/head This commit looks good Details
2021-03-02 14:43:55 +01:00
jorgebl 325a7e7235 Translate note
gitea/salix/pipeline/head This commit looks good Details
2021-03-02 12:50:07 +01:00
jorgebl d6c1f73cf6 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2788-add-ellipsize_log-component 2021-03-02 12:46:19 +01:00
jorgebl a7973ba276 Resolved question PR
gitea/salix/pipeline/head This commit looks good Details
2021-03-01 11:59:05 +01:00
jorgebl 69550dc380 Added number of rows that are going to be modificated 2021-03-01 11:54:02 +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 094552e0f2 Added ellipsize and align label
gitea/salix/pipeline/head This commit looks good Details
2021-02-26 12:32:05 +01:00
jorgebl 3fcd5f9dbc removed line break
gitea/salix/pipeline/head This commit looks good Details
2021-02-26 11:40:46 +01:00
jorgebl af8f4e88f5 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2786-get_tags_from_item
gitea/salix/pipeline/head This commit looks good Details
2021-02-26 11:36:56 +01:00
jorgebl f63baafe7d get values from model item 2021-02-26 11:36:22 +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 4cedd53bce Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2820-add_item_scopeDays
gitea/salix/pipeline/head This commit looks good Details
2021-02-25 11:02:51 +01:00
jorgebl c55d65a7fd QA refactor
gitea/salix/pipeline/head This commit looks good Details
2021-02-25 10:49:19 +01:00
jorgebl 218a506a4b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2789-entry_multiple_changes
gitea/salix/pipeline/head This commit looks good Details
2021-02-25 09:54:21 +01:00
Joan Sanchez 89abf424fb Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2021-02-25 08:17:26 +01:00
jorgebl c9730929e8 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2776-add_boss_summary
gitea/salix/pipeline/head This commit looks good Details
2021-02-24 16:14:41 +01:00
jorgebl 1f1db53d41 Summary boss shown on descriptor 2021-02-24 16:12:44 +01:00
Joan Sanchez c2a2204437 Regex change
gitea/salix/pipeline/head This commit looks good Details
2021-02-24 16:04:09 +01:00
Joan Sanchez ddb77a5c05 Regex change
gitea/salix/pipeline/head This commit looks good Details
2021-02-24 15:55:09 +01:00
Joan Sanchez d3879635a8 Regex changes
gitea/salix/pipeline/head Something is wrong with the build of this commit Details
2021-02-24 15:54:02 +01:00
jorgebl 06dcb4b28c Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2776-add_boss_summary 2021-02-24 14:54:23 +01:00
jorgebl f1c481de64 QA refactor
gitea/salix/pipeline/head This commit looks good Details
2021-02-24 14:49:58 +01:00
Joan Sanchez 1c819e692e Floramondo image download fixes
gitea/salix/pipeline/head This commit looks good Details
2021-02-24 14:37:49 +01:00
jorgebl d551389d3a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2781-add_stemMultiplier_item
gitea/salix/pipeline/head This commit looks good Details
2021-02-24 12:26:05 +01:00
jorgebl df9ca2ad3e Fixed filter description 2021-02-24 12:24:50 +01:00
jorgebl 3af50dfc80 QA refactor
gitea/salix/pipeline/head This commit looks good Details
2021-02-24 11:32:31 +01:00
Joan Sanchez 347ac77878 Changes to file names
gitea/salix/pipeline/head This commit looks good Details
2021-02-24 09:59:41 +01:00
jorgebl 7895af8a54 Fixed test
gitea/salix/pipeline/head This commit looks good Details
2021-02-23 17:00:31 +01:00
jorgebl e32914d990 Fixed error test 2021-02-23 16:27:18 +01:00
jorgebl 3eae322a6a Added scope days and test 2021-02-23 16:09:29 +01:00
jorgebl 71eeaadb43 Removed focus on test
gitea/salix/pipeline/head This commit looks good Details
2021-02-23 14:54:07 +01:00
jorgebl 2e75bf376c Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2789-entry_multiple_changes
gitea/salix/pipeline/head This commit looks good Details
2021-02-23 11:53:07 +01:00
jorgebl da20eac685 Putting propertie name for order and showing the 3 digits of type 2021-02-23 11:52:29 +01:00
jorgebl 799bb3a955 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2603-travel_create_autocomplete_date
gitea/salix/pipeline/head This commit looks good Details
2021-02-23 11:10:06 +01:00
jorgebl 9855bd14fe Translate Boss
gitea/salix/pipeline/head This commit looks good Details
2021-02-23 11:08:57 +01:00
jorgebl 5e549b4d0d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2776-add_boss_summary
gitea/salix/pipeline/head This commit looks good Details
2021-02-23 10:42:19 +01:00
jorgebl 69f53972d5 Added filter for selection
gitea/salix/pipeline/head This commit looks good Details
2021-02-22 16:43:40 +01:00
jorgebl 5ef48919ec Added translate multiplier
gitea/salix/pipeline/head This commit looks good Details
2021-02-22 13:41:31 +01:00
jorgebl 3c3dc861ae Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2781-add_stemMultiplier_item 2021-02-22 13:37:43 +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
jorgebl 77d8388c43 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-22 09:59:38 +01:00
jorgebl 5692b5f07e Added conditional and test 2021-02-22 09:53:03 +01:00
jorgebl 8deb11d333 Added boss on basic data and summary 2021-02-19 17:45:45 +01:00
Joan Sanchez ddb443ab8f Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2021-02-18 13:17:34 +01:00
Joan Sanchez 8ddbcc24a7 Added priority to image download queue
gitea/salix/pipeline/head This commit looks good Details
2021-02-18 13:03:49 +01:00
Jorge Padawan 3763b95f62 Added multiplier in sections and filter selection
gitea/salix/pipeline/head This commit looks good Details
2021-02-17 15:38:57 +01:00
Jorge Padawan aa29f546ae put global bank entity model
gitea/salix/pipeline/head This commit looks good Details
2021-02-17 15:05:17 +01:00
Jorge Padawan d5e53909c6 Fixed test
gitea/salix/pipeline/head There was a failure building this commit Details
2021-02-17 13:32:09 +01:00
Jorge Padawan 29ca6c52af Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2583-create_account_supplier
gitea/salix/pipeline/head There was a failure building this commit Details
2021-02-17 12:32:26 +01:00
Jorge Padawan f10092d2cf Added autocomplete on bank entity
gitea/salix/pipeline/head There was a failure building this commit Details
2021-02-17 12:07:04 +01:00
Jorge Padawan 0732ff38b1 Quit clogs
gitea/salix/pipeline/head There was a failure building this commit Details
2021-02-17 11:04:46 +01:00
Jorge Padawan b71b959b49 Formated sql and tests passed
gitea/salix/pipeline/head There was a failure building this commit Details
2021-02-17 11:01:50 +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 2296727f8d 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-16 08:32:24 +01:00
Javi Gallego 7c0e690f8f sin console
gitea/salix/pipeline/head This commit looks good Details
2021-02-15 14:34:13 +01:00
Jorge Padawan bf3391f7f2 added test of lastActiveTickets
gitea/salix/pipeline/head This commit looks good Details
2021-02-15 13:20:17 +01:00
Jorge Padawan 4e36fd118e 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-15 10:45:46 +01:00
Javi Gallego 737f5a1c91 Merge branch 'dev' into refactor-loopback-context
gitea/salix/pipeline/head This commit looks good Details
2021-02-12 18:11:50 +01:00
Jorge Padawan 366f241b3f Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2603-travel_create_autocomplete_date
gitea/salix/pipeline/head This commit looks good Details
2021-02-12 17:04:10 +01:00
Jorge Padawan 4bcb948aff Updated code for better read 2021-02-12 16:41:29 +01:00
Jorge Padawan 4b1d86c9b1 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2583-create_supplierAccount_section 2021-02-12 15:12:15 +01:00
Javi Gallego a3d7fc9313 done
gitea/salix/pipeline/head This commit looks good Details
2021-02-12 13:18:02 +01:00
Joan Sanchez d7ad90d573 Updated caniuse
gitea/salix/pipeline/head This commit looks good Details
2021-02-12 12:25:44 +01:00
Joan Sanchez e7c1dc2210 Changes
gitea/salix/pipeline/head This commit looks good Details
2021-02-12 12:19:42 +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
Jorge Padawan 1ef2c2ff0a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2782-Add_permisions_administrative_entry_module
gitea/salix/pipeline/head This commit looks good Details
2021-02-12 11:48:00 +01:00
Jorge Padawan dad3e7c155 Requested changes realized
gitea/salix/pipeline/head This commit looks good Details
2021-02-12 11:27:24 +01:00
Jorge Padawan 2a2009b287 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2603-travel_create_autocomplete_date 2021-02-12 11:25:44 +01:00
Jorge Padawan 211ffb8f30 Delete supplierAccount from this branch 2021-02-12 09:50:23 +01:00
Jorge Padawan 433a0094c4 Fixed errors detected
gitea/salix/pipeline/head This commit looks good Details
2021-02-12 09:11:43 +01:00
Jorge Padawan eb3ac6de72 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2603-travel_create_autocomplete_date
gitea/salix/pipeline/head This commit looks good Details
2021-02-11 18:48:58 +01:00
Jorge Padawan 53b06bc464 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2783-itemPriceFixed_advanced_search
gitea/salix/pipeline/head This commit looks good Details
2021-02-11 18:41:41 +01:00
Jorge Padawan 1634c81682 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2782-Add_permisions_administrative_entry_module
gitea/salix/pipeline/head This commit looks good Details
2021-02-11 18:38:27 +01:00
Jorge Padawan 0c335b9705 Put bankEntity on global components, and fixed conflict updates
gitea/salix/pipeline/head This commit looks good Details
2021-02-11 18:35:23 +01:00
Jorge Padawan a1ca8d90c3 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2583-create_supplierAccount_section 2021-02-11 16:07:04 +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
Jorge Padawan f146c6a279 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2783-itemPriceFixed_advanced_search 2021-02-11 11:15:10 +01:00
Jorge Padawan 745d25f0c7 Showed filter on browser search bar 2021-02-11 11:14:52 +01:00
Jorge Padawan 31e5d3fd1e Created test and optimized sql query 2021-02-11 08:32:16 +01:00
Jorge Padawan bb02a0de6b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2603-travel_create_autocomplete_date 2021-02-10 16:59:29 +01:00
Joan Sanchez 84c82ed32d 2595 - Added invoiceIn module
gitea/salix/pipeline/head There was a failure building this commit Details
2021-02-10 15:03:11 +01:00
Jorge Padawan 2cf37a9e96 Added permissions to role administrative
gitea/salix/pipeline/head This commit looks good Details
2021-02-10 09:10:15 +01:00
Jorge Padawan 1c6bddbfb6 Added functionality to autocomplete the inputs 2021-02-10 08:47:58 +01:00
Joan Sanchez dcad6dc8c8 Merge branch 'dev' into 2725-ticket-create-crear-shimpent
gitea/salix/pipeline/head This commit looks good Details
2021-02-10 07:21:29 +00:00
Javi Gallego f87ea1b051 arrow-spacing
gitea/salix/pipeline/head There was a failure building this commit Details
2021-02-10 08:13:45 +01:00
Javi Gallego 3a3dae179c done
gitea/salix/pipeline/head There was a failure building this commit Details
2021-02-10 07:58:11 +01:00
Carlos Jimenez Ruiz 8b97236f22 texfield no longer performs queries
gitea/salix/pipeline/head This commit looks good Details
2021-02-09 12:53:40 +01:00
Carlos Jimenez Ruiz 83ed70abda Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2722-item_log_highlighted_by_clientType
gitea/salix/pipeline/head This commit looks good Details
2021-02-09 10:43:26 +01:00
Carlos Jimenez Ruiz 3d948ef317 warning color added lines with clientType loses 2021-02-09 10:43:19 +01:00
Joan Sanchez c092bf58b4 Import buys
gitea/salix/pipeline/head This commit looks good Details
2021-02-09 07:59:55 +01:00
Carlos Jimenez Ruiz a62bebd51e minor refactor
gitea/salix/pipeline/head This commit looks good Details
2021-02-08 10:14:41 +01:00
Jorge Padawan 1adaeca615 Added controller with sql 2021-02-08 08:41:26 +01:00
Joan Sanchez 411053bbec Merge branch 'dev' into 2752-entry_import_buys
gitea/salix/pipeline/head This commit looks good Details
2021-02-05 16:51:50 +00:00
Carlos Jimenez Ruiz 5ce8d8eb8c Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2737-supplier_basic_data_worker
gitea/salix/pipeline/head Something is wrong with the build of this commit Details
2021-02-05 15:26:54 +01:00
Carlos Jimenez Ruiz 76d6e2d4b7 worker added to supplier basic data and summary 2021-02-05 15:26:49 +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 3f4e102860 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head There was a failure building this commit Details
2021-02-05 12:18:32 +01:00
Joan Sanchez 2c9fd45958 2778 - Allow edit order number
gitea/salix/pipeline/head This commit looks good Details
2021-02-05 12:09:48 +01:00
Joan Sanchez 4fb466d8b2 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2752-entry_import_buys
gitea/salix/pipeline/head This commit looks good Details
2021-02-05 08:41:30 +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
Joan Sanchez 84cef1949b Image size fix
gitea/salix/pipeline/head This commit looks good Details
2021-02-04 18:28:58 +01:00
Carlos Jimenez Ruiz f1704f94f1 invoiceOut advanced search by fiscal id
gitea/salix/pipeline/head This commit looks good Details
2021-02-04 13:43:21 +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 215e0c9fc4 Image download fix for images without extension
gitea/salix/pipeline/head This commit looks good Details
2021-02-03 15:01:09 +01:00
Joan Sanchez a845f53f0a Bug fixes
gitea/salix/pipeline/head This commit looks good Details
2021-02-03 12:43:30 +01:00
Carlos Jimenez Ruiz ff94b182a1 error is not a required field
gitea/salix/pipeline/head This commit looks good Details
2021-02-03 10:16:46 +01:00
Joan Sanchez 38311f526d Calculate volume
gitea/salix/pipeline/head This commit looks good Details
2021-02-03 09:03:03 +01:00
Carlos Jimenez Ruiz dd9e9bac9b removed unused character
gitea/salix/pipeline/head This commit looks good Details
2021-02-02 14:02:57 +01:00
Carlos Jimenez Ruiz a77c5c5b66 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2617-add_scope_days_on_travel_index 2021-02-02 14:02:30 +01:00
Carlos Jimenez Ruiz a0d6e53dbb polutd test removed 2021-02-02 14:00:35 +01:00
Jorge Padawan 186e59c7ae .
gitea/salix/pipeline/head This commit looks good Details
2021-02-02 13:18:17 +01:00
Jorge Padawan b57578f933 Remove parenthesis on expectedParams
gitea/salix/pipeline/head This commit looks good Details
2021-02-02 13:12:54 +01:00
Jorge Padawan b576c0ad69 Remove parenthesis on expectedParams
gitea/salix/pipeline/head This commit looks good Details
2021-02-02 13:11:17 +01:00
Jorge Padawan 1a87eb3085 Remove bad code
gitea/salix/pipeline/head This commit looks good Details
2021-02-02 12:52:24 +01:00
Jorge Padawan 218a19d7da Removed bad code
gitea/salix/pipeline/head This commit looks good Details
2021-02-02 12:37:00 +01:00
Jorge Padawan c7424997d5 Removed bad code 2021-02-02 12:22:18 +01:00
Jorge Padawan ee6b694637 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-02-02 11:58:07 +01:00
Jorge Padawan a1a3607d3c Remove bad code 2021-02-02 11:57:42 +01:00
Jorge Padawan 6fed5a21b7 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2617-add_scope_days_on_travel_index
gitea/salix/pipeline/head This commit looks good Details
2021-02-02 11:50:09 +01:00
Jorge Padawan a2e78a8f25 Merge branch '2617-add_scope_days_on_travel_index' of https://gitea.verdnatura.es/verdnatura/salix into 2617-add_scope_days_on_travel_index 2021-02-02 11:49:53 +01:00
Jorge Padawan 60015178a6 Remove bad code 2021-02-02 11:49:42 +01:00
Joan Sanchez f6af7f14af Merge pull request 'Add list of emails from client' (#523) from 2723-Format_emails_for_summaries into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #523
Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>
2021-02-02 10:06:22 +00:00
Carlos Jimenez Ruiz 6a2c131593 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2617-add_scope_days_on_travel_index
gitea/salix/pipeline/head This commit looks good Details
2021-02-02 10:59:59 +01:00
Jorge Padawan f0f96f1ab5 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2617-add_scope_days_on_travel_index
gitea/salix/pipeline/head This commit looks good Details
2021-02-02 10:27:52 +01:00
Jorge Padawan db5e786235 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-02-02 10:26:27 +01:00
Jorge Padawan 7b7571ae77 Fixed problems with default search 2021-02-02 10:26:10 +01:00
Jorge Padawan 9d96a4a6a1 Fixed problems test e2e 2021-02-02 10:17:13 +01:00
Joan Sanchez dea858c314 Removed focus
gitea/salix/pipeline/head This commit looks good Details
2021-02-02 10:12:37 +01:00
Joan Sanchez 524d1274c9 Merge branch 'dev' into 2762-worker_delete_entry
gitea/salix/pipeline/head Build queued... Details
2021-02-02 09:11:48 +00:00
Joan Sanchez a21d8acde6 2762 - Delete entry ass teamBoss
gitea/salix/pipeline/head This commit looks good Details
2021-02-02 10:07:13 +01:00
Joan Sanchez 3f4ebdebf6 Merge branch 'dev' into 2723-Format_emails_for_summaries
gitea/salix/pipeline/head This commit looks good Details
2021-02-02 08:22:34 +00:00
Joan Sanchez 20116ac620 2741 - Claim detail deletion visual fix
gitea/salix/pipeline/head This commit looks good Details
2021-02-02 09:08:11 +01:00
Jorge Padawan 94897a830a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2617-add_scope_days_on_travel_index 2021-02-02 08:48:03 +01:00
Jorge Padawan e1db173185 Changed scope days value to a correct sentence 2021-02-01 13:29:12 +01:00
Jorge Padawan 6bba5ec126 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2617-add_scope_days_on_travel_index
gitea/salix/pipeline/head This commit looks good Details
2021-02-01 13:21:16 +01:00
Jorge Padawan 3f963f2d99 changed message
gitea/salix/pipeline/head This commit looks good Details
2021-02-01 13:19:26 +01:00
Jorge Padawan 4f644cb708 Changed name of value on scope days test
gitea/salix/pipeline/head This commit looks good Details
2021-02-01 13:13:18 +01:00
Jorge Padawan 811edc054b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2692-add_advanced_search_engine2 2021-02-01 13:09:47 +01:00
Joan Sanchez 4ac207c568 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2763-notify_urgent_issue
gitea/salix/pipeline/head This commit looks good Details
2021-02-01 12:58:50 +01:00
Javi Gallego a08c5c6ff7 error de ruta arreglado
gitea/salix/pipeline/head This commit looks good Details
2021-02-01 10:51:17 +01:00
Carlos Jimenez Ruiz 17c784e06f Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2517-clientBalanceCompensaciones 2021-02-01 09:52:42 +01:00
Joan Sanchez f5f4c5936d 2763 - Notify urgen issues
gitea/salix/pipeline/head This commit looks good Details
2021-02-01 09:29:47 +01:00
Jorge Padawan 7408d22b66 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2603-travel_create_autocomplete_date 2021-02-01 09:05:06 +01:00
Jorge Padawan 9cf5d73be7 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2723-Format_emails_for_summaries
gitea/salix/pipeline/head This commit looks good Details
2021-01-29 16:15:26 +01:00
Jorge Padawan b600c18950 Add scope days on travel
gitea/salix/pipeline/head This commit looks good Details
2021-01-29 11:45:35 +01:00
Joan Sanchez f66a5ecfdc 2748 - Added module keybinds
gitea/salix/pipeline/head This commit looks good Details
2021-01-29 09:46:57 +01:00
Carlos Jimenez Ruiz c442eaa0c7 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2517-clientBalanceCompensaciones 2021-01-29 09:13:58 +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
Carlos Jimenez Ruiz 5d82d469a7 Merge branch 'dev' into 2580-fetched_tags_refactor
gitea/salix/pipeline/head This commit looks good Details
2021-01-28 16:04:37 +00: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
Joan Sanchez 7bcbf5303e Fix where
gitea/salix/pipeline/head This commit looks good Details
2021-01-28 16:08:57 +01:00
Joan Sanchez 9d5d2e9177 Added method prune again
gitea/salix/pipeline/head This commit looks good Details
2021-01-28 15:57:33 +01:00
Carlos Jimenez Ruiz 4ab42e5850 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2580-fetched_tags_refactor
gitea/salix/pipeline/head This commit looks good Details
2021-01-28 15:10:54 +01:00
Carlos Jimenez Ruiz 5c466e1163 vn-fetched-tags visual refactor 2021-01-28 15:10:47 +01:00
Jorge Padawan 797f96f4c8 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2692-add_advanced_search_engine2 2021-01-28 14:14:22 +01:00
Jorge Padawan bef8fca529 Rework the test on main section 2021-01-28 14:14:14 +01:00
Joan Sanchez ca47fe6827 2476 - downloadImages() method refactor
gitea/salix/pipeline/head This commit looks good Details
2021-01-28 12:23:18 +01:00
Javi Gallego 4b302915b5 fallo validateasync
gitea/salix/pipeline/head This commit looks good Details
2021-01-27 09:14:37 +01:00
Bernat Exposito df073094f8 fix test updateVolume
gitea/salix/pipeline/head This commit looks good Details
2021-01-26 09:07:00 +01:00
Joan Sanchez 8c71d76988 2752 - Import json file
gitea/salix/pipeline/head This commit looks good Details
2021-01-26 07:21:05 +01:00
Javi Gallego 3026ca8d69 Merge branch 'dev' into 2517-clientBalanceCompensaciones
gitea/salix/pipeline/head This commit looks good Details
2021-01-25 14:16:41 +01:00
Jorge Padawan 2b4f4cf8f4 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2723-Format_emails_for_summaries
gitea/salix/pipeline/head This commit looks good Details
2021-01-25 11:04:45 +01:00
Jorge Padawan 6d9967ba9f Add list of emails from client
gitea/salix/pipeline/head This commit looks good Details
2021-01-25 10:59:24 +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 d61ab94398 acl conflicto
gitea/salix/pipeline/head This commit looks good Details
2021-01-25 07:49:57 +01:00
Joan Sanchez 7bd89009cb Requested changes
gitea/salix/pipeline/head This commit looks good Details
2021-01-25 07:26:35 +01:00
Joan Sanchez 257b61d256 Requested changes
gitea/salix/pipeline/head This commit looks good Details
2021-01-25 07:25:02 +01:00
Joan Sanchez a6e4d68017 Merge branch 'dev' into 2517-clientBalanceCompensaciones
gitea/salix/pipeline/head This commit looks good Details
2021-01-22 15:05:39 +00:00
Javi Gallego 16931693c7 slice error
gitea/salix/pipeline/head This commit looks good Details
2021-01-22 15:46:03 +01:00
Javi Gallego 93417e9676 refactor
gitea/salix/pipeline/head There was a failure building this commit Details
2021-01-22 14:45:02 +01:00
Javi Gallego 161514582d movido de directorio 2021-01-22 14:41:40 +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
Joan Sanchez 4d1c2ff8ee Requested changed
gitea/salix/pipeline/head This commit looks good Details
2021-01-22 12:57:21 +01:00
Joan Sanchez d26505d25e Requested changed
gitea/salix/pipeline/head This commit looks good Details
2021-01-22 12:56:46 +01:00
Carlos Jimenez Ruiz 9a349e789c added missin icon property to fixedPrice route
gitea/salix/pipeline/head This commit looks good Details
2021-01-22 12:15:03 +01:00
Carlos Jimenez Ruiz 293dbb3948 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2677-rating_component 2021-01-22 12:14:19 +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
Carlos Jimenez Ruiz c3ac7b671f 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-22 11:32:35 +01:00
Carlos Jimenez Ruiz 4bf6051e73 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2583-create_supplierAccount_section 2021-01-22 10:19:39 +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
Bernat Exposito b25ef7016a cr changes
gitea/salix/pipeline/head This commit looks good Details
2021-01-21 18:42:40 +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 0cf3f198ef Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2583-create_supplierAccount_section
gitea/salix/pipeline/head This commit looks good Details
2021-01-21 11:50:32 +01:00
Jorge Padawan 05d6484a33 Add message if BIC already exist
gitea/salix/pipeline/head This commit looks good Details
2021-01-21 10:48:25 +01:00
Carlos Jimenez Ruiz 42e7fa7047 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2517-clientBalanceCompensaciones
gitea/salix/pipeline/head This commit looks good Details
2021-01-21 10:25:39 +01:00
Carlos Jimenez Ruiz 9fc14c70ae bug fixed 2021-01-21 10:25:25 +01:00
Bernat Exposito 81c14a649b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2589-entry_index
gitea/salix/pipeline/head This commit looks good Details
2021-01-21 09:46:22 +01:00
Bernat Exposito 678ee0644d delete order by in entry index
gitea/salix/pipeline/head This commit looks good Details
2021-01-21 09:45:18 +01:00
Joan Sanchez 5e4c320310 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2677-rating_component
gitea/salix/pipeline/head This commit looks good Details
2021-01-21 09:26:02 +01:00
Bernat Exposito eda65c14c1 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2717-order_index
gitea/salix/pipeline/head This commit looks good Details
2021-01-21 08:48:24 +01:00
Carlos Jimenez Ruiz 17b7ffeec3 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2609-travel_index_addEntry 2021-01-20 16:04:13 +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
Jorge Padawan e205ebba72 Added main spec and fixed line on search-panel spec
gitea/salix/pipeline/head This commit looks good Details
2021-01-20 14:49:06 +01:00
Carlos Jimenez Ruiz 01191b3f0f excluded faling tests for future fixing 2021-01-20 14:43:20 +01:00
Carlos Jimenez Ruiz fcf60ac297 excluded failing test for future fixing 2021-01-20 14:40:32 +01:00
Carlos Jimenez Ruiz fe04f00c28 fixed unit test for upsertFixedPrice 2021-01-20 14:39:23 +01:00
Jorge Padawan d8c4fa1e22 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-20 14:37:29 +01:00
Joan Sanchez 6451d9d511 Merge branch 'dev' into 2677-rating_component
gitea/salix/pipeline/head This commit looks good Details
2021-01-20 13:03:33 +00:00
Joan Sanchez 5df35ea8e9 Removed unused code
gitea/salix/pipeline/head This commit looks good Details
2021-01-20 14:01:57 +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
Joan Sanchez c9dc9495dc 2677 - Added rating component to order catalog
gitea/salix/pipeline/head This commit looks good Details
2021-01-20 13:51:30 +01:00
Jorge Padawan 0183f956d7 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-20 13:23:40 +01:00
Jorge Padawan 91979f5d69 Add scopeDays to search bar on route 2021-01-20 13:19:28 +01:00
Bernat Exposito 0f17fca0a1 pr order by changes
gitea/salix/pipeline/head This commit looks good Details
2021-01-20 11:42:45 +01:00
Bernat Exposito c1202789dc Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2589-entry_index 2021-01-20 11:31:06 +01:00
Bernat Exposito a3d4f674c6 order index changes
gitea/salix/pipeline/head This commit looks good Details
2021-01-20 11:28:15 +01:00
Carlos Jimenez Ruiz 843608c47f Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2564-item_priceFixed
gitea/salix/pipeline/head There was a failure building this commit Details
2021-01-20 09:17:55 +01:00
Joan Sanchez 3a2db713e0 Removed unused $httpBackend
gitea/salix/pipeline/head This commit looks good Details
2021-01-20 07:38:09 +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
Carlos Jimenez Ruiz f946e63a86 e2e path for item fixed price 2021-01-19 20:56:33 +01:00
Carlos Jimenez Ruiz fc0f9730da Merge branch 'dev' into 1823-catalog_no_refresh
gitea/salix/pipeline/head This commit looks good Details
2021-01-19 14:13:38 +00:00
Joan Sanchez bbfb230427 Removed clog
gitea/salix/pipeline/head This commit looks good Details
2021-01-19 14:30:06 +01:00
Joan Sanchez 9935f7f4ee Updated unit test
gitea/salix/pipeline/head This commit looks good Details
2021-01-19 14:27:58 +01:00
Joan Sanchez 6d35a4a160 1823 - Added independent order object from card
gitea/salix/pipeline/head This commit looks good Details
2021-01-19 13:57:04 +01:00
Bernat Exposito e9f408d5ba delete comments
gitea/salix/pipeline/head This commit looks good Details
2021-01-19 13:44:14 +01:00
Carlos Jimenez Ruiz 4f7c2f3afd added placeholder and fixed css 2021-01-19 13:30:07 +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
Bernat Exposito 426249f9bf entry index changes
gitea/salix/pipeline/head This commit looks good Details
2021-01-19 12:50:11 +01:00
Carlos Jimenez Ruiz e859a1b837 removed incorrect icon
gitea/salix/pipeline/head This commit looks good Details
2021-01-19 11:14:43 +01:00
Javi Gallego 043a74b548 Merge branch 'dev' into 2517-clientBalanceCompensaciones
gitea/salix/pipeline/head This commit looks good Details
2021-01-19 10:20:45 +01:00
Joan Sanchez b99ac2c9d5 Merge branch 'dev' into 2678-Delete_description_on_travel_thermograph
gitea/salix/pipeline/head This commit looks good Details
2021-01-19 08:51:38 +00:00
Javi Gallego 49b0bca721 refactor autocomplete
gitea/salix/pipeline/head This commit looks good Details
2021-01-19 09:27:15 +01:00
Jorge Padawan aea07832b1 Delete description from thermograph create
gitea/salix/pipeline/head This commit looks good Details
2021-01-19 09:24:37 +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 52a1e3f652 fixed price controller tests
gitea/salix/pipeline/head This commit looks good Details
2021-01-18 16:32:54 +01:00
Carlos Jimenez Ruiz 3ec641f733 filter unit tests 2021-01-18 15:42:38 +01:00
Joan Sanchez d6ac9dba4c Updated e2e
gitea/salix/pipeline/head This commit looks good Details
2021-01-18 14:53:15 +01:00
Joan Sanchez 895fd4c9e8 Updated unit test
gitea/salix/pipeline/head This commit looks good Details
2021-01-18 14:22:27 +01:00
Carlos Jimenez Ruiz 8d6dd3e03a minor refactors 2021-01-18 14:17:01 +01:00
Carlos Jimenez Ruiz 3251d737e6 fixed price index implementation 2021-01-18 14:16:39 +01:00
Joan Sanchez b142d5800e Merge branch 'dev' into 2724-ticket_service_fix
gitea/salix/pipeline/head This commit looks good Details
2021-01-18 11:24:11 +00:00
Jorge Benedito 622c43f4a0 Merge branch 'dev' into 2721-Add_column_stem_multiplier
gitea/salix/pipeline/head This commit looks good Details
2021-01-18 10:53:49 +00:00
Jorge Padawan 97c8faaf50 Add column multiplier on item section
gitea/salix/pipeline/head This commit looks good Details
2021-01-18 11:43:48 +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
Joan Sanchez ddf5993277 2708 - Added report
gitea/salix/pipeline/head There was a failure building this commit Details
2021-01-18 08:33:20 +01:00
Bernat Exposito 7da3aad2de Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2602-entry_index_searchBar
gitea/salix/pipeline/head This commit looks good Details
2021-01-18 08:19:20 +01:00
Bernat Exposito 25535576c5 pr changes resolved 2021-01-18 08:19:17 +01:00
Jorge Padawan fe6124b691 Put log in the section
gitea/salix/pipeline/head This commit looks good Details
2021-01-15 13:57:36 +01:00
Jorge Padawan 51627af395 Fixed open popup 2021-01-15 13:13:51 +01:00
Jorge Padawan c5ace0a939 create the tests fields for create Account section 2021-01-15 11:24:32 +01:00
Jorge Padawan daa8bafb09 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2583-create_supplierAccount_section 2021-01-15 08:56:20 +01:00
Joan Sanchez 8fed9dacd7 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2021-01-14 13:56:35 +01:00
Joan Sanchez efb0d2f380 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/pipeline/head This commit looks good Details
2021-01-14 13:42:09 +01:00
Joan Sanchez 53e80d29c8 Consumption hotfix
gitea/salix/pipeline/head This commit looks good Details
2021-01-14 13:41:50 +01:00
Bernat Exposito a45a76018b entry search panel changes
gitea/salix/pipeline/head This commit looks good Details
2021-01-14 09:26:50 +01:00
Joan Sanchez 33289b3ac1 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2021-01-13 11:18:02 +01:00
Joan Sanchez 5059abca80 Dms edit hotfix
gitea/salix/pipeline/head This commit looks good Details
2021-01-13 10:40:51 +01:00
Joan Sanchez 7bcad01bef Disabled loggable
gitea/salix/pipeline/head This commit looks good Details
2021-01-12 14:25:47 +01:00
Joan Sanchez dd29b351d2 Disabled loggable
gitea/salix/pipeline/head This commit looks good Details
2021-01-12 14:25:01 +01:00
Jorge Padawan 6bc7602d53 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2583-create_supplierAccount_section 2021-01-12 11:10:05 +01:00
Jorge Padawan 4e1b9b911b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2583-create_supplierAccount_section 2021-01-12 11:05:35 +01:00
Jorge Padawan 1a4c631c70 Fix for good practique code
gitea/salix/pipeline/head This commit looks good Details
2021-01-12 11:00:42 +01:00
Jorge Padawan b4899fc0ff Fix for good practique code
gitea/salix/pipeline/head This commit looks good Details
2021-01-12 10:17:12 +01:00
Jorge Padawan 9ca2e677bd Fix for good practique code 2021-01-12 10:15:33 +01:00
Jorge Padawan 509de4fa0a Fix for good practique code
gitea/salix/pipeline/head This commit looks good Details
2021-01-12 10:11:37 +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
Jorge Padawan f45aa7937d Added conditionals with rols to display or not the icons with link 2021-01-12 07:39:12 +01:00
Javi Gallego 6acfe7f1cf minorBugs
gitea/salix/pipeline/head This commit looks good Details
2021-01-11 17:18:37 +01:00
Javi Gallego d3b5300553 test
gitea/salix/pipeline/head This commit looks good Details
2021-01-11 16:30:14 +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
Bernat Exposito 5f1cdc790a Merge branch '2609-travel_index_addEntry' of https://gitea.verdnatura.es/verdnatura/salix into 2609-travel_index_addEntry
gitea/salix/pipeline/head This commit looks good Details
2021-01-11 10:20:59 +01:00
Joan Sanchez 035bdfb1ad Rounded box
gitea/salix/pipeline/head This commit looks good Details
2021-01-11 10:08:33 +01:00
Bernat Exposito 0e0ce9f3e9 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2609-travel_index_addEntry 2021-01-11 09:44:20 +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
Javi Gallego ea6e234cde minor fixes
gitea/salix/pipeline/head This commit looks good Details
2021-01-11 08:01:57 +01:00
Jorge Padawan b8827ec63d Fix problems with ACL and the autocomplete of bank entity
gitea/salix/pipeline/head There was a failure building this commit Details
2021-01-08 16:45:20 +01:00
Jorge Padawan 403964934d Change order of iban and entity name 2021-01-08 16:01:13 +01:00
Jorge Padawan 5a30bf5fa4 2650 add links to edit on summaries 2021-01-08 15:43:33 +01:00
Javi Gallego 6c2138a69a Merge branch 'dev' into 2517-clientBalanceCompensaciones
gitea/salix/pipeline/head This commit looks good Details
2021-01-08 15:24:05 +01:00
Javi Gallego a9ec319d4f test 2021-01-08 15:22:41 +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
Jorge Padawan 5e201419f8 Second step, add component bankEntity 2021-01-08 10:46:50 +01:00
Joan Sanchez 1cc2710231 Fixes
gitea/salix/pipeline/head This commit looks good Details
2021-01-08 10:16:38 +01:00
Jorge Padawan 344840d2c9 First step add-button-edit-summaries 2021-01-08 08:43:28 +01:00
Jorge Padawan 31f18db72d first step bankEntity 2021-01-07 15:14:50 +01:00
Jorge Padawan 6017894ba9 first step bankEntity 2021-01-07 15:14:38 +01:00
Joan Sanchez 88b2041fde Changed order
gitea/salix/pipeline/head This commit looks good Details
2021-01-07 14:33:42 +01:00
Joan Sanchez 7172d6bcd1 Merge branch 'dev' into 2609-travel_index_addEntry
gitea/salix/pipeline/head This commit looks good Details
2021-01-07 13:32:37 +00:00
Joan Sanchez 56925be41f 2708 - Extra community changes
gitea/salix/pipeline/head This commit looks good Details
2021-01-07 14:21:17 +01:00
Javi Gallego c0cc91b6c3 Merge branch 'dev' into 2517-clientBalanceCompensaciones
gitea/salix/pipeline/head This commit looks good Details
2021-01-07 09:11:34 +01:00
Joan Sanchez c454273405 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/pipeline/head This commit looks good Details
2021-01-06 12:44:28 +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
Joan Sanchez 94c8c115e5 Font hotfix
gitea/salix/pipeline/head This commit looks good Details
2021-01-05 13:51:17 +01:00
Joan Sanchez 062e1514c9 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into test 2021-01-04 13:50:55 +01:00
Javi Gallego 1291fc4b6c acl
gitea/salix/pipeline/head This commit looks good Details
2021-01-04 11:49:32 +01:00
Bernat Exposito ccfeea8e74 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2609-travel_index_addEntry 2021-01-04 10:55:53 +01:00
Bernat Exposito f0fb906670 add in travel index, entry create 2021-01-04 10:54:46 +01:00
Carlos Jimenez Ruiz b843914cec Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2685-create_test_e2e_entryObservation 2020-12-31 16:13:40 +01:00
Joan Sanchez a521ad4262 Fixed claim basicData back error
gitea/salix/pipeline/head This commit looks good Details
2020-12-31 14:18:06 +01:00
Carlos Jimenez Ruiz fee454ca44 Merge branch 'dev' into 2696-geo_autocomplete
gitea/salix/pipeline/head This commit looks good Details
2020-12-31 11:53:50 +00: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
Carlos Jimenez Ruiz 0471855372 Merge branch 'dev' into 2696-geo_autocomplete
gitea/salix/pipeline/head This commit looks good Details
2020-12-31 10:02:52 +00:00
Carlos Jimenez Ruiz 5dd7db23ec submit should always be enabled for creation forms
gitea/salix/pipeline/head This commit looks good Details
2020-12-31 10:39:37 +01:00
Joan Sanchez 6bbe33433d 2696 - Geo autocompletion fix
gitea/salix/pipeline/head This commit looks good Details
2020-12-31 10:30:51 +01:00
Carlos Jimenez Ruiz 3b73e1bee2 supplier updateFiscalData changed to table config
gitea/salix/pipeline/head This commit looks good Details
2020-12-31 10:28:35 +01:00
Carlos Jimenez Ruiz 4754d5481b added street arg to updateFiscalData method
gitea/salix/pipeline/head This commit looks good Details
2020-12-31 10:13:42 +01:00
Carlos Jimenez Ruiz 92d9435125 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2661-travel_cloneWithEntries 2020-12-31 09:27:38 +01:00
Jorge Padawan b403899072 modificated value of "order" on client and supplier
gitea/salix/pipeline/head This commit looks good Details
2020-12-30 15:39:27 +01:00
Carlos Jimenez Ruiz e356dd9e5e Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2661-travel_cloneWithEntries 2020-12-30 14:55:14 +01:00
Jorge Padawan f2742b88a2 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2689-add_id_in_typeTransaction_client_and_supplier
gitea/salix/pipeline/head This commit looks good Details
2020-12-30 10:49:58 +01:00
Jorge Padawan c9ae5989f9 Add id on description of typeTransiction on client and supplier 2020-12-30 10:49:02 +01:00
Javi Gallego 0d5540b639 Merge branch 'dev' into 2517-clientBalanceCompensaciones
gitea/salix/pipeline/head This commit looks good Details
2020-12-29 17:00:45 +01:00
Javi Gallego 3db3d65600 test 2020-12-29 17:00:22 +01:00
Joan Sanchez c2d50c6044 Dup entry error handler
gitea/salix/pipeline/head This commit looks good Details
2020-12-29 14:02:26 +01:00
Joan Sanchez a3f17ae302 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2661-travel_cloneWithEntries 2020-12-29 13:55:06 +01:00
Joan Sanchez 2886e02328 Enabled loggable for locations
gitea/salix/pipeline/head This commit looks good Details
2020-12-29 08:50:12 +01:00
Joan Sanchez f4ff31a294 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2657-zone_log 2020-12-29 08:09:49 +01:00
Joan Sanchez f29840b37b Buyer ACL
gitea/salix/pipeline/head This commit looks good Details
2020-12-29 07:52:36 +01:00
Carlos Jimenez Ruiz 4a60e1da1e Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2685-create_test_e2e_entryObservation 2020-12-28 15:36:35 +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
Jorge Padawan 5af51763d6 Created back test field for entryObservation
gitea/salix/pipeline/head This commit looks good Details
2020-12-28 12:55:28 +01:00
Carlos Jimenez Ruiz e6106b1aa9 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2665-route_index_multi_clone
gitea/salix/pipeline/head This commit looks good Details
2020-12-24 11:31:27 +01:00
Carlos Jimenez Ruiz 8ede30398b clone feature for routes index 2020-12-24 11:31:20 +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
Jorge Padawan 2948747da3 Seccion nueva, "Note" mas campo entryObservation
gitea/salix/pipeline/head This commit looks good Details
2020-12-23 12:25:12 +01:00
Juan Ferrer d064bc0417 Merge branch 'master' into test
gitea/salix/pipeline/head This commit looks good Details
2020-12-23 00:00:38 +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
Javi Gallego 0c7ddd863d xdiario test ok
gitea/salix/pipeline/head There was a failure building this commit Details
2020-12-22 10:08:11 +01:00
Javi Gallego 36bace2a94 Merge branch 'dev' into 2517-clientBalanceCompensaciones
gitea/salix/pipeline/head This commit looks good Details
2020-12-22 07:42:28 +01:00
Carlos Jimenez Ruiz be1a317df8 Merge branch 'dev' into 2663-route_dragdrop
gitea/salix/pipeline/head This commit looks good Details
2020-12-21 14:02:05 +00:00
Joan Sanchez 35dc2a533b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2663-route_dragdrop
gitea/salix/pipeline/head This commit looks good Details
2020-12-21 14:52:08 +01:00
Joan Sanchez 1419acb8a7 2663 - Drag & drop ticket to route index
gitea/salix/pipeline/head This commit looks good Details
2020-12-21 14:48:47 +01:00
Carlos Jimenez Ruiz ec0ae8f07c years previous to contrar error corrected
gitea/salix/pipeline/head This commit looks good Details
2020-12-21 13:52:37 +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
Carlos Jimenez Ruiz ffc9b8dba9 Merge pull request '2576 - Photo upload component' (#470) from 2576-photo_uploader into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #470
Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>
2020-12-21 09:55:45 +00:00
Javi Gallego 340927799c Merge branch 'dev' into 2517-clientBalanceCompensaciones
gitea/salix/pipeline/head This commit looks good Details
2020-12-21 09:53:00 +01:00
Javi Gallego 3a6d62ac7d xdiario
gitea/salix/pipeline/head This commit looks good Details
2020-12-21 09:52:27 +01:00
Bernat Exposito d4ab25f974 Merge pull request '2616-supplier_consumption' (#480) from 2616-supplier_consumption into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #480
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2020-12-21 07:08:12 +00:00
Bernat Exposito 1a641d1d4b cr changes
gitea/salix/pipeline/head This commit looks good Details
2020-12-18 22:31:46 +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
Jorge Padawan 2fe22efe36 filter vehicles by worehouse
gitea/salix/pipeline/head This commit looks good Details
2020-12-18 15:12:52 +01:00
Bernat Exposito ac6d97c026 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2616-supplier_consumption
gitea/salix/pipeline/head This commit looks good Details
2020-12-18 10:10:09 +01:00
Bernat Exposito b9344832d6 cr changes 2020-12-18 10:08:51 +01:00
Jorge Benedito 29ec268113 Merge pull request '2682-supplier_billingData_e2e + fixes' (#482) from 2682-supplier_billingData_e2e into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #482
Reviewed-by: Jorge Benedito <jorgebl@verdnatura.es>
2020-12-18 08:34:00 +00:00
Javi Gallego 87adbbfa3c Merge branch 'dev' into 2517-clientBalanceCompensaciones
gitea/salix/pipeline/head This commit looks good Details
2020-12-18 08:21:36 +01:00
Jorge Padawan 33237dad86 Add acl to supplier billing data
gitea/salix/pipeline/head This commit looks good Details
2020-12-17 12:29:37 +01:00
Jorge Benedito Llopis 7b3128d646 Remove manager restriction to edit client credits
gitea/salix/pipeline/head This commit looks good Details
2020-12-17 10:07:17 +01:00
Javi Gallego 9abf23072a frontTest
gitea/salix/pipeline/head This commit looks good Details
2020-12-16 16:25:19 +01:00
Carlos Jimenez Ruiz 9df29b8be3 supplier.billingData buttons css update 2020-12-16 15:44:35 +01:00
Carlos Jimenez Ruiz c13e9383ba css refactor + watcher from credit insurance 2020-12-16 13:46:04 +01:00
Carlos Jimenez Ruiz ec7ad986ac Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2279-save_button_if_new_data
gitea/salix/pipeline/head This commit looks good Details
2020-12-16 11:36:21 +01:00
Carlos Jimenez Ruiz 6261f10576 last account module refactors 2020-12-16 11:36:11 +01:00
Carlos Jimenez Ruiz 57a6df762a zone module refactors 2020-12-16 11:22:13 +01:00
Carlos Jimenez Ruiz 2a63a3b0a4 account or user module refactors 2020-12-16 11:07:06 +01:00
Carlos Jimenez Ruiz e9f73c3299 worker module refactors 2020-12-16 10:32:32 +01:00
Carlos Jimenez Ruiz 2e9267a25e route module refactors 2020-12-16 10:21:35 +01:00
Carlos Jimenez Ruiz 0258c4a276 ticket module refactors 2020-12-16 10:21:20 +01:00
Javi Gallego 2bb9125eee Merge branch 'dev' into 2517-clientBalanceCompensaciones
gitea/salix/pipeline/head This commit looks good Details
2020-12-16 08:34:54 +01:00
Javi Gallego 963db11686 funcionalidad
gitea/salix/pipeline/head This commit looks good Details
2020-12-16 08:33:08 +01:00
Bernat Exposito e1ac64a8d9 supplier consumption 2020-12-16 08:05:41 +01:00
Carlos Jimenez Ruiz 116730a3b2 claim module refactors 2020-12-15 17:24:13 +01:00
Carlos Jimenez Ruiz 5295d3ed06 supplier module refactors 2020-12-15 17:09:05 +01:00
Carlos Jimenez Ruiz 975e5c3b00 travel module refactors 2020-12-15 17:05:15 +01:00
Carlos Jimenez Ruiz b071bfd229 entry module refactors 2020-12-15 16:53:56 +01:00
Carlos Jimenez Ruiz eb19bce1ba client module refactors + dialog css 2020-12-15 16:51:36 +01:00
Carlos Jimenez Ruiz 6f29dabec4 order module refactor 2020-12-15 16:16:02 +01:00
Carlos Jimenez Ruiz 1ba83e7741 cancel button css + item module refactor 2020-12-15 16:07:34 +01:00
Jorge Benedito Llopis 8e11cef8eb Code review refactor
gitea/salix/pipeline/head This commit looks good Details
2020-12-15 09:59:53 +01:00
Carlos Jimenez Ruiz 8e13fa7852 entry module refactors 2020-12-14 17:35:32 +01:00
Jorge Benedito Llopis f62d3139bb Supplier.billingData section 2020-12-14 16:09:17 +01:00
Carlos Jimenez Ruiz 3ad6534160 client module refactors 2020-12-13 14:57:42 +01:00
Carlos Jimenez Ruiz c0289f87e9 order module refactors 2020-12-13 13:55:54 +01:00
Carlos Jimenez Ruiz cbaa95ebda item module refactors 2020-12-13 13:54:17 +01:00
Joan Sanchez 0a4016be41 Updated unit tests & changed ACL
gitea/salix/pipeline/head This commit looks good Details
2020-12-11 15:04:55 +01:00
Joan Sanchez 59c622481f Updated image fixtures
gitea/salix/pipeline/head There was a failure building this commit Details
2020-12-10 13:21:11 +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
Juan Ferrer 6f6f23bec4 LDAP user sync only syncs changed attributes
gitea/salix/pipeline/head This commit looks good Details
2020-12-09 12:28:18 +01:00
Bernat Exposito 96f603a44b refactor descriptors
gitea/salix/pipeline/head This commit looks good Details
2020-12-04 13:40:58 +01:00
Joan Sanchez 4f40075c2e Merge branch 'dev' into 2657-zone_log
gitea/salix/pipeline/head This commit looks good Details
2020-12-03 11:16:18 +00:00
Bernat Exposito aaee855da3 fix ticket component
gitea/salix/pipeline/head Build started... Details
2020-12-03 10:26:49 +01:00
Bernat Exposito 6eeecc553b zoneLog calendar
gitea/salix/pipeline/head This commit looks good Details
2020-12-02 12:49:50 +01:00
Bernat Exposito 6605e5ae4c zoneLog 2020-12-02 12:05:47 +01:00
Juan Ferrer b2a3adc96f LDAP sync hotfix
gitea/salix/pipeline/head This commit looks good Details
2020-11-30 18:50:04 +01:00
Juan Ferrer 61bb2f14ba LDAP sync hotfix
gitea/salix/pipeline/head This commit looks good Details
2020-11-30 18:45:50 +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 5ff364dcf0 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2588-summaries_refactor
gitea/salix/pipeline/head This commit looks good Details
2020-11-25 08:01:47 +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 561991f18c 2628 - Remove item name from search on tag removal
gitea/salix/pipeline/head This commit looks good Details
2020-11-24 13:54:31 +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 b2794dc413 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2569-travel_extra_community
gitea/salix/pipeline/head This commit looks good Details
2020-11-24 10:52:35 +01:00
Carlos Jimenez Ruiz fbb2fc3bdd Merge pull request '2607-preview_icon' (#464) from 2607-preview_icon into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #464
Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>
2020-11-24 09:33:44 +00:00
Joan Sanchez 3329d33ec9 Merge branch 'dev' into 2569-travel_extra_community
gitea/salix/pipeline/head This commit looks good Details
2020-11-24 09:27:14 +00:00
Bernat Exposito 6a7568eb29 Merge branch 'dev' into 2493-route_ticket_drag_and_drop
gitea/salix/pipeline/head This commit looks good Details
2020-11-24 07:36:52 +00: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
Carlos Jimenez Ruiz 4172d0bb9b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2569-travel_extra_community
gitea/salix/pipeline/head This commit looks good Details
2020-11-23 18:51:16 +01:00
Carlos Jimenez Ruiz 1b46359574 removed focus on describe
gitea/salix/pipeline/head This commit looks good Details
2020-11-23 18:42:11 +01:00
Joan Sanchez 52eb39ccda Removed autoload from crud-model
gitea/salix/pipeline/head This commit looks good Details
2020-11-23 14:12:43 +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
Bernat Exposito 37ac312bd5 pr changes
gitea/salix/pipeline/head This commit looks good Details
2020-11-23 13:05:24 +01:00
Bernat Exposito b07ae3f60c Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2493-route_ticket_drag_and_drop 2020-11-23 13:04:38 +01:00
Bernat Exposito 82a7dd0f92 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2579-worker_time_control 2020-11-23 11:49:07 +01:00
Joan Sanchez 93ca804573 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2020-11-23 11:25:15 +01:00
Joan Sanchez 3acc943d85 2639 - Permisos para añadir greuge con rol claimManager
gitea/salix/pipeline/head This commit looks good Details
2020-11-23 11:10:16 +01:00
Joan Sanchez 03158f04ae Updated front unit tests
gitea/salix/pipeline/head This commit looks good Details
2020-11-23 08:12:33 +01:00
Joan Sanchez d40ea52560 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2569-travel_extra_community
gitea/salix/pipeline/head There was a failure building this commit Details
2020-11-20 15:06:34 +01:00
Joan Sanchez 7693a1c449 2569 - Section changes
gitea/salix/pipeline/head There was a failure building this commit Details
2020-11-20 15:05:57 +01:00
Bernat Exposito 4d91b26537 checkinbox moved to worker
gitea/salix/pipeline/head This commit looks good Details
2020-11-20 13:35:01 +01:00
Bernat Exposito 4b40038200 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2493-route_ticket_drag_and_drop
gitea/salix/pipeline/head This commit looks good Details
2020-11-20 12:12:11 +01:00
Bernat Exposito f64a566447 route.ticket drag and drop validation 2020-11-20 12:12:06 +01:00
Carlos Jimenez Ruiz 0465a38684 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2590-client_descriptor_invoices
gitea/salix/pipeline/head This commit looks good Details
2020-11-19 10:52:19 +01:00
Carlos Jimenez Ruiz e8df57dae2 hasToInvoice gets enabled with isActive
gitea/salix/pipeline/head This commit looks good Details
2020-11-19 10:51:28 +01:00
Bernat Exposito 8d60f3fa45 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2587-supplier_minor_changes
gitea/salix/pipeline/head This commit looks good Details
2020-11-19 09:17:58 +01:00
Carlos Jimenez Ruiz fcca5c5eab added a quick link to invoices
gitea/salix/pipeline/head This commit looks good Details
2020-11-18 17:22:40 +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
Bernat Exposito 85b2c96ffd cr changes
gitea/salix/pipeline/head This commit looks good Details
2020-11-18 14:44:07 +01:00
Bernat Exposito fcd7217435 fix test
gitea/salix/pipeline/head This commit looks good Details
2020-11-18 12:10:37 +01:00
Bernat Exposito 781766a155 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2587-supplier_minor_changes
gitea/salix/pipeline/head There was a failure building this commit Details
2020-11-18 11:47:37 +01:00
Bernat Exposito 801fdb076b supplier changes
gitea/salix/pipeline/head There was a failure building this commit Details
2020-11-18 11:47:23 +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
Carlos Jimenez Ruiz 7dc8ae9dbc e2e path for travel descriptor
gitea/salix/pipeline/head This commit looks good Details
2020-11-17 16:52:19 +01:00
Carlos Jimenez Ruiz a7c830d87a refactor
gitea/salix/pipeline/head This commit looks good Details
2020-11-17 15:54:45 +01:00
Carlos Jimenez Ruiz cb88265471 removed commented code
gitea/salix/pipeline/head This commit looks good Details
2020-11-17 11:04:17 +01:00
Carlos Jimenez Ruiz dc7a6d4ce1 dot menu along with clone option
gitea/salix/pipeline/head This commit looks good Details
2020-11-16 19:04: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 c0b2ef9666 travel descriptor quicklinks
gitea/salix/pipeline/head This commit looks good Details
2020-11-16 14:50:03 +01:00
Carlos Jimenez Ruiz 55a1ae0348 added entry descriptor to item last entries 2020-11-16 14:43:35 +01:00
Joan Sanchez f4e9fc83ec Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2569-travel_extra_community
gitea/salix/pipeline/head There was a failure building this commit Details
2020-11-16 10:48:16 +01:00
Juan Ferrer 235f0980a3 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2020-11-13 15:03:48 +01:00
Juan Ferrer dde89e3b9f Merge branch 'test' into dev 2020-11-13 13:50:15 +01:00
Carlos Jimenez Ruiz 1e35e199f7 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2604-travel_index_colors
gitea/salix/pipeline/head This commit looks good Details
2020-11-13 13:22:09 +01:00
Juan Ferrer 6e5eac1f78 Account synchronization fixes
gitea/salix/pipeline/head This commit looks good Details
2020-11-13 13:20:37 +01:00
Carlos Jimenez Ruiz 8373c6f5d1 filter by selection + unit tests for travel index 2020-11-13 13:04:22 +01:00
Juan Ferrer 80cbb53dfe Merge branch 'test' into dev 2020-11-13 10:49:59 +01:00
Juan Ferrer c20abad1ba Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into test 2020-11-13 10:33:38 +01:00
Juan Ferrer cdf6cb661f Login sync fixes 2020-11-13 10:33:34 +01:00
Joan Sanchez 031051abcb Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2569-travel_extra_community
gitea/salix/pipeline/head There was a failure building this commit Details
2020-11-13 09:33:24 +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 4acdfd6d4e Th refactor 2020-11-13 09:30:40 +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 2680ad2c07 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/pipeline/head This commit looks good Details
2020-11-13 07:39:24 +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
Juan Ferrer 2a30f93e00 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/pipeline/head This commit looks good Details
2020-11-12 23:20:33 +01:00
Juan Ferrer 4b46b0787b User syncronization fixes, improvements, refactor 2020-11-12 23:20:25 +01:00
Carlos Jimenez Ruiz 7f899cc4e9 index navigation through anchors
gitea/salix/pipeline/head This commit looks good Details
2020-11-12 16:03:23 +01:00
Joan Sanchez 785453fab3 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into 2569-travel_extra_community
gitea/salix/pipeline/head This commit looks good Details
2020-11-12 15:01:11 +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 a62698330a small refactor
gitea/salix/pipeline/head This commit looks good Details
2020-11-12 09:45:41 +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 95a62f66ad 2548 item diary columns width
gitea/salix/pipeline/head This commit looks good Details
2020-11-11 16:58:56 +01:00
Carlos Jimenez Ruiz 9a8a32ee9b denied & accepted no longer show deny icon
gitea/salix/pipeline/head This commit looks good Details
2020-11-11 16:08:27 +01:00
Carlos Jimenez Ruiz ba86693891 minor refactor
gitea/salix/pipeline/head This commit looks good Details
2020-11-11 15:14:05 +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
Carlos Jimenez Ruiz 74e4a4e42a 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:45:58 +01:00
Carlos Jimenez Ruiz 3a0ff3be38 summary title amended + clientDescriptor for alias
gitea/salix/pipeline/head This commit looks good Details
2020-11-11 12:45:45 +01:00
Joan Sanchez db4f226f6f Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2020-11-11 12:39:15 +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
Joan Sanchez a0d50410aa Added section
gitea/salix/pipeline/head This commit looks good Details
2020-11-11 12:34:07 +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
Carlos Jimenez Ruiz c2f92cb127 small refactor 2020-11-11 12:02:40 +01:00
Bernat Exposito 1e95f0105a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2575-image_download 2020-11-11 10:52:46 +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 53566be56a Merge branch 'dev' into 2584-client_consumption
gitea/salix/pipeline/head This commit looks good Details
2020-11-10 14:03:38 +00:00
Carlos Jimenez Ruiz 45a2a2d8e6 Merge branch 'dev' into 2584-client_consumption
gitea/salix/pipeline/head This commit looks good Details
2020-11-10 13:30:38 +00:00
Joan Sanchez dfbe1a02d2 Removed unused import
gitea/salix/pipeline/head This commit looks good Details
2020-11-10 14:06:41 +01:00
Joan Sanchez 08af948eb0 Merge branch 'dev' into 2574-itemTag_refactor
gitea/salix/pipeline/head This commit looks good Details
2020-11-10 12:39:17 +00: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
Juan Ferrer 58563edbab Focus fixes
gitea/salix/pipeline/head This commit looks good Details
2020-11-07 21:05:14 +01:00
Juan Ferrer 0e2c6ed79a Account focus fix
gitea/salix/pipeline/head This commit looks good Details
2020-11-07 14:05:48 +01:00
Juan Ferrer 2628faa9d0 Sync hotfixes
gitea/salix/pipeline/head This commit looks good Details
2020-11-06 22:55:47 +01:00
Joan Sanchez bcd5e6ea76 2584 - Client consumption fixes
gitea/salix/pipeline/head This commit looks good Details
2020-11-06 08:21:25 +01:00
Carlos Jimenez Ruiz a4ad852390 translations refactor
gitea/salix/pipeline/head This commit looks good Details
2020-11-05 13:59:24 +01:00
Bernat Exposito 8765a18bbb fix supplier routes
gitea/salix/pipeline/head This commit looks good Details
2020-11-05 11:46:15 +01:00
Bernat Exposito 0e3d636845 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2544-supplier_basicData
gitea/salix/pipeline/head This commit looks good Details
2020-11-05 10:50:21 +01:00
Joan Sanchez a30cfd2218 Added unit test
gitea/salix/pipeline/head This commit looks good Details
2020-11-05 09:21:20 +01:00
Joan Sanchez 4c88a46b63 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2574-itemTag_refactor 2020-11-05 09:12:25 +01:00
Carlos Jimenez Ruiz cd04ad8518 Merge branch '2563-supplier_fiscalData' of https://gitea.verdnatura.es/verdnatura/salix into 2563-supplier_fiscalData
gitea/salix/pipeline/head This commit looks good Details
2020-11-04 15:21:23 +01:00
Carlos Jimenez Ruiz c826c1ccc1 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2563-supplier_fiscalData 2020-11-04 15:19:07 +01:00
Joan Sanchez b65f48f0d9 Updated unit test
gitea/salix/pipeline/head This commit looks good Details
2020-11-04 14:35:27 +01:00
Joan Sanchez 2a0d2f4394 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2574-itemTag_refactor 2020-11-04 14:34:59 +01:00
Joan Sanchez c5421ee543 Merge branch 'dev' into 2534-sage_taxDataChecked
gitea/salix/pipeline/head This commit looks good Details
2020-11-04 12:39:30 +00:00
Joan Sanchez 0570d83a6d Requested changes
gitea/salix/pipeline/head This commit looks good Details
2020-11-04 13:38:09 +01:00
Joan Sanchez 16b774d585 Catalog tag selection
gitea/salix/pipeline/head There was a failure building this commit Details
2020-11-04 13:19:43 +01:00
Joan Sanchez 2b6048ca4d Removed comment block
gitea/salix/pipeline/head This commit looks good Details
2020-11-04 12:45:02 +01:00
Carlos Jimenez Ruiz d933568745 Merge branch '2563-supplier_fiscalData' of https://gitea.verdnatura.es/verdnatura/salix into 2563-supplier_fiscalData 2020-11-04 11:49:11 +01:00
Joan Sanchez fd05455027 Postcode auto-fill fix
gitea/salix/pipeline/head This commit looks good Details
2020-11-04 11:37:54 +01:00
Joan Sanchez a325ef2a78 2574 - ItemTag refactor sourceTable
gitea/salix/pipeline/head There was a failure building this commit Details
2020-11-04 11:29:10 +01:00
Carlos Jimenez Ruiz d533e9da2e Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2563-supplier_fiscalData 2020-11-03 09:22:07 +01:00
Juan Ferrer fc957eda6c Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good Details
2020-11-02 19:58:45 +01:00
Juan Ferrer b3ab1fe059 Sync fixes & improvements
gitea/salix/pipeline/head This commit looks good Details
2020-11-02 19:58:07 +01:00
Joan Sanchez 413283288f Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2563-supplier_fiscalData
gitea/salix/pipeline/head This commit looks good Details
2020-11-02 15:38:23 +01:00
Joan Sanchez 15b7280222 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2563-supplier_fiscalData 2020-11-02 14:31:39 +01:00
Joan Sanchez 590de622f5 Added model validations 2020-11-02 14:30:33 +01:00
Carlos Jimenez Ruiz 7ac1807495 removed focus from html template
gitea/salix/pipeline/head This commit looks good Details
2020-11-02 14:04:11 +01:00
Carlos Jimenez Ruiz ffaf93ab83 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2538-supplier_contact 2020-11-02 11:14:20 +01:00
Juan Ferrer b6da896fe7 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2020-11-02 10:11:34 +01:00
Carlos Jimenez Ruiz 117270e3fc Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2538-supplier_contact 2020-11-02 09:19:23 +01:00
Joan Sanchez 61e63cdd48 Updated unit tests 2020-11-02 08:53:28 +01:00
Joan Sanchez 565bd013bf Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2563-supplier_fiscalData 2020-11-02 08:32:46 +01:00
Joan Sanchez 9e3186c0df Updated unit tests 2020-11-02 08:16:42 +01:00
Juan Ferrer e25a978b19 Merge branch 'test' into dev 2020-11-01 00:03:05 +01:00
Juan Ferrer 414c0931eb Sync management UI 2020-10-31 22:56:02 +01:00
Juan Ferrer 9b4f8697b9 User sync fixes 2020-10-31 21:16:58 +01:00
Bernat Exposito c1125916f6 supplier basicData
gitea/salix/pipeline/head This commit looks good Details
2020-10-31 11:22:56 +01:00
Juan Ferrer 937d5beefe User sync fixes
gitea/salix/pipeline/head This commit looks good Details
2020-10-31 03:13:17 +01:00
Juan Ferrer f39fa33b83 User sync fixes
gitea/salix/pipeline/head This commit looks good Details
2020-10-31 02:53:48 +01:00
Juan Ferrer 7763bcc1ef User sync fixes
gitea/salix/pipeline/head This commit looks good Details
2020-10-31 02:34:59 +01:00
Juan Ferrer fdf6df4ca8 User sync fixes
gitea/salix/pipeline/head This commit looks good Details
2020-10-31 02:31:42 +01:00
Juan Ferrer 1354d4647d User sync fixes
gitea/salix/pipeline/head This commit looks good Details
2020-10-31 02:26:17 +01:00
Juan Ferrer ae94d7db02 User sync fixes
gitea/salix/pipeline/head This commit looks good Details
2020-10-31 02:20:43 +01:00
Juan Ferrer ba5a03c980 User sync fixes
gitea/salix/pipeline/head This commit looks good Details
2020-10-31 01:56:19 +01:00
Juan Ferrer 76ee8e6f38 User sync fixes
gitea/salix/pipeline/head This commit looks good Details
2020-10-31 00:40:54 +01:00
Juan Ferrer 9b563cb8bf LDAP & Samba synchronization fixes + improvements
gitea/salix/pipeline/head This commit looks good Details
2020-10-31 00:02:27 +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
Joan Sanchez 245b32a47f Added section
gitea/salix/pipeline/head There was a failure building this commit Details
2020-10-30 15:11:45 +01:00
Bernat Exposito 89c9a1e858 add title in notes.contact
gitea/salix/pipeline/head This commit looks good Details
2020-10-30 13:26:56 +01:00
Bernat Exposito 18ebbe80d7 supplier contact
gitea/salix/pipeline/head This commit looks good Details
2020-10-30 11:40:12 +01:00
Javi Gallego 71fe677a7e fix getSummary
gitea/salix/pipeline/head This commit looks good Details
2020-10-30 10:50:13 +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 59cbe276f4 Merge branch 'dev' into 2510-client-address-create-test
gitea/salix/pipeline/head This commit looks good Details
2020-10-30 10:08:38 +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 ea8d9e70b0 supplier log
gitea/salix/pipeline/head This commit looks good Details
2020-10-30 08:27:02 +01:00
Bernat Exposito e75c275409 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2539-supplier_log 2020-10-30 08:24:13 +01:00
Joan Sanchez ea6fc0fb04 Card fix
gitea/salix/pipeline/head This commit looks good Details
2020-10-30 07:23:21 +01:00
Carlos Jimenez Ruiz 25684ec521 small refactor timeControl index
gitea/salix/pipeline/head This commit looks good Details
2020-10-29 13:46:36 +01:00
Bernat Exposito 792b689b58 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2539-supplier_log 2020-10-29 13:40:21 +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
Bernat Exposito Domenech 403d4b9118 cr changes
gitea/salix/pipeline/head This commit looks good Details
2020-10-29 08:17:06 +01:00
Bernat Exposito Domenech a4bf680ca5 Merge branch '2502-supplier_summary' of https://gitea.verdnatura.es/verdnatura/salix into 2502-supplier_summary
gitea/salix/pipeline/head This commit looks good Details
2020-10-29 08:07:58 +01:00
Bernat Exposito Domenech a5e6f99b1f Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2502-supplier_summary 2020-10-29 08:06:50 +01:00
Bernat Exposito Domenech 8d32f93512 cr changes 2020-10-29 07:44:04 +01:00