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

#7709 -supplierPackaging_ReportSource_2 #3107

Open
robert wants to merge 29 commits from 7709-supplierPackaging_ReportSource_2 into dev
pull from: 7709-supplierPackaging_ReportSource_2
merge into: verdnatura:dev
Conversation 0 Commits 29 Files Changed 1 +5 -5
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit e4cd290027 - Show all commits

10
db/routines/vn/procedures/supplierPackaging_ReportSource.sql
View File

@ -10,9 +10,9 @@ BEGIN
* @param vFromDated Starting date * @param vFromDated Starting date
* @param vSupplierFk Supplier ID * @param vSupplierFk Supplier ID
*/ */
DECLARE vPerson INT; DECLARE vEntityId INT;
SELECT id INTO vPerson SELECT id INTO vEntityId
FROM supplier FROM supplier
WHERE nif = vNif; WHERE nif = vNif;
@ -106,9 +106,9 @@ BEGIN
)sub )sub
WHERE `out` OR `in`; WHERE `out` OR `in`;
IF vPerson IS NULL THEN IF vEntityId IS NULL THEN
SELECT id INTO vPerson SELECT id INTO vEntityId
FROM client FROM client
WHERE fi = vNif; WHERE fi = vNif;
@ -158,7 +158,7 @@ BEGIN
END IF; END IF;
SELECT vPerson, SELECT vEntityId,
itemFk, itemFk,
longName, longName,
name, name,