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

#7897 - Merge master into test #2869

Merged
jorgep merged 6 commits from master into test 2024-09-04 14:28:44 +00:00
Conversation 0 Commits 6 Files Changed 3 +5 -4
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit cdaf8a7a67 - Show all commits

5
modules/invoiceIn/back/methods/invoice-in/filter.js
View File

@ -138,9 +138,9 @@ module.exports = Self => {
? {'ii.id': value} ? {'ii.id': value}
: {'s.name': {like: `%${value}%`}}; : {'s.name': {like: `%${value}%`}};
case 'from': case 'from':
return {'ii.created': {gte: value}}; return {'ii.issued': {gte: value}};
case 'to': case 'to':
return {'ii.created': {lte: value}}; return {'ii.issued': {lte: value}};
case 'fi': case 'fi':
return {'s.nif': value}; return {'s.nif': value};
case 'account': case 'account':
@ -173,7 +173,6 @@ module.exports = Self => {
const stmt = new ParameterizedSQL( const stmt = new ParameterizedSQL(
`SELECT `SELECT
ii.id, ii.id,
ii.serialNumber,
ii.serial, ii.serial,
ii.issued, ii.issued,
ii.isBooked, ii.isBooked,

4
modules/invoiceIn/back/methods/invoice-in/getTotals.js
View File

@ -27,10 +27,12 @@ module.exports = Self => {
const [result] = await Self.rawSql(` const [result] = await Self.rawSql(`
SELECT iit.*, SELECT iit.*,
SUM(iidd.amount) totalDueDay SUM(iidd.amount) totalDueDay,
SUM(iidd.foreignValue) totalDueDayForeignValue
FROM vn.invoiceIn ii FROM vn.invoiceIn ii
LEFT JOIN ( LEFT JOIN (
SELECT SUM(iit.taxableBase) totalTaxableBase, SELECT SUM(iit.taxableBase) totalTaxableBase,
SUM(iit.foreignValue) totalTaxableBaseForeignValue,
CAST( CAST(
SUM(IFNULL(iit.taxableBase * (1 + (ti.PorcentajeIva / 100)), iit.taxableBase)) SUM(IFNULL(iit.taxableBase * (1 + (ti.PorcentajeIva / 100)), iit.taxableBase))
AS DECIMAL(10, 2) AS DECIMAL(10, 2)