verdnatura/salix
verdnatura
/
salix
3
4
Fork 0
Code Issues Pull Requests 57 Releases Wiki Activity

7199-devToTest_2316 #2287

Merged
alexm merged 169 commits from 7199-devToTest_2316 into test 2024-04-11 06:25:23 +00:00
Conversation 0 Commits 169 Files Changed 105 +10 -10
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit df271a242d - Show all commits

20
db/routines/vn/procedures/addAccountReconciliation.sql
View File

@ -42,20 +42,20 @@ BEGIN
OutForeignValue, OutForeignValue,
workerFk workerFk
) )
SELECT ar.operationDated dated, SELECT ar.operationDated,
TRUE isAccountable, TRUE,
'MB' serie, 'MB',
ar.concept, ar.concept,
@totalIn := IF(ar.debitCredit = arc.debitCredit2 AND a.currencyFk = arc.currencyFk, ar.amount, NULL) `in`, IF(ar.debitCredit = arc.debitCredit2 AND a.currencyFk = arc.currencyFk, ar.amount, NULL),
@totalOut := IF(ar.debitCredit = arc.debitCredit AND a.currencyFk = arc.currencyFk, ar.amount, NULL) `out`, IF(ar.debitCredit = arc.debitCredit AND a.currencyFk = arc.currencyFk, ar.amount, NULL),
a.id bankFk, a.id,
sa.supplierFk companyFk, sa.supplierFk,
arc.warehouseFk, arc.warehouseFk,
ar.supplierAccountFk, ar.supplierAccountFk,
ar.calculatedCode, ar.calculatedCode,
@totalIn InForeignValue, IF(ar.debitCredit = arc.debitCredit2 AND NOT a.currencyFk = arc.currencyFk, ar.amount, NULL),
@totalOut OutForeignValue, IF(ar.debitCredit = arc.debitCredit AND NOT a.currencyFk = arc.currencyFk, ar.amount, NULL),
account.myUser_getId() user account.myUser_getId()
FROM accountReconciliation ar FROM accountReconciliation ar
JOIN supplierAccount sa ON sa.id = ar.supplierAccountFk JOIN supplierAccount sa ON sa.id = ar.supplierAccountFk
JOIN accounting a ON a.id = sa.accountingFk JOIN accounting a ON a.id = sa.accountingFk