Commit Graph

634 Commits

Author SHA1 Message Date
Carlos Jimenez Ruiz b27a443729 show/hide columns and load default view
gitea/salix/pipeline/head This commit looks good Details
2021-10-27 17:11:33 +02:00
Alex Moreno 9c4e46f363 export_database
gitea/salix/pipeline/head This commit looks good Details
2021-10-20 13:32:03 +02:00
Alex Moreno bf100f339e Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3173-item_diary
gitea/salix/pipeline/head This commit looks good Details
2021-10-18 10:22:53 +02:00
Joan Sanchez e9539c7675 Restored SQL version
gitea/salix/pipeline/head This commit looks good Details
2021-10-15 14:09:07 +02:00
Joan Sanchez d5cf57fbb1 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev 2021-10-15 14:07:48 +02:00
Joan Sanchez 8fabd378e7 Removed version folder
gitea/salix/pipeline/head This commit looks good Details
2021-10-15 14:00:15 +02:00
Joan Sanchez 629a8d25b7 Updated pagination styles
gitea/salix/pipeline/head This commit looks good Details
2021-10-15 13:49:41 +02:00
Alex Moreno 1684c1bf87 feat(diary): modify sql item_getBalance
gitea/salix/pipeline/head This commit looks good Details
2021-10-13 14:03:06 +02:00
Joan Sanchez 313db4960e refactor(invoice): Show generate PDF option if it was never generated before
Refs: 3162
2021-10-01 14:59:08 +02:00
Joan Sanchez f60c754c59 refactor(invoice): Show generate PDF option if it was never generated before
gitea/salix/pipeline/head There was a failure building this commit Details
Refs: 3162
2021-10-01 14:31:42 +02:00
Javi Gallego 4f1fd5412d faltan test
gitea/salix/pipeline/head There was a failure building this commit Details
2021-09-28 10:57:51 +02:00
Joan Sanchez 0e287447bf SQL version folder
gitea/salix/pipeline/head This commit looks good Details
2021-09-24 09:09:16 +02:00
Javi Gallego e5c9ea850b testback done
gitea/salix/pipeline/head There was a failure building this commit Details
2021-09-24 08:24:34 +02:00
Javi Gallego 8160912fe7 Merge branch 'dev' into 2995-supplierAccount-modificaciones
gitea/salix/pipeline/head This commit looks good Details
2021-09-08 10:41:26 +02:00
Joan Sanchez db538a3f6f Merge branch 'dev' into 3041-monitor_sort_problems
gitea/salix/pipeline/head This commit looks good Details
2021-09-08 06:11:39 +00:00
Carlos Jimenez Ruiz 1f0bcb63f1 refactor(thermograph): added temperature model + updated thermographs models and endpoints 2021-09-06 16:38:27 +02:00
Joan Sanchez 4db25bf722 refactor(risk): the risk icon now is colored red when the client has a risk greater than the risk tolerance
gitea/salix/pipeline/head This commit looks good Details
Refs: 3045
2021-09-03 16:30:25 +02:00
Joan Sanchez 8623f914c7 feat(monitor): Sort by amount of problems on a ticket list
gitea/salix/pipeline/head This commit looks good Details
2021-09-03 12:09:37 +02:00
Joan Sanchez d2280a783c Changes
gitea/salix/pipeline/head This commit looks good Details
2021-08-31 08:44:31 +02:00
Joan Sanchez a0efe5f896 Merge branch 'dev' into 2407-eliminar-trigger-ticketAfterUpdate
gitea/salix/pipeline/head This commit looks good Details
2021-08-31 06:27:23 +00:00
Carlos Jimenez Ruiz 3e0f2b5c26 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3070_deprecate_item_niches
gitea/salix/pipeline/head This commit looks good Details
2021-08-30 13:31:57 +02:00
Carlos Jimenez Ruiz d5625d19f1 removed ACL for item niche 2021-08-30 13:24:13 +02:00
Joan Sanchez 73d76848b2 Removed version
gitea/salix/pipeline/head This commit looks good Details
2021-08-30 11:41:17 +02:00
Javi Gallego 488ef17559 insert mail
gitea/salix/pipeline/head There was a failure building this commit Details
2021-08-27 09:01:21 +02:00
Javi Gallego f2a81974d0 dbChanges
gitea/salix/pipeline/head This commit looks good Details
2021-08-13 09:19:58 +02:00
Joan Sanchez 48e6079527 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2940-invoiceInTax-section
gitea/salix/pipeline/head This commit looks good Details
2021-08-13 08:04:42 +02:00
Joan Sanchez 9ec07de1cd Added SQL version 10350-august
gitea/salix/pipeline/head This commit looks good Details
2021-08-13 08:02:09 +02:00
Carlos Jimenez Ruiz e547642c16 corrected a syntax error preventing the changes to apply 2021-08-12 17:26:46 +02:00
Javi Gallego 87fe3c529a Merge branch 'dev' into 2940-invoiceInTax-section 2021-08-12 09:39:35 +02:00
Joan Sanchez e65e90d00f Global invoicing improvements
gitea/salix/pipeline/head There was a failure building this commit Details
2021-08-10 11:48:29 +02:00
Javi Gallego d49242751e Merge branch 'dev' into 2940-invoiceInTax-section
gitea/salix/pipeline/head This commit looks good Details
2021-08-10 08:23:13 +02:00
Javi Gallego 3424fabd5b test fixed
gitea/salix/pipeline/head This commit looks good Details
2021-08-10 08:18:52 +02:00
Joan Sanchez 8e84f98629 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2984-invoiceOut_global 2021-08-09 12:59:00 +02:00
Joan Sanchez 886d38ad8a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2879-import_buys 2021-08-05 14:33:28 +02:00
Joan Sanchez 1b9ca13391 Ammends
gitea/salix/pipeline/head This commit looks good Details
2021-08-05 13:42:19 +02:00
Joan Sanchez 531937ebbc 2985 - Create a manual invoice from a ticket or client
gitea/salix/pipeline/head This commit looks good Details
2021-07-27 09:07:04 +02:00
Joan Sanchez 64b3f10fc5 Removed drop temporary table
gitea/salix/pipeline/head This commit looks good Details
2021-07-20 13:11:48 +02:00
Joan Sanchez dbe680a58c 3004 - Deprecated ticket_closeAll()
gitea/salix/pipeline/head This commit looks good Details
2021-07-20 13:06:31 +02:00
Joan Sanchez bfd6c995ad 2989 - Added client deb statement sample
gitea/salix/pipeline/head This commit looks good Details
2021-07-20 09:09:46 +02:00
Carlos Jimenez Ruiz 9a2fe0260e last steps to preview credit request
gitea/salix/pipeline/head This commit looks good Details
2021-07-19 10:16:15 +02:00
Joan Sanchez ff71e6f2c7 2879 - Autocomplete item field from imported buys
gitea/salix/pipeline/head This commit looks good Details
2021-07-14 11:14:53 +02:00
Javi Gallego 2f265760b4 permisos invoceInTax
gitea/salix/pipeline/head This commit looks good Details
2021-07-12 15:27:36 +02:00
Carlos Jimenez Ruiz 7e4e6fae21 e2e path for ticket dms import 2021-06-28 16:04:21 +02:00
Joan Sanchez f445194e46 Restored version
gitea/salix/pipeline/head There was a failure building this commit Details
2021-06-22 16:30:15 +02:00
Joan Sanchez 1d916a6557 Added version
gitea/salix/pipeline/head There was a failure building this commit Details
2021-06-22 15:43:08 +02:00
Joan Sanchez 46bbe07c3f 2997 - Export production
gitea/salix/pipeline/head There was a failure building this commit Details
2021-06-22 15:01:10 +02:00
Joan Sanchez be9e230fe8 Merge branch 'dev' into 2742--invoiceIn-create
gitea/salix/pipeline/head This commit looks good Details
2021-06-21 11:17:48 +00:00
Joan Sanchez 273ebe9c5f Removed risk min amount
gitea/salix/pipeline/head This commit looks good Details
2021-06-21 10:34:41 +00:00
Joan Sanchez 98621b9e42 Removed transaction
gitea/salix/pipeline/head This commit looks good Details
2021-06-21 10:00:38 +00:00
Carlos Jimenez Ruiz b906a8e91d added ticket.nickname to basicdata
gitea/salix/pipeline/head This commit looks good Details
2021-06-17 11:52:12 +02:00
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 523f9c6df0 Added new sql version folder
gitea/salix/pipeline/head There was a failure building this commit Details
2021-06-03 13:45:57 +02:00
Joan Sanchez d6dd39d447 Updated ticketGetProblems()
gitea/salix/pipeline/head This commit looks good Details
2021-06-03 11:40:39 +02:00
Joan Sanchez e2ec78461a HOTFIX: Update production starred modules data
gitea/salix/pipeline/head This commit looks good Details
2021-06-02 13:45:18 +02:00
Carlos Jimenez Ruiz 9f00fd11d2 favorite modules positions 2021-06-01 22:18:13 +02:00
Joan Sanchez 7feb3df05d Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2021-05-31 07:50:41 +02:00
Joan Sanchez 8c09adb51a HOTFIX: Inserted module "Monitors"
gitea/salix/pipeline/head This commit looks good Details
2021-05-31 07:50:24 +02:00
Joan Sanchez 920e7b1daf E2E fixes
gitea/salix/pipeline/head This commit looks good Details
2021-05-26 13:05:58 +02:00
Joan Sanchez 099ff657e4 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2891-ticket_sale_problems
gitea/salix/pipeline/head This commit looks good Details
2021-05-25 14:08:02 +02:00
Carlos Jimenez Ruiz 60b0488a47 Merge branch 'dev' into 2925-export_db
gitea/salix/pipeline/head This commit looks good Details
2021-05-25 09:23:05 +00:00
Joan Sanchez f7487c76a6 2925 - Exported production database
gitea/salix/pipeline/head This commit looks good Details
2021-05-25 11:13:08 +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 d440a631c8 getUserConfig now gets default company and warehouse with dynamic code
gitea/salix/pipeline/head This commit looks good Details
2021-05-24 17:41:22 +02: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
Carlos Jimenez Ruiz bdcd05ee14 removed commented code and the keep file
gitea/salix/pipeline/head This commit looks good Details
2021-05-17 10:30:39 +02:00
Carlos Jimenez Ruiz 61fb997717 removed transaction from procedure to use backend's 2021-05-14 19:17:37 +02:00
Joan Sanchez 6a3cb7f724 Added new version
gitea/salix/pipeline/head This commit looks good Details
2021-05-12 14:17:28 +02: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
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 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 e952e995cb Merge branch 'dev' into 2893-show-expedition.externalId
gitea/salix/pipeline/head This commit looks good Details
2021-04-26 11:52:42 +00:00
Joan Sanchez 5ad0f15720 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2021-04-26 13:41:05 +02:00
Joan Sanchez 1c52bd1618 SQL fixes
gitea/salix/pipeline/head This commit looks good Details
2021-04-26 13:40:52 +02:00
Javi Gallego 9ee1385cd1 test ok
gitea/salix/pipeline/head This commit looks good Details
2021-04-26 12:33:33 +02:00
Joan Sanchez 42957f9ace Added new SQL version
gitea/salix/pipeline/head This commit looks good Details
2021-04-26 11:12:13 +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
Joan Sanchez 65dc0e3780 2615 - Waste breakdown
gitea/salix/pipeline/head This commit looks good Details
2021-04-06 13:46:38 +02:00
Javi Gallego 63ec7677c6 test ok
gitea/salix/pipeline/head This commit looks good Details
2021-04-01 18:43:28 +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 5712f1c43b Changes 2021-04-01 13:12:02 +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
Joan Sanchez d9834ae740 Removed old versions
gitea/salix/pipeline/head This commit looks good Details
2021-03-30 14:02:15 +02:00
Joan Sanchez 4aa616601e 2615 - Waste changes 2021-03-30 10:28:44 +02:00
Joan Sanchez 14f0cbaf42 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2021-03-24 11:06:15 +01:00
Joan Sanchez 53ae45d4c8 Deleted old .keep file
gitea/salix/pipeline/head This commit looks good Details
2021-03-24 11:05:41 +01:00
Joan Sanchez c6ee58a278 Added new changes version
gitea/salix/pipeline/head This commit looks good Details
2021-03-24 11:05:05 +01:00
Joan Sanchez a2165b6bfc Updated E2E
gitea/salix/pipeline/head This commit looks good Details
2021-03-16 13:59:39 +01:00
jorgebl 32ea2dbda6 Added permisions from models in table salix ACL 2021-03-08 12:32:35 +01:00
Joan Sanchez 85920e5c07 Added new SQL version
gitea/salix/pipeline/head This commit looks good Details
2021-03-05 17:11:04 +01:00
jorgebl 4a22cd5f85 db changes and acl for logistic boss on section item-botanical 2021-03-04 20:09:35 +01:00
jorgebl 08cb69330a ACL logisticBoss 2021-03-04 08:09:54 +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
Carlos Jimenez Ruiz 97667595e5 removed unused ACL and fixed typos
gitea/salix/pipeline/head This commit looks good Details
2021-03-02 10:33:35 +01:00
Carlos Jimenez Ruiz 177ed24892 css amends and sql fixtures for production
gitea/salix/pipeline/head This commit looks good Details
2021-03-02 09:58:17 +01:00
Carlos Jimenez Ruiz cd084a53e5 styling update + acls
gitea/salix/pipeline/head There was a failure building this commit Details
2021-03-01 16:13:47 +01:00
Carlos Jimenez Ruiz bebaef7879 sql changes moved to correct folder 2021-03-01 13:07:23 +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
Carlos Jimenez Ruiz 3dff5f06ff starred modules front and backend 1st steps 2021-02-26 09:08:31 +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 a2ad1887a4 ACL bug fixed + package lock updated
gitea/salix/pipeline/head This commit looks good Details
2021-02-12 15:20:30 +01:00
Jorge Padawan 86580727e5 Requested changes resolved 2021-02-12 11:47:53 +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
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
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
Carlos Jimenez Ruiz a62bebd51e minor refactor
gitea/salix/pipeline/head This commit looks good Details
2021-02-08 10:14:41 +01:00
Carlos Jimenez Ruiz 76d6e2d4b7 worker added to supplier basic data and summary 2021-02-05 15:26:49 +01:00
Joan Sanchez ea1066d664 Added changes version 10281
gitea/salix/pipeline/head This commit looks good Details
2021-02-02 14:08:12 +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
Joan Sanchez f5f4c5936d 2763 - Notify urgen issues
gitea/salix/pipeline/head This commit looks good Details
2021-02-01 09:29:47 +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
Joan Sanchez ca47fe6827 2476 - downloadImages() method refactor
gitea/salix/pipeline/head This commit looks good Details
2021-01-28 12:23:18 +01:00
Bernat Exposito 01c96272bd export production
gitea/salix/pipeline/head This commit looks good Details
2021-01-26 10:55:30 +01:00
Javi Gallego d61ab94398 acl conflicto
gitea/salix/pipeline/head This commit looks good Details
2021-01-25 07:49:57 +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 e1711af265 sin keep
gitea/salix/pipeline/head This commit looks good Details
2021-01-22 14:32:35 +01:00
Javi Gallego 7bdfb36f25 minor refactor
gitea/salix/pipeline/head This commit looks good Details
2021-01-22 14:30:46 +01:00
Carlos Jimenez Ruiz c4f673e089 relocated sql code
gitea/salix/pipeline/head This commit looks good Details
2021-01-22 11:28:47 +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
Carlos Jimenez Ruiz 90c6d2fe3e SQLs moved to current version folder
gitea/salix/pipeline/head This commit looks good Details
2021-01-21 11:30:22 +01:00
Jorge Padawan 6acb5c221e Changes folder of ACL
gitea/salix/pipeline/head This commit looks good Details
2021-01-21 10:55:21 +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
Javi Gallego a6dfdc971a receipt_beforInsert
gitea/salix/pipeline/head This commit looks good Details
2021-01-20 13:54:55 +01:00
Carlos Jimenez Ruiz ef3b48005e sql changes now in correct version
gitea/salix/pipeline/head This commit looks good Details
2021-01-20 09:23:58 +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 a67c8e4fbd Renamed version
gitea/salix/pipeline/head This commit looks good Details
2021-01-20 08:22:23 +01:00
Joan Sanchez 94b8fa7c4e Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev 2021-01-20 08:22:05 +01:00
Joan Sanchez 24982ba030 Renamed version
gitea/salix/pipeline/head This commit looks good Details
2021-01-20 08:21:45 +01:00
Joan Sanchez ffb76e6cb5 Added new db version
gitea/salix/pipeline/head This commit looks good Details
2021-01-20 08:12:40 +01:00
Javi Gallego e47e5b9ec4 merged carpetas de cambios
gitea/salix/pipeline/head This commit looks good Details
2021-01-19 11:32:47 +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
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 3251d737e6 fixed price index implementation 2021-01-18 14:16:39 +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
Bernat Exposito 975e158ebb itemTag trigger 2021-01-13 08:17:41 +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
Bernat Exposito 8b3af8851c fix trigger itemTag 2021-01-11 11:29:47 +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 6017894ba9 first step bankEntity 2021-01-07 15:14:38 +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
Javi Gallego 1291fc4b6c acl
gitea/salix/pipeline/head This commit looks good Details
2021-01-04 11:49:32 +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
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