diff --git a/back/process.yml b/back/process.yml
index 38d2b9eaf..a29323240 100644
--- a/back/process.yml
+++ b/back/process.yml
@@ -4,4 +4,4 @@ apps:
instances: 1
max_restarts: 3
restart_delay: 15000
- node_args: --tls-min-v1.0
+ node_args: --tls-min-v1.0 --openssl-legacy-provider
diff --git a/loopback/common/models/vn-model.js b/loopback/common/models/vn-model.js
index f92e1ea09..22b535f62 100644
--- a/loopback/common/models/vn-model.js
+++ b/loopback/common/models/vn-model.js
@@ -200,22 +200,20 @@ module.exports = function(Self) {
const connector = this.dataSource.connector;
let conn;
let res;
- const opts = Object.assign({}, options);
try {
if (userId) {
- conn = await new Promise((resolve, reject) => {
- connector.client.getConnection(function(err, conn) {
- if (err)
- reject(err);
- else
- resolve(conn);
+ if (!options.transaction) {
+ options = Object.assign({}, options);
+ conn = await new Promise((resolve, reject) => {
+ connector.client.getConnection(function(err, conn) {
+ if (err)
+ reject(err);
+ else
+ resolve(conn);
+ });
});
- });
-
- const opts = Object.assign({}, options);
- if (!opts.transaction) {
- opts.transaction = {
+ options.transaction = {
connection: conn,
connector
};
@@ -223,15 +221,14 @@ module.exports = function(Self) {
await connector.executeP(
'CALL account.myUser_loginWithName((SELECT name FROM account.user WHERE id = ?))',
- [userId], opts
+ [userId], options
);
}
- res = await connector.executeP(query, params, opts);
+ res = await connector.executeP(query, params, options);
- if (userId) {
- await connector.executeP('CALL account.myUser_logout()', null, opts);
- }
+ if (userId)
+ await connector.executeP('CALL account.myUser_logout()', null, options);
} finally {
if (conn) conn.release();
}
diff --git a/modules/monitor/front/index/tickets/index.html b/modules/monitor/front/index/tickets/index.html
index bdd4e76ff..94a950baf 100644
--- a/modules/monitor/front/index/tickets/index.html
+++ b/modules/monitor/front/index/tickets/index.html
@@ -50,13 +50,13 @@
Salesperson
|
-
+ |
Date
|
-
+ |
Theoretical
|
-
+ |
Practical
|
diff --git a/modules/order/back/methods/order/confirm.js b/modules/order/back/methods/order/confirm.js
index 5fdab29b3..1fcb3a760 100644
--- a/modules/order/back/methods/order/confirm.js
+++ b/modules/order/back/methods/order/confirm.js
@@ -21,7 +21,6 @@ module.exports = Self => {
Self.confirm = async(ctx, orderFk) => {
const userId = ctx.req.accessToken.userId;
-
const query = `CALL hedera.order_confirmWithUser(?, ?)`;
const response = await Self.rawSql(query, [orderFk, userId], {userId});
diff --git a/modules/supplier/back/locale/supplier-account/en.yml b/modules/supplier/back/locale/supplier-account/en.yml
index 2bce50cfa..43c4ba40d 100644
--- a/modules/supplier/back/locale/supplier-account/en.yml
+++ b/modules/supplier/back/locale/supplier-account/en.yml
@@ -5,3 +5,4 @@ columns:
beneficiary: beneficiary
supplierFk: supplier
bankEntityFk: bank entity
+ accountingFk: ledger account
diff --git a/modules/supplier/back/locale/supplier-account/es.yml b/modules/supplier/back/locale/supplier-account/es.yml
index 120293c8a..9db5708a3 100644
--- a/modules/supplier/back/locale/supplier-account/es.yml
+++ b/modules/supplier/back/locale/supplier-account/es.yml
@@ -5,3 +5,4 @@ columns:
beneficiary: beneficiario
supplierFk: proveedor
bankEntityFk: entidad bancaria
+ accountingFk: cuenta contable
diff --git a/modules/ticket/front/sale/index.html b/modules/ticket/front/sale/index.html
index f50ef10a5..be9e81964 100644
--- a/modules/ticket/front/sale/index.html
+++ b/modules/ticket/front/sale/index.html
@@ -69,7 +69,7 @@
Price
Disc
Amount
- Packaging
+ Packaging
@@ -202,7 +202,7 @@
- {{$ctrl.getSaleTotal(sale) | currency: 'EUR':2}}
+ {{sale.amount | currency: 'EUR':2}}
{{::sale.item.itemPackingTypeFk | dashIfEmpty}}
diff --git a/modules/ticket/front/sale/index.js b/modules/ticket/front/sale/index.js
index 88a59e605..b68db6dc0 100644
--- a/modules/ticket/front/sale/index.js
+++ b/modules/ticket/front/sale/index.js
@@ -34,6 +34,11 @@ class Controller extends Section {
}
get sales() {
+ if (this._sales) {
+ for (let sale of this._sales)
+ sale.amount = this.getSaleTotal(sale);
+ }
+
return this._sales;
}
@@ -49,6 +54,7 @@ class Controller extends Section {
return ticketState && ticketState.state.code;
}
+
getConfig() {
let filter = {
fields: ['daysForWarningClaim'],
diff --git a/modules/worker/back/methods/department/getLeaves.js b/modules/worker/back/methods/department/getLeaves.js
index 48fe78e08..b1ce2fbe8 100644
--- a/modules/worker/back/methods/department/getLeaves.js
+++ b/modules/worker/back/methods/department/getLeaves.js
@@ -1,5 +1,5 @@
module.exports = Self => {
- Self.remoteMethodCtx, ('getLeaves', {
+ Self.remoteMethodCtx('getLeaves', {
description: 'Returns the nodes for a department',
accepts: [{
arg: 'parentId',
diff --git a/print/templates/reports/invoice/invoice.html b/print/templates/reports/invoice/invoice.html
index 727621b2c..d74325dfd 100644
--- a/print/templates/reports/invoice/invoice.html
+++ b/print/templates/reports/invoice/invoice.html
@@ -242,7 +242,7 @@
-
+
@@ -267,9 +267,7 @@
v-bind:left-text="$t('invoiceRef', [invoice.ref])"
v-bind:center-text="client.socialName"
v-bind:recipient-id="client.id"
- v-bind="$props"
-
- >
+ v-bind="$props">
|