diff --git a/loopback/locale/en.json b/loopback/locale/en.json
index d5e6c3526..8c9f4779f 100644
--- a/loopback/locale/en.json
+++ b/loopback/locale/en.json
@@ -25,5 +25,6 @@
"NO_AGENCY_AVAILABLE": "NO_AGENCY_AVAILABLE",
"Warehouse cannot be blank": "Warehouse cannot be blank",
"Agency cannot be blank": "Agency cannot be blank",
- "The IBAN does not have the correct format": "The IBAN does not have the correct format"
+ "The IBAN does not have the correct format": "The IBAN does not have the correct format",
+ "You can't make changes on the basic data of an confirmed order or with rows": "You can't make changes on the basic data of an confirmed order or with rows"
}
\ No newline at end of file
diff --git a/modules/client/back/models/receipt.json b/modules/client/back/models/receipt.json
index 1e99a3d0c..6ff863535 100644
--- a/modules/client/back/models/receipt.json
+++ b/modules/client/back/models/receipt.json
@@ -2,15 +2,15 @@
"name": "Receipt",
"base": "VnModel",
"options": {
- "mysql": {
- "table": "receipt"
- }
+ "mysql": {
+ "table": "receipt"
+ }
},
"properties": {
- "id": {
- "id": true,
- "type": "Number",
- "description": "Identifier"
+ "id": {
+ "id": true,
+ "type": "Number",
+ "description": "Identifier"
},
"amountPaid": {
"type": "Number"
@@ -48,11 +48,11 @@
"type": "belongsTo",
"model": "Bank",
"foreignKey": "bankFk"
- },
+ },
"invoice": {
"type": "belongsTo",
"model": "InvoiceOut",
"foreignKey": "invoiceFk"
- }
+ }
}
}
\ No newline at end of file
diff --git a/modules/client/front/risk/index/index.html b/modules/client/front/risk/index/index.html
index 9c87712f9..2801ae699 100644
--- a/modules/client/front/risk/index/index.html
+++ b/modules/client/front/risk/index/index.html
@@ -61,7 +61,9 @@
{{::risk.payed | dateTime:'dd/MM/yyyy'}}
{{::risk.created | dateTime:'dd/MM/yyyy HH:mm'}}
{{::risk.firstName}} {{::risk.name}}
- {{::risk.ref ? 'N/FRA ' + risk.ref : ''}}
+
+ BILL {{::risk.ref}}
+
{{::risk.bankFk}}
{{::risk.debit | currency:'€':2}}
{{::risk.credit | currency:'€':2}}
@@ -74,7 +76,7 @@
+ href="api/InvoiceOuts/{{::risk.id}}/download?access_token={{::$ctrl.accessToken}}">
diff --git a/modules/client/front/risk/index/locale/es.yml b/modules/client/front/risk/index/locale/es.yml
index 17672a8a9..fc9f1c931 100644
--- a/modules/client/front/risk/index/locale/es.yml
+++ b/modules/client/front/risk/index/locale/es.yml
@@ -7,4 +7,5 @@ New payment: Añadir pago
Havings: Haber
Balance: Balance
Total by company: Total por empresa
-Download PDF: Descargar PDF
\ No newline at end of file
+Download PDF: Descargar PDF
+BILL: N/FRA
\ No newline at end of file