verdnatura/salix
verdnatura
/
salix
3
5
Fork 2
Code Issues Pull Requests 70 Releases Wiki Activity

refactor: refs #7912 Item calc cost Ricardo #3510

Open
guillermo wants to merge 4 commits from 7912-wasteCost into dev
pull from: 7912-wasteCost
merge into: verdnatura:dev
Conversation 0 Commits 4 Files Changed 1 +4 -4
1 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 076f4f3173 - Show all commits

8
db/routines/bs/procedures/waste_addSales.sql
View File

@ -11,7 +11,7 @@ BEGIN
* @param vDateTo Fecha hasta * @param vDateTo Fecha hasta
*/ */
DECLARE vDaysInYear INT; DECLARE vDaysInYear INT;
SET vDaysInYear = DATEDIFF(util.lastDayOfYear(CURDATE()), util.firstDayOfYear(CURDATE())); SET vDaysInYear = DATEDIFF(util.lastDayOfYear(util.VN_CURDATE()), util.firstDayOfYear(util.VN_CURDATE()));
SET vDateFrom = COALESCE(vDateFrom, util.VN_CURDATE()); SET vDateFrom = COALESCE(vDateFrom, util.VN_CURDATE());
SET vDateTo = COALESCE(vDateTo, util.VN_CURDATE()); SET vDateTo = COALESCE(vDateTo, util.VN_CURDATE());
@ -41,7 +41,7 @@ BEGIN
JOIN vn.entry e ON e.id = b.entryFk JOIN vn.entry e ON e.id = b.entryFk
JOIN vn.travel tr ON tr.id = e.travelFk JOIN vn.travel tr ON tr.id = e.travelFk
JOIN vn.warehouse w ON w.id = tr.warehouseInFk JOIN vn.warehouse w ON w.id = tr.warehouseInFk
WHERE tr.landed BETWEEN CURDATE() - INTERVAL 1 WEEK AND CURDATE() WHERE tr.landed BETWEEN util.VN_CURDATE() - INTERVAL 1 WEEK AND util.VN_CURDATE()
guillermo marked this conversation as resolved Outdated
jgallego commented 2025-02-28 11:36:52 +00:00
Outdated
Review
Copy Link

sempre gastem el curddate de util, pel tema local y fixtures

sempre gastem el curddate de util, pel tema local y fixtures
AND e.supplierFk NOT IN ( AND e.supplierFk NOT IN (
(SELECT supplierFk FROM vn.inventoryConfig), (SELECT supplierFk FROM vn.inventoryConfig),
(SELECT id FROM vn.supplier WHERE name = 'ARREGLOS STOCK') (SELECT id FROM vn.supplier WHERE name = 'ARREGLOS STOCK')
@ -63,7 +63,7 @@ BEGIN
JOIN vn.travel tr ON tr.id = e.travelFk JOIN vn.travel tr ON tr.id = e.travelFk
JOIN vn.warehouse w ON w.id = tr.warehouseInFk JOIN vn.warehouse w ON w.id = tr.warehouseInFk
JOIN vn.supplier s ON s.id = e.supplierFk JOIN vn.supplier s ON s.id = e.supplierFk
WHERE tr.landed BETWEEN CURDATE() - INTERVAL 1 YEAR AND CURDATE() WHERE tr.landed BETWEEN util.VN_CURDATE() - INTERVAL 1 YEAR AND util.VN_CURDATE()
AND s.isReal AND s.isReal
) )
SELECT bn.warehouseFk, SELECT bn.warehouseFk,
@ -88,7 +88,7 @@ BEGIN
JOIN vn.travel tr ON tr.id = e.travelFk JOIN vn.travel tr ON tr.id = e.travelFk
JOIN vn.warehouse w ON w.id = tr.warehouseInFk JOIN vn.warehouse w ON w.id = tr.warehouseInFk
JOIN vn.supplier s ON s.id = e.supplierFk JOIN vn.supplier s ON s.id = e.supplierFk
WHERE tr.landed BETWEEN CURDATE() - INTERVAL 1 YEAR AND CURDATE() WHERE tr.landed BETWEEN util.VN_CURDATE() - INTERVAL 1 YEAR AND util.VN_CURDATE()
) )
SELECT bn.warehouseFk, SELECT bn.warehouseFk,
b.itemFk, b.itemFk,