verdnatura/salix
verdnatura
/
salix
3
5
Fork 0
Code Issues Pull Requests 64 Releases Wiki Activity

8524-devToTest #3415

Merged
alexm merged 343 commits from 8524-devToTest into test 2025-02-04 13:42:16 +00:00
Conversation 0 Commits 343 Files Changed 127 +4 -4
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 6ac30dcb0c - Show all commits

7
db/routines/vn/procedures/entry_transfer.sql
View File

@ -75,7 +75,8 @@ BEGIN
END IF; END IF;
UPDATE entry UPDATE entry
SET travelFk = vTravelFk SET travelFk = vTravelFk,
evaNotes = vOriginalEntry
WHERE id = vNewEntryFk; WHERE id = vNewEntryFk;
-- Poner a 0 las cantidades -- Poner a 0 las cantidades
@ -113,7 +114,7 @@ BEGIN
JOIN vn.parking p ON p.id = sh.parkingFk JOIN vn.parking p ON p.id = sh.parkingFk
JOIN vn.sector s ON s.id = p.sectorFk JOIN vn.sector s ON s.id = p.sectorFk
WHERE s.warehouseFk = vWarehouseFk WHERE s.warehouseFk = vWarehouseFk
AND sh.parked BETWEEN CURDATE() AND util.dayend(CURDATE()) AND sh.parked >= util.VN_CURDATE()
GROUP BY ish.itemFk GROUP BY ish.itemFk
), ),
sales AS ( sales AS (
@ -124,7 +125,7 @@ BEGIN
JOIN vn.itemShelving is2 ON is2.id = iss.itemShelvingFk JOIN vn.itemShelving is2 ON is2.id = iss.itemShelvingFk
JOIN vn.shelving s2 ON s2.id = is2.shelvingFk JOIN vn.shelving s2 ON s2.id = is2.shelvingFk
WHERE t.shipped BETWEEN util.VN_CURDATE() AND util.dayend(util.VN_CURDATE()) WHERE t.shipped BETWEEN util.VN_CURDATE() AND util.dayend(util.VN_CURDATE())
AND s2.parked BETWEEN CURDATE() AND util.dayend(CURDATE()) AND s2.parked >= util.VN_CURDATE()
GROUP BY s.itemFk GROUP BY s.itemFk
) )
SELECT tmp.itemFk, SELECT tmp.itemFk,

1
modules/entry/back/models/entry.js
View File

@ -13,7 +13,6 @@ module.exports = Self => {
require('../methods/entry/addFromBuy')(Self); require('../methods/entry/addFromBuy')(Self);
require('../methods/entry/buyLabel')(Self); require('../methods/entry/buyLabel')(Self);
require('../methods/entry/transfer')(Self); require('../methods/entry/transfer')(Self);
require('../methods/entry/print')(Self);
require('../methods/entry/labelSupplier')(Self); require('../methods/entry/labelSupplier')(Self);
require('../methods/entry/buyLabelSupplier')(Self); require('../methods/entry/buyLabelSupplier')(Self);