verdnatura/salix
verdnatura
/
salix
3
5
Fork 2
Code Issues Pull Requests 66 Releases Wiki Activity

6745-2404_testToMaster #1950

Merged
alexm merged 191 commits from 6745-2404_testToMaster into master 2024-01-25 07:39:13 +00:00
Conversation 0 Commits 191 Files Changed 177 +3 -4
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit df1c9e3d9f - Show all commits

7
print/templates/reports/sepa-core/sepa-core.js
View File

@ -8,7 +8,6 @@ module.exports = {
this.client = await this.findOneFromDef('client', [this.companyId, this.companyId, this.id]); this.client = await this.findOneFromDef('client', [this.companyId, this.companyId, this.id]);
this.checkMainEntity(this.client); this.checkMainEntity(this.client);
this.supplier = await this.findOneFromDef('supplier', [this.companyId, this.companyId, this.id]); this.supplier = await this.findOneFromDef('supplier', [this.companyId, this.companyId, this.id]);
console.log(this.supplier);
}, },
props: { props: {
id: { id: {
@ -26,9 +25,9 @@ module.exports = {
return db.findOne(` return db.findOne(`
SELECT sa.iban, s.nif SELECT sa.iban, s.nif
FROM supplierAccount sa FROM supplierAccount sa
INNER JOIN supplier s ON sa.supplierFk = s.id JOIN company co ON co.supplierAccountFk = sa.id
WHERE s.countryFk = ? JOIN supplier s ON sa.supplierFk = s.id
LIMIT 1`), [this.countryFk]; WHERE co.id = ?`) [this.companyId];
} }
} }