From 2ebd812a1fec7376299a1042018b9097f4ccdf8e Mon Sep 17 00:00:00 2001
From: carlosjr <carlosjr@verdnatura.es>
Date: Thu, 15 Apr 2021 11:54:40 +0200
Subject: [PATCH] updated model + translations

---
 .../back/methods/invoice-in/summary.js        |  6 +++++
 modules/invoiceIn/back/models/invoice-in.json |  8 +++---
 modules/invoiceIn/front/basic-data/index.html | 25 +++++++++++++------
 modules/invoiceIn/front/locale/es.yml         |  5 +++-
 modules/invoiceIn/front/summary/index.html    |  2 +-
 5 files changed, 33 insertions(+), 13 deletions(-)

diff --git a/modules/invoiceIn/back/methods/invoice-in/summary.js b/modules/invoiceIn/back/methods/invoice-in/summary.js
index 56a105f17..c4101e4dc 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 aa57f0eb9..ad14fb511 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 22bd6658a..15052c5fe 100644
--- a/modules/invoiceIn/front/basic-data/index.html
+++ b/modules/invoiceIn/front/basic-data/index.html
@@ -11,12 +11,15 @@
             <vn-date-picker
                 vn-one 
                 label="Expedition date" 
-                ng-model="$ctrl.invoiceIn.issued">
+                ng-model="$ctrl.invoiceIn.issued"
+                vn-focus
+                rule>
             </vn-date-picker>
             <vn-date-picker
                 vn-one 
                 label="Operation date"
-                ng-model="$ctrl.invoiceIn.operated">
+                ng-model="$ctrl.invoiceIn.operated"
+                rule>
             </vn-date-picker>
         </vn-horizontal>
         <vn-horizontal>
@@ -29,26 +32,30 @@
                 value-field="id"
                 order="nickname"
                 label="Supplier"
-                required="true">
+                required="true"
+                rule>
                 <tpl-item>
                     {{::id}} - {{::nickname}}
                 </tpl-item>
             </vn-autocomplete>
             <vn-textfield
                 label="Supplier ref"
-                ng-model="$ctrl.invoiceIn.supplierRef">
+                ng-model="$ctrl.invoiceIn.supplierRef"
+                rule>
             </vn-textfield>
         </vn-horizontal>
         <vn-horizontal>
             <vn-date-picker
                 vn-one 
                 label="Entry date" 
-                ng-model="$ctrl.invoiceIn.bookEntried">
+                ng-model="$ctrl.invoiceIn.bookEntried"
+                rule>
             </vn-date-picker>
             <vn-date-picker
                 vn-one 
                 label="Accounted date" 
-                ng-model="$ctrl.invoiceIn.booked">
+                ng-model="$ctrl.invoiceIn.booked"
+                rule>
             </vn-date-picker>
         </vn-horizontal>
         <vn-horizontal>
@@ -58,14 +65,16 @@
                 ng-model="$ctrl.invoiceIn.currencyFk"
                 url="Currencies"
                 show-field="name"
-                value-field="id">
+                value-field="id"
+                rule>
             </vn-autocomplete>
             <vn-autocomplete
                 url="Companies"
                 label="Company"
                 show-field="code"
                 value-field="id"
-                ng-model="$ctrl.invoiceIn.companyFk">
+                ng-model="$ctrl.invoiceIn.companyFk"
+                rule>
             </vn-autocomplete>
         </vn-horizontal>
     </vn-card>
diff --git a/modules/invoiceIn/front/locale/es.yml b/modules/invoiceIn/front/locale/es.yml
index 02501b14a..2d8dc02da 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 c097ec8cf..360ef8014 100644
--- a/modules/invoiceIn/front/summary/index.html
+++ b/modules/invoiceIn/front/summary/index.html
@@ -32,7 +32,7 @@
                     </vn-label-value>
                 </vn-one>
                 <vn-one>
-                    <vn-label-value label="Sage withholding" value="{{$ctrl.summary.withholdingSageFk}}">
+                    <vn-label-value label="Sage withholding" value="{{$ctrl.summary.sageWithholding.withholding}}">
                     </vn-label-value>
                     <vn-label-value label="Company" value="{{$ctrl.summary.company.code}}">
                     </vn-label-value>