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

MASTER-fix(invoiceIn_descriptor): supplier.email #1307

Merged
joan merged 4 commits from hotFix_invoiceIn_supplier_email into master 2023-02-07 08:39:17 +00:00
Conversation 0 Commits 4 Files Changed 3 +9 -12
3 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
modules/invoiceIn/back/models/invoice-in.json
View File

@ -94,11 +94,6 @@
"model": "Supplier", "model": "Supplier",
"foreignKey": "supplierFk" "foreignKey": "supplierFk"
}, },
"supplierContact": {
"type": "hasMany",
"model": "SupplierContact",
"foreignKey": "supplierFk"
},
"currency": { "currency": {
"type": "belongsTo", "type": "belongsTo",
"model": "Currency", "model": "Currency",

14
modules/invoiceIn/front/card/index.js
View File

@ -6,13 +6,15 @@ class Controller extends ModuleCard {
const filter = { const filter = {
include: [ include: [
{ {
relation: 'supplier' relation: 'supplier',
},
{
relation: 'supplierContact',
scope: { scope: {
where: { include: {
email: {neq: null} relation: 'contacts',
scope: {
where: {
email: {neq: null},
}
}
} }
} }
}, },

2
modules/invoiceIn/front/descriptor/index.html
View File

@ -40,7 +40,7 @@
</vn-item> </vn-item>
<vn-item <vn-item
ng-if="$ctrl.isAgricultural()" ng-if="$ctrl.isAgricultural()"
ng-click="sendPdfConfirmation.show({email: $ctrl.entity.supplierContact[0].email})" ng-click="sendPdfConfirmation.show({email: $ctrl.entity.supplier.contacts[0].email})"
translate> translate>
Send agricultural receipt as PDF Send agricultural receipt as PDF
</vn-item> </vn-item>