WIP: refs #6222 refactor: sale_calculateComponent
4b5cf4a28d
Merge pull request 'refs #5854 itemShelving traducciones' (!1862) from 5854-itemShelvingTraduciones into dev
ed1764ff30
Merge branch 'dev' into 5854-itemShelvingTraduciones
f7a28eea58
Merge branch 'dev' into 5854-itemShelvingTraduciones
7b65ebb58b
Merge branch 'dev' into 5854-itemShelvingTraduciones
4df2fa8ee4
Merge branch 'dev' into 5854-itemShelvingTraduciones
refs #5854 itemShelving traducciones
f7a28eea58
Merge branch 'dev' into 5854-itemShelvingTraduciones
703e16ffcd
Merge pull request '#6434 - signIn_issue' (!1892) from 6434-signIn_issue into dev
ec1befcfb0
Merge branch 'dev' into 6434-signIn_issue
36698c1ace
Merge pull request 'refs #5925 models table docuware' (!1889) from 5925-docuwareTablet into dev
9951e911ae
refs #5925 feat(docuware_upload): use userConfig.tabletFk
4df2fa8ee4
Merge branch 'dev' into 5854-itemShelvingTraduciones
e7db97a671
Merge pull request 'refactor(renameTable): refs #6125 clientCreditLimit to roleCreditLimit' (!1890) from 6125-roleCreditLimitFix into dev
9bcd0a3c98
Merge branch 'dev' into 6125-roleCreditLimitFix
fb74ea3b2c
Merge pull request 'refactor(ticketTracking.userFk): refs #6398 workerFk to userFk' (!1874) from 6398-ticketTracking-change-workerFk-to-userFk into dev
d4fa1e9aca
refs #6398
9159fe4d4e
Merge branch 'dev' into 5854-itemShelvingTraduciones
ea39f8b3be
remove duplicate
977184f3e5
Merge pull request 'refs #5971 change sql address' (!1882) from 5971-addressInvoiceOut into dev
f796227120
Merge branch 'dev' into 5971-addressInvoiceOut
9165995ee5
Merge branch 'dev' into 5971-addressInvoiceOut
9894591aa9
Merge branch 'dev' into 5854-itemShelvingTraduciones
24c7271dd8
Merge pull request '#6487 - Stop test container when finish' (!1884) from 6487_stop_test_container into dev
10247c744f
Merge branch 'dev' into 6487_stop_test_container
a36f22a414
Merge pull request 'refs #6172 Change' (!1735) from 6172-errorMsg into dev
95a8646d07
Merge branch 'dev' into 6172-errorMsg
2a93dcf5b8
Merge branch 'dev' into 5854-itemShelvingTraduciones
0b1bbbaaa6
Merge pull request 'refs #5835 rate added' (!1865) from 5835-summaryRate into dev
611b45bae0
Merge branch 'dev' into 5835-summaryRate
ee7dd66ce9
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
35e74a7635
Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test
5f26553092
Merge branch 'dev' into 5854-itemShelvingTraduciones
8ee8d90eec
Merge pull request 'refactor: refs #3222 Expence to expense' (!1860) from 3222-expenceToExpense into dev
3bdb002034
Merge branch 'dev' into 3222-expenceToExpense
aefff68c29
refactor: refs #3222 Requested changes
d075cb97ad
Merge pull request 'refs #5811 feat: al borrar expedicion borrar de viaexpress' (!1754) from 5811-ticket.expedition_deleteViaexpress into dev
refs #5854 itemShelving traducciones
8d737e579d
Merge pull request 'refs #5637 saleGroup traducciones' (!1816) from 5637-saleGroupLog into dev
8c1ff26de7
Merge branch 'dev' into 5637-saleGroupLog
6112c7ba5f
refs #5637 saleGroup traducciones
refs #5637 saleGroup traducciones