4b309d7dc3
Merge branch 'dev' into 8077-sumDefaulter
cdcc5051d2
feat: refs #8057 Fix version
2b770c0201
feat: refs #8057 Fix version
aed4bc89c7
feat: refs #8057 Fix version
baadd621e1
Merge pull request 'feat: refs #8057 Added geoFk columns' (!3204) from 8057-geoFk into dev
5e21e4e368
Merge pull request 'feat: refs #8127 entry_getCommission' (!3128) from 8127-entry_updateComission into dev
329488d700
Merge branch 'dev' into 8127-entry_updateComission
923296e85e
Merge branch 'dev' into 8127-entry_updateComission
c5f1b05671
feat: refs #8127 quitar esquemas
f7a5fc7e31
Merge branch 'dev' into 8127-entry_updateComission
feat: refs #8127 entry_getCommission
329488d700
Merge branch 'dev' into 8127-entry_updateComission
7d5928bc3d
Merge pull request 'feat: refs #8135 refs#8135 updateTicketACL' (!3210) from 8135-ticketACL into dev
55daa2d02b
Merge pull request '7743-simpleTestForSendMail' (!3170) from 7743-simpleTestForSendMail into dev
b529ccfe29
feat: refs #7920 Added ItemShelving in shelvingLog
86e4e3e981
Merge branch 'dev' into 7743-simpleTestForSendMail
567ec689ad
Merge branch 'dev' into 8077-sumDefaulterFront
80770b1165
Merge pull request '#8185 Fix LeftMenu to avoid duplicates' (!952) from 8185-DuplicateLeftMenu into dev
3d8aa3cff9
Merge branch 'dev' into 8185-DuplicateLeftMenu
2bc219a09b
refactor: refs #8185 modified LeftMenu to avoid duplicates
2511fbf71c
Merge branch 'dev' into 8077-sumDefaulter
55daa2d02b
Merge pull request '7743-simpleTestForSendMail' (!3170) from 7743-simpleTestForSendMail into dev
b529ccfe29
feat: refs #7920 Added ItemShelving in shelvingLog
a3945070f2
refactor: refs #7920 No changes in itemShelvingLog table
86e4e3e981
Merge branch 'dev' into 7743-simpleTestForSendMail
f373f34609
Merge branch 'dev' into 8077-sumDefaulterFront
3f486f6514
Merge pull request 'fix: refs #7310 clean warning' (!840) from 7310-warningTravelTermographs into dev
95291d4d4e
Merge branch 'dev' into 7310-warningTravelTermographs
e8f0bc9965
Merge pull request 'feat(VnSelect): refs #7136 add scroll' (!890) from 7136-vnSelect_paginate_simplify_2 into dev
0e93766670
Merge branch 'dev' into 7136-vnSelect_paginate_simplify_2
923296e85e
Merge branch 'dev' into 8127-entry_updateComission
a3945070f2
refactor: refs #7920 No changes in itemShelvingLog table
f7a5fc7e31
Merge branch 'dev' into 8127-entry_updateComission
e1a091535e
refactor: refs #7920 Fix version
b5463e5560
refactor: refs #7920 Fix version
e49285ace8
refactor: refs #7920 Fix version
e344ae3bf2
refactor: refs #7920 Fix version
feat: refs #8190 entry_getCommission
021bc03ecf
Merge pull request 'feat: refs #8169 create table itemTextureTag' (!3155) from 8169-itemTextureTag into master
9b079a8bb2
Merge branch 'master' into 8169-itemTextureTag
d925a5d7fa
Merge branch 'master' into 8169-itemTextureTag
55fced363e
Merge branch 'master' into 8169-itemTextureTag
94ed23ca07
feat: refs #8169 modifica role
feat: refs #8169 create table itemTextureTag
9b079a8bb2
Merge branch 'master' into 8169-itemTextureTag
1086981b53
fix: refs #7779 ticket_splitItemPackingType
d06be8b5b6
Merge pull request 'fix: problem calculation updated' (!3193) from hotFix-sale_getProblems into master
ebc0420531
fix: problem calculation updated
fbd59de3cd
Merge pull request 'feat: refs #7994 remove comment script' (!3192) from 7994-removeCommentScript into master
d925a5d7fa
Merge branch 'master' into 8169-itemTextureTag
699675b476
fix: hotfix
ec3f852bde
Merge pull request 'HOTFIX New order from Customer' (!3186) from hotFix_newOrder_redirect into master
96301f8a0b
fix: hotfix create order from customer
307179cb9d
Merge pull request 'fix: refs #7404 restore stockBuyed old proc' (!3183) from 7404-recoverStockBuyedProcs into master
feat: refs #8169 create table itemTextureTag
Sols donan-li permis a logisticAssist ya funciona correctament, ja que es el usuari salix qui mostra depres el desplegable, no fan falta permisos extra