Commit Graph

3828 Commits

Author SHA1 Message Date
Carlos Jimenez Ruiz 647b7a93cd Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2937-module_transactions
gitea/salix/pipeline/head This commit looks good Details
2021-06-04 17:16:10 +02:00
Carlos Jimenez Ruiz b38605442e transactions for entry module endpoints 2021-06-04 17:16:02 +02:00
Joan Sanchez c853cfc86f Refactor 2021-06-04 15:49:48 +02:00
Joan Sanchez 2c0fc7e45e Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2021-06-04 11:46:37 +02:00
Joan Sanchez 6b65aa87d8 HOTFIX: Max width for client name field
gitea/salix/pipeline/head This commit looks good Details
2021-06-04 11:46:09 +02:00
Joan Sanchez b77ecc2c06 changes2 2021-06-04 11:45:35 +02:00
Joan Sanchez f8df3f1f3d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2567-calendar_rework 2021-06-04 11:10:43 +02:00
Joan Sanchez 651a9356f3 Merge branch 'dev' into 2932-invoiceIn_log
gitea/salix/pipeline/head This commit looks good Details
2021-06-04 07:54:18 +00:00
Javi Gallego 2604c81533 falta solucionar test
gitea/salix/pipeline/head There was a failure building this commit Details
2021-06-04 08:24:33 +02:00
Joan Sanchez e1c1bb8425 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2021-06-04 08:00:08 +02:00
Joan Sanchez 8bb254e93f HOTFIX: Ticket monitor clientGetDebt
gitea/salix/pipeline/head This commit looks good Details
2021-06-03 16:29:45 +02:00
Joan Sanchez edf18938a6 HOTFIX: clientGetDebt
gitea/salix/pipeline/head This commit looks good Details
2021-06-03 16:21:43 +02:00
Carlos Jimenez Ruiz b0bed3c1c4 invoiceInLog section, model and table
gitea/salix/pipeline/head This commit looks good Details
2021-06-03 16:14:52 +02:00
Joan Sanchez d1daed3540 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2021-06-03 13:39:51 +02:00
Joan Sanchez 5962a68d15 HOTFIX: Sort by zone hour
gitea/salix/pipeline/head This commit looks good Details
2021-06-03 12:40:27 +02:00
Joan Sanchez 3fcd78e1f3 Changes 2021-06-03 11:00:40 +02:00
Carlos Jimenez Ruiz 86631c84d0 moved transferor from fiscal data to basic data + e2e
gitea/salix/pipeline/head This commit looks good Details
2021-06-02 17:35:30 +02:00
Joan Sanchez 655380a52c Removed focus
gitea/salix/pipeline/head This commit looks good Details
2021-06-02 10:33:10 +02:00
Joan Sanchez 07026a68bb #2934 - HOTFIX: Route suggested tickets
gitea/salix/pipeline/head This commit looks good Details
2021-06-02 10:29:56 +02:00
Joan Sanchez a594e63566 Chip color
gitea/salix/pipeline/head This commit looks good Details
2021-06-01 11:39:40 +02:00
Javi Gallego 70fc260eae vnConfig solucionado
gitea/salix/pipeline/head There was a failure building this commit Details
2021-06-01 10:10:09 +02:00
Javi Gallego 3a5d84b34c rutas reparadas
gitea/salix/pipeline/head There was a failure building this commit Details
2021-05-31 08:21:16 +02:00
Joan Sanchez a24cfe0087 Merge branch 'dev' into 2891-ticket_sale_problems
gitea/salix/pipeline/head This commit looks good Details
2021-05-27 09:42:27 +00:00
Joan Sanchez 27cd54bef1 Updated icons title
gitea/salix/pipeline/head This commit looks good Details
2021-05-27 11:41:45 +02:00
Joan Sanchez 920e7b1daf E2E fixes
gitea/salix/pipeline/head This commit looks good Details
2021-05-26 13:05:58 +02:00
Carlos Jimenez Ruiz 3f167de10f Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2801_ticket_sale_restrictions
gitea/salix/pipeline/head This commit looks good Details
2021-05-26 09:14:30 +02:00
Carlos Jimenez Ruiz d6ef5352a2 sale module now has canEdit endpoint to check arrays of sales 2021-05-26 09:14:18 +02:00
Joan Sanchez 099ff657e4 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2891-ticket_sale_problems
gitea/salix/pipeline/head This commit looks good Details
2021-05-25 14:08:02 +02:00
Joan Sanchez f6a0bcb12c Updated unit tests
gitea/salix/pipeline/head This commit looks good Details
2021-05-25 13:33:17 +02:00
Joan Sanchez 26cc3a3dec 2891 - Show problems on tickets sales
gitea/salix/pipeline/head This commit looks good Details
2021-05-25 10:01:18 +02:00
Carlos Jimenez Ruiz e418d6239b fixed getSummary unit test
gitea/salix/pipeline/head This commit looks good Details
2021-05-24 11:28:23 +02:00
Carlos Jimenez Ruiz 2a4ff5a97b fixed a problem where warehouseFk wasn't yet defined upon updateStock call
gitea/salix/pipeline/head This commit looks good Details
2021-05-24 10:31:51 +02:00
Carlos Jimenez Ruiz 9a1b6e4653 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2920-item_descriptor_user_warehouse
gitea/salix/pipeline/head This commit looks good Details
2021-05-21 15:33:23 +02:00
Carlos Jimenez Ruiz 5c18c5c94c ticket module descriptor now takes warehouseFk from the ticket 2021-05-21 15:31:28 +02:00
Carlos Jimenez Ruiz 1bfe537186 claim, client, entry, item and order modules descriptor now takes warehouseFk from vnConfig 2021-05-21 15:31:05 +02:00
Joan Sanchez 60185bdf34 Merge branch 'dev' into 2891-ticket_sale_problems
gitea/salix/pipeline/head This commit looks good Details
2021-05-21 07:24:34 +00:00
Joan Sanchez a103c8d7fc 2891 - Get ticket problems for every sale
gitea/salix/pipeline/head This commit looks good Details
2021-05-21 08:49:32 +02:00
Joan Sanchez 6f245698f2 Merge branch 'dev' into 2620-mostrar-disponible
gitea/salix/pipeline/head This commit looks good Details
2021-05-21 06:29:43 +00:00
Joan Sanchez b7049122fe Url fix
gitea/salix/pipeline/head This commit looks good Details
2021-05-20 10:28:37 +02:00
Joan Sanchez fbc11b7a39 Merge branch 'dev' into 2921-notification_url
gitea/salix/pipeline/head This commit looks good Details
2021-05-20 08:23:45 +00:00
Javi Gallego df073cce2f refactor tod usa get sales
gitea/salix/pipeline/head This commit looks good Details
2021-05-19 17:04:13 +02:00
Carlos Jimenez Ruiz 2494af0113 removed unused relation from item @addSale 2021-05-19 15:33:35 +02:00
Carlos Jimenez Ruiz 5eb0ab8296 add and edit sales no longer intervene the prices
gitea/salix/pipeline/head This commit looks good Details
2021-05-19 15:25:49 +02:00
Carlos Jimenez Ruiz 72a0b774de add and get sales now sets item.price from packaging for EMB items
gitea/salix/pipeline/head This commit looks good Details
2021-05-19 14:15:28 +02:00
Joan Sanchez a5c3ba3926 2921 - Changed the ticket url of rocket notifications
gitea/salix/pipeline/head This commit looks good Details
2021-05-19 10:26:58 +02:00
Joan Sanchez 714142f868 Merge branch 'dev' into 2908-label_value_full_text
gitea/salix/pipeline/head This commit looks good Details
2021-05-18 12:53:33 +00:00
Joan Sanchez 98d7f246a4 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2021-05-18 14:44:38 +02:00
Joan Sanchez a9e33abacc FIX: Show employee list
gitea/salix/pipeline/head This commit looks good Details
2021-05-18 14:44:24 +02:00
Carlos Jimenez Ruiz e10dc53a9c Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2908-label_value_full_text 2021-05-18 14:22:36 +02:00
Joan Sanchez 3402bd119d Css fixes
gitea/salix/pipeline/head This commit looks good Details
2021-05-18 13:46:43 +02:00
Carlos Jimenez Ruiz 06d396a76a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2908-label_value_full_text
gitea/salix/pipeline/head This commit looks good Details
2021-05-18 13:22:57 +02:00
Carlos Jimenez Ruiz c0e2ff12da moved vn-log to salix components + css changes and renamed worker-log to log 2021-05-18 13:22:40 +02:00
Joan Sanchez 5c760b3faa Max height
gitea/salix/pipeline/head This commit looks good Details
2021-05-18 12:21:01 +02:00
Joan Sanchez b87e79b9d3 Changes 2021-05-18 11:58:32 +02:00
Joan Sanchez 6ec28cbc86 Removed transaction block 2021-05-18 11:58:32 +02:00
Joan Sanchez bc7f2d8193 Responsive 2021-05-18 11:58:32 +02:00
Joan Sanchez bb67277c68 #2913, #2914 - Changes to sales monitors 2021-05-18 11:58:32 +02:00
Joan Sanchez 400bf7b4f2 Changes
gitea/salix/pipeline/head This commit looks good Details
2021-05-18 10:05:13 +02:00
Joan Sanchez 5d278f416f Removed transaction block
gitea/salix/pipeline/head This commit looks good Details
2021-05-18 10:04:01 +02:00
Joan Sanchez bf250b77ef Responsive
gitea/salix/pipeline/head This commit looks good Details
2021-05-18 09:12:47 +02:00
Joan Sanchez 10387ee40b #2913, #2914 - Changes to sales monitors
gitea/salix/pipeline/head This commit looks good Details
2021-05-18 08:41:36 +02:00
Carlos Jimenez Ruiz 5843140cf5 minor refactor for code usage instead of description
gitea/salix/pipeline/head This commit looks good Details
2021-05-17 12:27:26 +02:00
Carlos Jimenez Ruiz e848b94859 removed LEFT from join
gitea/salix/pipeline/head This commit looks good Details
2021-05-17 09:42:48 +02:00
Carlos Jimenez Ruiz 3a25dbc3b1 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2896-route_tickets_refactor
gitea/salix/pipeline/head This commit looks good Details
2021-05-17 09:05:15 +02:00
Joan Sanchez 085a5a104b Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2021-05-17 08:39:55 +02:00
Joan Sanchez b67c95e5f0 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/pipeline/head This commit looks good Details
2021-05-17 07:38:04 +02:00
Joan Sanchez 378175224c HOTFIX: Buyer ACL
gitea/salix/pipeline/head This commit looks good Details
2021-05-17 07:24:24 +02:00
Carlos Jimenez Ruiz b902a4dd4a front unit test fix 2021-05-14 19:56:54 +02:00
Carlos Jimenez Ruiz 97e9dc57bc Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2896-route_tickets_refactor
gitea/salix/pipeline/head There was a failure building this commit Details
2021-05-14 19:22:15 +02:00
Carlos Jimenez Ruiz 1e8ab4d348 added transactions to several endpoints 2021-05-14 19:21:04 +02:00
Joan Sanchez e45af1c60a Updated unit test
gitea/salix/pipeline/head This commit looks good Details
2021-05-14 13:56:04 +02:00
Joan Sanchez c0f2590b61 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-05-14 12:56:10 +02:00
Joan Sanchez e39758ee16 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/pipeline/head This commit looks good Details
2021-05-14 12:46:54 +02:00
Joan Sanchez a70b29f9bf #2916 - HOTFIX: Grouping selection limit
gitea/salix/pipeline/head This commit looks good Details
2021-05-14 12:44:23 +02:00
Carlos Jimenez Ruiz 2b83abeefd Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2896-route_tickets_refactor 2021-05-14 10:13:02 +02:00
Joan Sanchez c4357ea577 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/pipeline/head This commit looks good Details
2021-05-13 12:27:01 +02:00
Joan Sanchez e6f7ef41b0 Hotfix: Catalog items without ink
gitea/salix/pipeline/head This commit looks good Details
2021-05-13 12:21:12 +02:00
Joan Sanchez ac02f8b309 Ticket request hotfix 2021-05-13 12:18:21 +02:00
Joan Sanchez 24981912e4 2907 - Proper claim rate percentage 2021-05-13 12:13:15 +02:00
Joan Sanchez 6fdb91fdc8 Removed line
gitea/salix/pipeline/head This commit looks good Details
2021-05-13 10:20:22 +02:00
Carlos Jimenez Ruiz 95666ccc1d Merge branch 'dev' into 2905-restore_ticket_date
gitea/salix/pipeline/head This commit looks good Details
2021-05-13 07:44:01 +00:00
Joan Sanchez 4a1d286a95 2907 - Proper claim rate percentage
gitea/salix/pipeline/head This commit looks good Details
2021-05-13 09:17:49 +02:00
Joan Sanchez af49a66911 Unit test fix
gitea/salix/pipeline/head This commit looks good Details
2021-05-13 08:57:49 +02:00
Joan Sanchez e6e91ced99 2905 - Restore ticket shipped and landed 2021-05-13 08:56:26 +02:00
Joan Sanchez 8af66a7ca5 HOTFIX: Sort by column
gitea/salix/pipeline/head This commit looks good Details
2021-05-12 15:11:07 +02:00
Joan Sanchez b3cbf9374c Hotfix: Catalog items without ink
gitea/salix/pipeline/head This commit looks good Details
2021-05-12 14:22:29 +02:00
Joan Sanchez 9363726d67 Updated unit test
gitea/salix/pipeline/head This commit looks good Details
2021-05-12 13:37:01 +02:00
Joan Sanchez 873fc54dff More ammends
gitea/salix/pipeline/head There was a failure building this commit Details
2021-05-12 13:18:58 +02:00
Joan Sanchez 65f0cb4612 More ammends 2021-05-12 13:14:41 +02:00
Joan Sanchez 6f5df10413 Removed controller
gitea/salix/pipeline/head There was a failure building this commit Details
2021-05-12 13:06:36 +02:00
Joan Sanchez eecba426ee Removed unused class 2021-05-12 13:00:54 +02:00
Joan Sanchez b828609d33 Ammends
gitea/salix/pipeline/head There was a failure building this commit Details
2021-05-12 12:39:45 +02:00
Joan Sanchez 2e7d56cc26 Test fixes
gitea/salix/pipeline/head There was a failure building this commit Details
2021-05-12 12:11:27 +02:00
Carlos Jimenez Ruiz 83d6581349 indentation correction 2021-05-12 09:52:04 +02:00
Carlos Jimenez Ruiz 457d23dc16 reoute tickets order columns + endpoint refactor 2021-05-12 09:51:32 +02:00
Joan Sanchez e22da9b0d5 Merge branch 'dev' into 2863-monitor_module
gitea/salix/pipeline/head This commit looks good Details
2021-05-12 07:14:08 +00:00
Joan Sanchez 88616862cb Updated unit tests
gitea/salix/pipeline/head This commit looks good Details
2021-05-12 09:12:46 +02:00
Carlos Jimenez Ruiz d4eedc69e1 indentation on route filter 2021-05-11 12:53:08 +02:00
Joan Sanchez 6ae8b72268 Merge branch 'dev' into 2902-error-getSuggestedTickets
gitea/salix/pipeline/head This commit looks good Details
2021-05-11 09:52:42 +00:00
Joan Sanchez d2169000f4 Merge branch 'dev' into 2863-monitor_module
gitea/salix/pipeline/head There was a failure building this commit Details
2021-05-11 07:46:18 +00:00
Joan Sanchez dc44af148d 2863 - Added sales monitor
gitea/salix/pipeline/head There was a failure building this commit Details
2021-05-11 09:43:15 +02:00
Carlos Jimenez Ruiz ac917b6115 mino changes on translations
gitea/salix/pipeline/head This commit looks good Details
2021-05-10 10:46:17 +02:00
Carlos Jimenez Ruiz 58447c8168 transaltion changes
gitea/salix/pipeline/head This commit looks good Details
2021-05-10 10:39:51 +02:00
Carlos Jimenez Ruiz 657896bce0 increased section width
gitea/salix/pipeline/head This commit looks good Details
2021-05-10 10:32:00 +02:00
Javi Gallego 84cd89d7f7 modifica la descripcion de la compensacion
gitea/salix/pipeline/head This commit looks good Details
2021-05-07 08:45:20 +02:00
Javi Gallego 19b35f5f6c landed en lugar de shipped
gitea/salix/pipeline/head This commit looks good Details
2021-05-07 07:52:03 +02:00
Javi Gallego f1c30ca6d1 cambio landed por created
gitea/salix/pipeline/head This commit looks good Details
2021-05-06 08:13:17 +02:00
Carlos Jimenez Ruiz 245243aa14 routes without vehicle or vehicles without drop off now throw
gitea/salix/pipeline/head This commit looks good Details
2021-05-05 13:36:54 +02:00
Joan Sanchez db148c8177 2863 - Added monitor module
gitea/salix/pipeline/head This commit looks good Details
2021-05-04 12:44:21 +02:00
Joan Sanchez 1efe8cb683 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2727-supplier_consumption
gitea/salix/pipeline/head This commit looks good Details
2021-05-03 14:03:41 +02:00
Carlos Jimenez Ruiz 47e36913a1 Merge branch 'dev' into 2770-supplier_address
gitea/salix/pipeline/head This commit looks good Details
2021-05-03 11:55:55 +00:00
Joan Sanchez 8f3d2d892d Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2021-05-03 12:13:20 +02:00
Joan Sanchez 03e77685a1 SMS hotfix
gitea/salix/pipeline/head This commit looks good Details
2021-05-03 12:09:12 +02:00
Joan Sanchez 4d90006aa6 Updated unit test
gitea/salix/pipeline/head This commit looks good Details
2021-04-30 14:27:50 +02:00
Joan Sanchez 07dbeaf515 2727 - Send consumption report to an email address
gitea/salix/pipeline/head There was a failure building this commit Details
2021-04-30 13:50:41 +02:00
Joan Sanchez fcc8ab4236 Added model ACL
gitea/salix/pipeline/head This commit looks good Details
2021-04-30 10:08:40 +02:00
Joan Sanchez dbe22844a6 Removed unused method
gitea/salix/pipeline/head This commit looks good Details
2021-04-30 09:53:20 +02:00
Joan Sanchez 5445764043 Added supplier address fixtures
gitea/salix/pipeline/head This commit looks good Details
2021-04-30 08:26:05 +02:00
Joan Sanchez 61a63ad76f Merge branch 'dev' into 2770-supplier_address
gitea/salix/pipeline/head This commit looks good Details
2021-04-29 12:42:42 +00:00
Joan Sanchez 330b6bdf8a 2770 - Added supplier addresses section
gitea/salix/pipeline/head This commit looks good Details
2021-04-29 14:41:10 +02:00
Joan Sanchez 5a53cb09da Create receipt button changed role to salesAssistant
gitea/salix/pipeline/head This commit looks good Details
2021-04-29 08:48:11 +02:00
Carlos Jimenez Ruiz eea8ed9a3c front unit test entry import buys fix
gitea/salix/pipeline/head This commit looks good Details
2021-04-28 22:56:02 +02:00
Carlos Jimenez Ruiz 3c280eed2e e2e path for entry buy after entry import path
gitea/salix/pipeline/head There was a failure building this commit Details
2021-04-28 18:29:29 +02:00
Carlos Jimenez Ruiz 9ef4497ea6 translations and tittles
gitea/salix/pipeline/head This commit looks good Details
2021-04-28 12:11:49 +02:00
Carlos Jimenez Ruiz d3b22d7078 controller refactor to remove repeated code
gitea/salix/pipeline/head This commit looks good Details
2021-04-28 11:55:04 +02:00
Carlos Jimenez Ruiz e53298f35c test new uses transaction
gitea/salix/pipeline/head This commit looks good Details
2021-04-28 11:24:02 +02:00
Carlos Jimenez Ruiz ddc19ddbcd enpoint now receives all data for a buy + css refactor 2021-04-28 11:15:02 +02:00
Carlos Jimenez Ruiz 65457d6dac Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2167-entry_buy
gitea/salix/pipeline/head This commit looks good Details
2021-04-28 10:32:35 +02:00
Carlos Jimenez Ruiz daa94e4eb5 entry buy index 2021-04-28 10:32:24 +02:00
Javi Gallego 9ee1385cd1 test ok
gitea/salix/pipeline/head This commit looks good Details
2021-04-26 12:33:33 +02:00
Javi Gallego 2395a0af63 done 2021-04-26 12:24:16 +02:00
Javi Gallego 4a7a4f6dcf test ok
gitea/salix/pipeline/head This commit looks good Details
2021-04-22 09:06:08 +02:00
Carlos Jimenez Ruiz 0abb8f2d5f Merge branch 'dev' into 2873-create-supplier-beneficiary
gitea/salix/pipeline/head This commit looks good Details
2021-04-21 13:21:16 +00:00
Carlos Jimenez Ruiz 94cd6cfb3e watcher aint looking after data changed to disable test conn button
gitea/salix/pipeline/head This commit looks good Details
2021-04-19 13:23:08 +02:00
Carlos Jimenez Ruiz 857c508391 Merge branch 'dev' into 2729-prices_popover
gitea/salix/pipeline/head This commit looks good Details
2021-04-19 07:59:09 +00:00
Javi Gallego cd4f93f326 minor fixes
gitea/salix/pipeline/head This commit looks good Details
2021-04-16 18:35:03 +02:00
Javi f7fa363fa5 Merge branch 'dev' into 2873-create-supplier-beneficiary
gitea/salix/pipeline/head This commit looks good Details
2021-04-16 18:32:00 +02:00
Carlos Jimenez Ruiz 420f05bb03 mocked api client due to service instability
gitea/salix/pipeline/head This commit looks good Details
2021-04-16 12:40:41 +02:00
Carlos Jimenez Ruiz 56ec7b4729 input number made wider
gitea/salix/pipeline/head This commit looks good Details
2021-04-16 10:17:59 +02:00
Carlos Jimenez Ruiz 9a4c056059 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2729-prices_popover 2021-04-16 10:07:18 +02:00
Carlos Jimenez Ruiz 17904c4edb only undo and save buttons are disabled until data changed now
gitea/salix/pipeline/head This commit looks good Details
2021-04-16 09:20:02 +02:00
Joan Sanchez 2cdafeecf4 Added unit tests
gitea/salix/pipeline/head This commit looks good Details
2021-04-15 14:30:47 +02:00
Joan Sanchez bf976a3e8f 2729 - Prices popover refactor 2021-04-15 14:30:30 +02:00
Carlos Jimenez Ruiz 2ebd812a1f updated model + translations
gitea/salix/pipeline/head This commit looks good Details
2021-04-15 11:54:40 +02:00
Carlos Jimenez Ruiz 41ab1bbe35 fixed a test where invoiceIn was nested into the summary
gitea/salix/pipeline/head This commit looks good Details
2021-04-15 10:50:10 +02:00
Carlos Jimenez Ruiz 38f43eca3b invoiceIn basicData + index preview of summary 2021-04-15 10:47:39 +02:00
Carlos Jimenez Ruiz 69069d5e28 invoiceIn summary frontend 2021-04-15 10:46:23 +02:00
Carlos Jimenez Ruiz ec378a17ae invoiceIn model updated a summary registered 2021-04-15 10:45:27 +02:00
Carlos Jimenez Ruiz 8faa1531c6 summary route + test 2021-04-15 10:44:25 +02:00
Carlos Jimenez Ruiz d8628379dd Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2744-invoiceIn-module_rdy_n_summary 2021-04-14 11:11:40 +02:00
Carlos Jimenez Ruiz b2ecd7d3c2 Merge branch 'dev' into 2878-activeWorkers_refactor
gitea/salix/pipeline/head This commit looks good Details
2021-04-14 08:15:06 +00:00
Joan Sanchez dac95805e8 2882 - Replaced worker userFk property by user id
gitea/salix/pipeline/head This commit looks good Details
2021-04-14 09:02:08 +02:00
Joan Sanchez 78313bd9a7 Updated unit tests 2021-04-14 08:15:03 +02:00
Joan Sanchez 6b8074e32f 2878 - Splitted method into activeWithRole and activeWithInheritedRole
gitea/salix/pipeline/head This commit looks good Details
2021-04-13 14:08:10 +02:00
Carlos Jimenez Ruiz 01f0fed0c3 Merge branch 'dev' into 2483-email_replyTo
gitea/salix/pipeline/head This commit looks good Details
2021-04-13 08:41:56 +00:00
Joan Sanchez 7033ec2c11 Added missing translations
gitea/salix/pipeline/head This commit looks good Details
2021-04-13 10:39:42 +02:00
Carlos Jimenez Ruiz 90a7c803fd descriptor invoiceIn amount 2021-04-12 16:32:13 +02:00
Carlos Jimenez Ruiz b6f31d7d44 invoiceIn descriptor implementation 2021-04-12 12:43:17 +02:00
Carlos Jimenez Ruiz 6f0c48847a Merge branch 'dev' into 2815-ticket_without_state
gitea/salix/pipeline/head This commit looks good Details
2021-04-08 11:53:25 +00:00
Joan Sanchez af0307a419 2859 - Force translation for SMS
gitea/salix/pipeline/head This commit looks good Details
2021-04-08 13:39:11 +02:00
Joan Sanchez 418d7a2d12 Updated unit test
gitea/salix/pipeline/head This commit looks good Details
2021-04-07 14:14:31 +02:00
Joan Sanchez e40911e833 2815 - Fix ticket without state
gitea/salix/pipeline/head This commit looks good Details
2021-04-07 13:39:36 +02:00
Joan Sanchez 465955d0c5 2483 - Added replyTo param when sending an email to client
gitea/salix/pipeline/head There was a failure building this commit Details
2021-04-07 13:09:53 +02:00
Carlos Jimenez Ruiz 2d041142c3 Merge branch 'dev' into 2631-notify_incomplete
gitea/salix/pipeline/head This commit looks good Details
2021-04-07 09:30:05 +00:00
Joan Sanchez 93399d6de6 Updated description
gitea/salix/pipeline/head This commit looks good Details
2021-04-07 11:18:44 +02:00
Joan Sanchez 6c36ab3905 Removed back button
gitea/salix/pipeline/head This commit looks good Details
2021-04-07 10:47:31 +02:00
Joan Sanchez d4c6695629 2631 - Notify status change to incomplete
gitea/salix/pipeline/head This commit looks good Details
2021-04-07 07:45:00 +02:00
Joan Sanchez 65dc0e3780 2615 - Waste breakdown
gitea/salix/pipeline/head This commit looks good Details
2021-04-06 13:46:38 +02:00
Joan Sanchez 5ef3ff40ce Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2615-waste_detail 2021-04-06 09:14:11 +02:00
Joan Sanchez a2144405ab Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2021-04-02 17:04:37 +02:00
Joan Sanchez 9bbf43c590 Replace http with https
gitea/salix/pipeline/head This commit looks good Details
2021-04-02 14:34:16 +02:00
Javi Gallego 47a3779c45 Merge branch 'dev' into 2873-create-supplier-beneficiary
gitea/salix/pipeline/head This commit looks good Details
2021-04-01 18:39:18 +02:00
Javi Gallego 336472291d test
gitea/salix/pipeline/head This commit looks good Details
2021-04-01 18:38:40 +02:00
Javi Gallego eec901684a reviso test
gitea/salix/pipeline/head This commit looks good Details
2021-04-01 17:36:27 +02:00
Carlos Jimenez Ruiz 893de63f74 Merge branch 'dev' into 2866-descriptor_photo
gitea/salix/pipeline/head This commit looks good Details
2021-04-01 14:51:05 +00:00
Joan Sanchez b4cceff4cb 2866 - Limit descriptor photo size to width 100%
gitea/salix/pipeline/head This commit looks good Details
2021-04-01 14:20:00 +02:00
Joan Sanchez fa0b01a0d5 Fixed buttons alignment
gitea/salix/pipeline/head This commit looks good Details
2021-04-01 14:00:34 +02:00
Joan Sanchez 91c26ee5a5 Removed filter import
gitea/salix/pipeline/head This commit looks good Details
2021-04-01 13:55:01 +02:00
Joan Sanchez 389f10bda0 Removed entry import
gitea/salix/pipeline/head This commit looks good Details
2021-04-01 13:51:55 +02:00
Joan Sanchez f89419962d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2589-entry_index 2021-04-01 13:42:38 +02:00
Javi Gallego 67f822ebdc Merge branch 'dev' into 2873-create-supplier-beneficiary
gitea/salix/pipeline/head This commit looks good Details
2021-04-01 13:14:26 +02:00
Joan Sanchez 41ee6e70a5 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2615-waste_detail 2021-04-01 08:42:02 +02:00
Javi Gallego c036c7c7fe model ok
gitea/salix/pipeline/head This commit looks good Details
2021-03-31 07:33:00 +02:00
Carlos Jimenez Ruiz 694055f85c width changed from medium to large
gitea/salix/pipeline/head This commit looks good Details
2021-03-30 16:19:54 +02:00
Carlos Jimenez Ruiz 75155c796d removed unused code
gitea/salix/pipeline/head This commit looks good Details
2021-03-30 15:59:30 +02:00
Carlos Jimenez Ruiz 4207bfcc70 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 15:19:38 +02:00
Carlos Jimenez Ruiz 061626e521 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2855-claim_module_backend_transactions
gitea/salix/pipeline/head This commit looks good Details
2021-03-30 14:51:05 +02:00
Carlos Jimenez Ruiz 847e0bd2c8 tests fixed for production sneaky changes 2021-03-30 14:43:21 +02:00
Joan Sanchez e2a9a64f88 #2871 and #2868. Included ticket filter unit test 2021-03-30 11:20:26 +02:00
Joan Sanchez 4aa616601e 2615 - Waste changes 2021-03-30 10:28:44 +02:00
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