19fa05e774
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6389-changesMonitor
7f39edf014
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
0d205eb6ce
Merge pull request 'fix: refs #7404 negative quantity' (!3214) from 7404-fixNegativeQuantity into master
f3e5806990
Merge pull request 'fix: refs #6861 refs#6861 getTickets' (!3187) from 6861-ItemShelvingSalesgetTickets into master
6a94848007
Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into 6861-ItemShelvingSalesgetTickets
1844e15239
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6389-changesMonitor
9c271eee08
Merge pull request '#7346 manualInvoice' (!793) from 7346-manualInvoice into dev
afaf2df2ee
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev
43f58d3dba
Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test
7d2f4bcf44
Merge branch 'dev' into 7346-manualInvoice
carlossa
pushed to 7304-warningCustomerBasicData at verdnatura/salix-front
2024-11-19 07:01:09 +00:00
2be55ca81c
fix: refs #7304 fix list
carlossa
pushed to 7304-warningCustomerBasicData at verdnatura/salix-front
2024-11-19 06:18:45 +00:00
be89f003a7
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7304-warningCustomerBasicData
3c5472ad4a
Merge pull request 'Fix: changed route.query' (!959) from Fix-OrderCatalogCategoryFilter into dev
0c0b9ca648
fix: changed route.query
dd490888cf
merge test in dev
09be2d4d41
Merge pull request 'solveConflicts_test_to_dev' (!957) from solveConflicts_test_to_dev into dev
6b0d7762b4
Merge branch '7529-workerPIT' of https://gitea.verdnatura.es/verdnatura/salix into 7529-workerPIT
2790e92741
fix: refs #7529 fix acl
fix: hotfix OrderTickets