ad16eddf6b
Merge pull request 'fix: refs #7141 catalog_calculate' (!2207) from 7141-sale_replaceItem into master
c3e3d72182
Merge branch 'master' into 7141-sale_replaceItem
8e2770aa56
feat: refs #7141
3e2e0ccadb
Merge branch 'master' into 7141-sale_replaceItem
dd977fab83
fix: refs #7141 catalog_calculate
fix: refs #7141 catalog_calculate
c3e3d72182
Merge branch 'master' into 7141-sale_replaceItem
be863c1269
Merge pull request 'hotFix: recreate addressTaxArea' (!2220) from hotFix_create_fn_addressTaxArea into master
b532ce3f77
hotFix: recreate addressTaxArea
9aa46c3a90
fix: HOTFIX PROC vn.collection_new release lock on error
3e2e0ccadb
Merge branch 'master' into 7141-sale_replaceItem
eb245772f2
Merge pull request 'refs #7118 deploy: dump' (!2208) from 7118-master_dump_2 into master
6d2ab2f4f3
refs #7118 deploy: dump
5411433e52
Merge pull request '6276-newWarehouse-salix' (!2204) from 6276-newWarehouse-salix into master
2a1204a00a
refs #6276 hotFix: setUserError and return
fix: refs #7141 catalog_calculate
feat: refs #6738 crear las Fk de la tabla flight
Lo he comentado con Carlos y payrollWorkCenter le parece correcto, podrías decir cual seria un nombre correcto?
9795f449b9
Merge branch 'dev' into 6738-cleanTables2008Part2to2
268c63ce8f
Merge pull request 'refs #6498 procRefactor6' (!2134) from 6499-procRefactor6 into dev
c33c90aefe
Merge branch 'dev' into 6499-procRefactor6
130fb68d27
Merge pull request 'feat: refs #6302 delete after add to turn' (!2187) from 6302-delete-ticket-after-add-to-turn into dev
2f87ba03b2
Merge branch 'test' into dev