Merge branch 'dev' into 2943-timecontrol_now_showing_hours
gitea/salix/pipeline/head This commit looks good
Details
gitea/salix/pipeline/head This commit looks good
Details
This commit is contained in:
commit
238975644f
|
@ -93,7 +93,7 @@ module.exports = function(Self) {
|
||||||
clientOriginal.accountingAccount
|
clientOriginal.accountingAccount
|
||||||
],
|
],
|
||||||
options);
|
options);
|
||||||
} else {
|
} else if (accountingType.isAutoConciliated == true) {
|
||||||
const description = `${clientOriginal.id} : ${clientOriginal.socialName} - ${accountingType.receiptDescription}`;
|
const description = `${clientOriginal.id} : ${clientOriginal.socialName} - ${accountingType.receiptDescription}`;
|
||||||
const [xdiarioNew] = await Self.rawSql(
|
const [xdiarioNew] = await Self.rawSql(
|
||||||
`SELECT xdiario_new(?, CURDATE(), ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?) ledger;`,
|
`SELECT xdiario_new(?, CURDATE(), ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?) ledger;`,
|
||||||
|
|
Loading…
Reference in New Issue