98bc78fd42
Merge branch 'test' into 8058-test-ticketsUrgentes
1205475c4c
Merge pull request 'fix: refs #7760 collection_assing added global handler sqlexception' (!3076) from 7760-collectionAssingHandler into master
4da63900a2
fix: refs #7760 collection_assing added global handler sqlexception
6b7f161d9a
fix: refs #7844 sale_problems llena
4a17d9ec0e
fix: refs #7760 collection_assing
4b497108dc
Merge pull request 'fix: refs #8069 call moved upper than transaction start' (!3075) from 8069-Overstocking into dev
cf29b1bd82
Merge branch 'dev' into 8069-Overstocking
04e5018bc9
Merge branch 'dev' into 8069-Overstocking
6766cebd2a
fix: refs #8069 call moved upper than transaction start
cf29b1bd82
Merge branch 'dev' into 8069-Overstocking
49305f77df
Merge pull request '#7353 takeout monitor' (!2866) from 7353-takeoutMonitor into dev
4411f0cfb3
Merge branch 'dev' into 7353-takeoutMonitor
30c7475fcb
Merge branch 'dev' into 7353-takeoutMonitor
6b1001ec6a
feat: refs #7353 drop section
355b1357b7
Merge branch 'dev' into Fix-OrderCatalog
d325459beb
Merge pull request '4988-fixE2e' (!801) from 4988-fixE2e into dev
efe5208d30
Merge branch 'dev' into 4988-fixE2e
9f433afb51
Merge pull request '#7702 - FIX Change password error' (!542) from 7702_fix_setPassword into dev
1869e3315a
fix: refs #4988 remove id
04e5018bc9
Merge branch 'dev' into 8069-Overstocking
5d00eb793c
Merge pull request 'fix: refs #8069 wrong field name' (!3063) from 8069-Overstocking into dev
fix: refs #8069 call moved upper than transaction start
5d00eb793c
Merge pull request 'fix: refs #8069 wrong field name' (!3063) from 8069-Overstocking into dev
e4d386c65f
Merge branch 'dev' into 8069-Overstocking
a6cc7cd2a5
Merge branch 'dev' into 8069-Overstocking
57cd6cc882
Merge branch 'dev' into 8069-Overstocking
1b254b138e
Merge branch 'dev' into 8069-Overstocking
e4d386c65f
Merge branch 'dev' into 8069-Overstocking
f8f205a4f8
feat: update myt version
0b1756ff3a
Merge branch 'test' into dev
b07ffd2a56
Merge pull request 'fix: refs #7956 item_getSimilar' (!3073) from 7956-itemGetSimilarFix into master
7aa8200fca
fix: refs #7956 item_getSimilar
a6cc7cd2a5
Merge branch 'dev' into 8069-Overstocking
c01e5aee27
Merge pull request 'fix: refs #7404 add rounding to volume detail' (!3035) from 7404-roundDetailVolume into dev
f019214002
Merge branch 'dev' into 7404-roundDetailVolume
229d5369a1
fix: refs #7404 spec for new entry fixture
46e2ffd6c2
fix: refs #7404 add fixtures
57cd6cc882
Merge branch 'dev' into 8069-Overstocking
cb69ed8a7b
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
9a27498bc5
Merge pull request 'build: refs #8062 dump db' (!3062) from 8062-dump into master
0c4637030c
Merge pull request 'refactor: refs #7886 Deleted proc buy_getVolumeByAgency' (!2965) from 7886-buy_getVolumeByAgency into dev
34c4715f6e
build: refs #8062 dump db and import ticketCanAdvanceConfig
1b254b138e
Merge branch 'dev' into 8069-Overstocking
91d9a6e417
Merge pull request '#7346 - manualInvoice' (!3060) from 7346-manualInvoice into dev
5f695f63b3
Merge pull request 'refactor: refs #7817 itemShelving_addList change' (!2882) from 7817-isChecked into dev
ee52c8b45f
fix: refs #7346 findByid con fields
43df98598c
feat: refs #7346 manual invoice with address
fix: refs #8069 wrong field name
3a5eb00a45
Merge pull request '8069-Overstocking' (!3051) from 8069-Overstocking into dev
abb39ec0e7
Merge branch 'dev' into 8069-Overstocking
fc1ea280fa
fix: refs #8069 new conception
b53f6d4008
Merge branch 'dev' into 8069-Overstocking
9d84c39fce
feat: refs #8069 orderRow_updateOverstocking