diff --git a/modules/invoiceIn/back/methods/invoice-in/summary.js b/modules/invoiceIn/back/methods/invoice-in/summary.js index 56a105f178..c4101e4dc0 100644 --- a/modules/invoiceIn/back/methods/invoice-in/summary.js +++ b/modules/invoiceIn/back/methods/invoice-in/summary.js @@ -33,6 +33,12 @@ module.exports = Self => { scope: { fields: ['id', 'name'] } + }, + { + relation: 'sageWithholding', + scope: { + fields: ['withholding'] + } } ] }; diff --git a/modules/invoiceIn/back/models/invoice-in.json b/modules/invoiceIn/back/models/invoice-in.json index aa57f0eb90..ad14fb511f 100644 --- a/modules/invoiceIn/back/models/invoice-in.json +++ b/modules/invoiceIn/back/models/invoice-in.json @@ -33,9 +33,6 @@ "isVatDeductible": { "type": "boolean" }, - "withholdingSageFk": { - "type": "number" - }, "booked": { "type": "date" }, @@ -58,6 +55,11 @@ "model": "InvoiceInDueDay", "foreignKey": "invoiceInFk" }, + "sageWithholding": { + "type": "belongsTo", + "model": "SageWithholding", + "foreignKey": "withholdingSageFk" + }, "company": { "type": "belongsTo", "model": "Company", diff --git a/modules/invoiceIn/front/basic-data/index.html b/modules/invoiceIn/front/basic-data/index.html index 22bd6658af..15052c5fe4 100644 --- a/modules/invoiceIn/front/basic-data/index.html +++ b/modules/invoiceIn/front/basic-data/index.html @@ -11,12 +11,15 @@ + ng-model="$ctrl.invoiceIn.issued" + vn-focus + rule> + ng-model="$ctrl.invoiceIn.operated" + rule> @@ -29,26 +32,30 @@ value-field="id" order="nickname" label="Supplier" - required="true"> + required="true" + rule> {{::id}} - {{::nickname}} + ng-model="$ctrl.invoiceIn.supplierRef" + rule> + ng-model="$ctrl.invoiceIn.bookEntried" + rule> + ng-model="$ctrl.invoiceIn.booked" + rule> @@ -58,14 +65,16 @@ ng-model="$ctrl.invoiceIn.currencyFk" url="Currencies" show-field="name" - value-field="id"> + value-field="id" + rule> + ng-model="$ctrl.invoiceIn.companyFk" + rule> diff --git a/modules/invoiceIn/front/locale/es.yml b/modules/invoiceIn/front/locale/es.yml index 02501b14a3..2d8dc02dae 100644 --- a/modules/invoiceIn/front/locale/es.yml +++ b/modules/invoiceIn/front/locale/es.yml @@ -1,2 +1,5 @@ InvoiceIn: Facturas recibidas -Search invoices in by reference: Buscar facturas recibidas por referencia \ No newline at end of file +Search invoices in by reference: Buscar facturas recibidas por referencia +Entries list: Listado de entradas +Invoice list: Listado de entradas +InvoiceIn deleted: Factura eliminada \ No newline at end of file diff --git a/modules/invoiceIn/front/summary/index.html b/modules/invoiceIn/front/summary/index.html index c097ec8cfd..360ef80147 100644 --- a/modules/invoiceIn/front/summary/index.html +++ b/modules/invoiceIn/front/summary/index.html @@ -32,7 +32,7 @@ - +