This commit is contained in:
parent
37c1878602
commit
9ae255d747
|
@ -8,7 +8,7 @@ BEGIN
|
|||
* Create a report with packaging balance
|
||||
*
|
||||
* @param vFromDated Starting date
|
||||
* @param vSupplierFk Supplier ID
|
||||
* @param vNif number of nif/fi of supplier or client
|
||||
*/
|
||||
DECLARE vEntityId INT;
|
||||
|
||||
|
@ -124,12 +124,12 @@ BEGIN
|
|||
FROM (
|
||||
SELECT sp.itemFk,
|
||||
sp.longName,
|
||||
sp.supplier,
|
||||
CONCAT('E', sp.entryFk),
|
||||
sp.supplier name,
|
||||
CONCAT('E', sp.entryFk) entryFk,
|
||||
sp.landed,
|
||||
sp.`in`,
|
||||
sp.`out`,
|
||||
e.invoiceNumber,
|
||||
e.invoiceNumber sref,
|
||||
sp.buyingValue
|
||||
FROM supplierPackaging sp
|
||||
JOIN entry e ON e.id = sp.entryFk
|
||||
|
@ -142,8 +142,8 @@ BEGIN
|
|||
supplier,
|
||||
'E previous',
|
||||
vFromDated,
|
||||
IF(SUM(`in`) + SUM(-`out`)>0, SUM(`in`) + SUM(-`out`), 0) `in`,
|
||||
-IF(SUM(`in`) + SUM(-`out`)<0, SUM(`in`) + SUM(-`out`), 0) `out`,
|
||||
GREATEST(SUM(`in`) - SUM(`out`), 0) AS `in`,
|
||||
LEAST(SUM(`in`) - SUM(`out`), 0) AS `out`,
|
||||
NULL,
|
||||
AVG(buyingValue)
|
||||
FROM supplierPackaging sp
|
||||
|
|
Loading…
Reference in New Issue