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

Merge branch 'dev' into 2937-module_transactions
gitea/salix/pipeline/head This commit looks good Details

This commit is contained in:
Carlos Jimenez Ruiz 2021-06-07 13:02:20 +00:00
parent 647b7a93cd 3f74b52049
commit 3894fe94ec
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/client/back/methods/client/createReceipt.js
View File

@ -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;`,

4
print/templates/email/osticket-report/sql/dateRange.sql
View File

@ -3,6 +3,6 @@ FROM (
SELECT @lastWeek := DATE_ADD(CURDATE(), INTERVAL -1 WEEK), SELECT @lastWeek := DATE_ADD(CURDATE(), INTERVAL -1 WEEK),
@lastWeekMonday := DATE_ADD(@lastWeek, INTERVAL (-WEEKDAY(@lastWeek)) DAY), @lastWeekMonday := DATE_ADD(@lastWeek, INTERVAL (-WEEKDAY(@lastWeek)) DAY),
@lastWeekFriday := DATE_ADD(@lastWeekMonday, INTERVAL (+6) DAY), @lastWeekFriday := DATE_ADD(@lastWeekMonday, INTERVAL (+6) DAY),
@lastWeekMondayTime := ADDTIME(DATE(@lastWeekMonday), '00:00:00'), @lastWeekMondayTime := CONCAT(@lastWeekMonday, ' 00:00:00'),
@lastWeekFridayTime := ADDTIME(DATE(@lastWeekFriday), '23:59:59') @lastWeekFridayTime := CONCAT(@lastWeekFriday, ' 23:59:59')
) t ) t