seccion en summary
gitea/salix/pipeline/head This commit looks good Details

This commit is contained in:
Javi Gallego 2021-06-14 09:47:04 +02:00
parent acf03959f5
commit 44ce54ede4
4 changed files with 56 additions and 2 deletions

View File

@ -39,6 +39,24 @@ module.exports = Self => {
scope: {
fields: ['withholding']
}
},
{
relation: 'invoiceInTax',
scope: {
fields: ['id', 'invoiceInFk', 'taxableBase', 'expenseFk', 'taxTypeSageFk', 'transactionTypeSageFk', 'foreignValue'],
include: [{
relation: 'transactionTypeSage',
scope: {
fields: ['transaction']
}
},
{
relation: 'taxTypeSage',
scope: {
fields: ['vat']
}
}]
}
}
]
};

View File

@ -49,12 +49,12 @@
},
"taxTypeSage": {
"type": "belongsTo",
"model": "TaxTypeSage",
"model": "SageTaxType",
"foreignKey": "taxTypeSageFk"
},
"transactionTypeSage": {
"type": "belongsTo",
"model": "TiposTransacciones",
"model": "SageTransactionType",
"foreignKey": "transactionTypeSageFk"
}
}

View File

@ -58,6 +58,11 @@
"model": "InvoiceInDueDay",
"foreignKey": "invoiceInFk"
},
"invoiceInTax": {
"type": "hasMany",
"model": "InvoiceInTax",
"foreignKey": "invoiceInFk"
},
"sageWithholding": {
"type": "belongsTo",
"model": "SageWithholding",

View File

@ -46,6 +46,37 @@
</vn-horizontal>
</vn-auto>
</vn-horizontal>
<vn-one ng-if="$ctrl.summary.invoiceInTax.length != 0">
<h4>
<a
ui-sref="invoiceIn.card.tax({id:$ctrl.invoiceIn.id})"
target="_self">
<span translate vn-tooltip="Go to">Vat</span>
</a>
</h4>
<vn-table model="model">
<vn-thead>
<vn-tr>
<vn-th number>Expense</vn-th>
<vn-th shrink>Taxable base</vn-th>
<vn-th>Sage vat</vn-th>
<vn-th>Sage transaction</vn-th>
<vn-th number>Rate</vn-th>
<vn-th number>Foreign value</vn-th>
</vn-tr>
</vn-thead>
<vn-tbody>
<vn-tr ng-repeat="tax in $ctrl.summary.invoiceInTax">
<vn-td number expand>{{::tax.expenseFk}}</vn-td>
<vn-td>{{::tax.taxableBase | currency: 'EUR':2}}</vn-td>
<vn-td>{{::tax.taxTypeSage.vat}}</vn-td>
<vn-td>{{::tax.transactionTypeSage.transaction}}</vn-td>
<vn-td number shrink>{{::0.2 | percentage}}</vn-td>
<vn-td number shrink>{{::tax.foreignValue | currency: 'USD':2}}</vn-td>
</vn-tr>
</vn-tbody>
</vn-table>
</vn-one>
</vn-card>
<vn-supplier-descriptor-popover
vn-id="supplierDescriptor">