verdnatura/salix
verdnatura
/
salix
3
5
Fork 2
Code Issues Pull Requests 72 Releases Wiki Activity
22,352 Commits 300 Branches 0 Tags 130 MiB
Commit Graph

785 Commits

Author SHA1 Message Date
Carlos Satorres be0de3511b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6553-workerBusiness 2024-06-25 08:56:49 +02:00
Alex Moreno 1dd0357a34 Merge pull request 'test to dev' () from test into dev 
Reviewed-on: 
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-06-21 12:33:58 +00:00
Jorge Penadés 5ef0dffa3e fix: refs #6238 add scheme 2024-06-21 13:38:00 +02:00
Jorge Penadés 24cf23dddc feat: refs #62add travelKgPercentage table and model 2024-06-21 13:16:01 +02:00
Alex Moreno 42b483e27e feat: refs #7555 remove account.password__ 2024-06-21 08:35:35 +02:00
Guillermo Bonet 6874474207 Merge pull request 'refactor: refs #7519 Refactor claim_ratio_routine' (!2394) from 6701-claimRatioRoutine into dev 
Reviewed-on: #2394
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>
 2024-06-21 05:05:20 +00:00
Carlos Andrés b5cd57e660 Merge pull request 'test' (!2621) from test into dev 
Reviewed-on: #2621
Reviewed-by: Jorge Penades <jorgep@verdnatura.es>
 2024-06-20 13:47:11 +00:00
Carlos Andrés 691413a854 Merge pull request 'master' (!2620) from master into test 
Reviewed-on: #2620
Reviewed-by: Jorge Penades <jorgep@verdnatura.es>
 2024-06-20 13:44:37 +00:00
Carlos Andrés 11675c2e35 Merge pull request 'feat: sincro client supplier sage refs #7595' (!2618) from 7595---Sincronizar-cambios-clientes-y-proveedores-con-Sage into master 
Reviewed-on: #2618
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
 2024-06-20 13:34:55 +00:00
Carlos Andrés e0d105313d feat: sincro client supplier sage refs #7595 2024-06-20 14:27:11 +02:00
Carlos Satorres 0486c40454 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6553-workerBusiness 2024-06-20 13:35:22 +02:00
Alex Moreno f99b1beb86 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev 2024-06-20 09:48:57 +02:00
Alex Moreno f84e85e443 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test 2024-06-20 09:48:34 +02:00
Javi Gallego 018972b948 Merge pull request 'feat: refs #7216 logUnpaid' (!2609) from 7216-clientUnpaid into dev 
Reviewed-on: #2609
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
 2024-06-20 05:50:14 +00:00
Javi Gallego 1a8df4d87c feat: refs #7216 triggers 2024-06-19 13:41:37 +02:00
Guillermo Bonet 738dcc7060 Merge pull request 'feat: refs #7545 Deleted hasIncoterms client column' (!2582) from 7545-hasIncoterms into dev 
Reviewed-on: #2582
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-06-19 09:31:18 +00:00
Sergio De la torre ae01fb6440 hotFix delete unique refs #6281 2024-06-18 17:00:15 +02:00
Jorge Penadés 6cf7c58671 fix: refs #6238 use scheme 2024-06-18 12:59:55 +02:00
Ivan Mas 49943e4f25 Merge branch 'dev' into 7313-Delete_vn.ticketPackaging.workerFk 2024-06-18 10:09:04 +00:00
Sergio De la torre 239814e6b4 feat hasItemOlder refs#6964 2024-06-18 10:08:40 +02:00
Sergio De la torre eedcdb54fa feat hasItemOlder refs#6964 2024-06-17 19:50:51 +02:00
Sergio De la torre dc777b2d7a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6964-hasItemOlder 2024-06-17 19:12:00 +02:00
Ivan Mas 671290b9a0 refs #7313 delete vn.itemPackaging.workerFk 2024-06-17 16:45:51 +02:00
Guillermo Bonet 1d0b89ed52 refs #7519 Requested changes 2024-06-17 09:42:16 +02:00
Alex Moreno 4f7b625a4f fix(business): sql role 2024-06-14 14:48:45 +02:00
Jorge Penadés 202884fdce feat: refs #6238 add travelKgPercentage table and model 2024-06-14 14:25:15 +02:00
Alex Moreno e8d0ebe91d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6553-workerBusiness 2024-06-14 12:09:30 +02:00
Guillermo Bonet cfc5e32715 feat: refs #6701 Fix error 2024-06-13 13:11:50 +02:00
Guillermo Bonet dcb9d54105 feat: refs #7545 Deleted hasIncoterms client column 2024-06-12 11:48:01 +02:00
Alex Moreno 1eee1d0e9b Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev 2024-06-12 07:47:56 +02:00
Jorge Penadés 1cefe817f5 feat: add editZone ACL for buyer 2024-06-11 12:06:44 +02:00
Jorge Penadés 562e8689e1 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6243-generalizeCmrSection 2024-06-10 15:36:34 +02:00
Javi Gallego b4046de190 Merge branch 'dev' into 4560-GastosReparto 2024-06-10 08:17:17 +00:00
Carlos Satorres 41fabecc9b refs #6553 fix acls 2024-06-10 09:29:37 +02:00
Sergio De la torre cac1278c08 feat hsItemOlder refs $6964 2024-06-07 16:29:51 +02:00
Javi Gallego f82f452423 Merge branch 'dev' into 7276_expeditionScanned 2024-06-07 13:44:24 +00:00
Jorge Penadés 521f3f1446 feat: refs #6243 update ACL 2024-06-07 11:52:24 +02:00
Javi Gallego 0c068ed126 Merge branch 'dev' into 4560-GastosReparto 2024-06-07 09:03:24 +00:00
Jorge Penadés 44e92964f1 Merge pull request 'test to dev' (!2558) from test into dev 
Reviewed-on: #2558
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-06-07 07:19:31 +00:00
Jorge Penadés 99e4808ae9 Merge branch 'test' into 6942-warmfix-setInsertAcl 2024-06-07 07:11:07 +00:00
Guillermo Bonet aff0de23eb Merge branch 'test' into dev 2024-06-07 08:29:28 +02:00
Guillermo Bonet b6fb7650cd Merge branch 'master' into test 2024-06-07 08:29:04 +02:00
Guillermo Bonet 70eddb6ce2 refactor: refs #7419 Added index ticketLog 2024-06-07 08:18:07 +02:00
Robert Ferrús f7c2fd824f feat: refs #7496 changesRequested 2024-06-07 07:05:22 +02:00
Jorge Penadés 5a6e2a2b31 fix: refs #6942 create invoiceIn acl 2024-06-06 15:45:39 +02:00
Sergio De la torre 268c0a984c feat isScanned refs #7276 2024-06-06 12:28:34 +02:00
Carlos Satorres 06fe0f5cef refs #6553 fix acls 2024-06-06 07:34:17 +02:00
Robert Ferrús e52da5117a Merge branch 'dev' into 7496-ticketIsLabeled 2024-06-05 07:57:34 +00:00
Robert Ferrús a0e79a778d feat: refs #7496 deprecated ticket.isLabeled 2024-06-05 09:57:15 +02:00
Robert Ferrús fd011428d5 Merge branch 'dev' into 7039-deleteVirtualColumnCountry 2024-06-05 06:48:20 +00:00