From ed6b2cf25b8bdffd3dca43d977050c53001a7b36 Mon Sep 17 00:00:00 2001 From: jgallego Date: Mon, 1 May 2023 14:57:50 +0200 Subject: [PATCH 01/33] refs #5615 --- e2e/paths/05-ticket/21_future.spec.js | 4 ++-- e2e/paths/05-ticket/22_advance.spec.js | 4 ++-- loopback/locale/en.json | 4 +++- .../ticket/back/methods/ticket/componentUpdate.js | 1 + modules/ticket/back/methods/ticket/new.js | 2 +- .../ticket/back/methods/ticket/priceDifference.js | 1 + modules/zone/back/methods/agency/getShipped.js | 12 ++++++++---- .../back/methods/agency/specs/getShipped.spec.js | 14 ++++++++------ 8 files changed, 26 insertions(+), 16 deletions(-) diff --git a/e2e/paths/05-ticket/21_future.spec.js b/e2e/paths/05-ticket/21_future.spec.js index 626056958..3c52048c7 100644 --- a/e2e/paths/05-ticket/21_future.spec.js +++ b/e2e/paths/05-ticket/21_future.spec.js @@ -1,7 +1,7 @@ import selectors from '../../helpers/selectors.js'; import getBrowser from '../../helpers/puppeteer'; - -describe('Ticket Future path', () => { +// https://redmine.verdnatura.es/issues/5616 +xdescribe('Ticket Future path', () => { let browser; let page; let httpRequest; diff --git a/e2e/paths/05-ticket/22_advance.spec.js b/e2e/paths/05-ticket/22_advance.spec.js index 15f9dd5bb..f8626d56d 100644 --- a/e2e/paths/05-ticket/22_advance.spec.js +++ b/e2e/paths/05-ticket/22_advance.spec.js @@ -1,7 +1,7 @@ import selectors from '../../helpers/selectors.js'; import getBrowser from '../../helpers/puppeteer'; - -describe('Ticket Advance path', () => { +// https://redmine.verdnatura.es/issues/5616 +xdescribe('Ticket Advance path', () => { let browser; let page; let httpRequest; diff --git a/loopback/locale/en.json b/loopback/locale/en.json index 8bf536cd4..5767632ee 100644 --- a/loopback/locale/en.json +++ b/loopback/locale/en.json @@ -167,5 +167,7 @@ "hasToInvoice": "Invoice", "isTaxDataChecked": "Data checked", "comercialId": "Id Comercial", - "comercialName": "Comercial" + "comercialName": "Comercial", + "Added observation": "Added observation", + "Comment added to client": "Comment added to client" } diff --git a/modules/ticket/back/methods/ticket/componentUpdate.js b/modules/ticket/back/methods/ticket/componentUpdate.js index c23d1669e..bd01592fa 100644 --- a/modules/ticket/back/methods/ticket/componentUpdate.js +++ b/modules/ticket/back/methods/ticket/componentUpdate.js @@ -124,6 +124,7 @@ module.exports = Self => { const isDeliveryBoss = await models.Account.hasRole(userId, 'deliveryBoss', myOptions); if (!isDeliveryBoss) { const zoneShipped = await models.Agency.getShipped( + ctx, args.landed, args.addressFk, args.agencyModeFk, diff --git a/modules/ticket/back/methods/ticket/new.js b/modules/ticket/back/methods/ticket/new.js index a5d04bc4c..5f7cf3cb6 100644 --- a/modules/ticket/back/methods/ticket/new.js +++ b/modules/ticket/back/methods/ticket/new.js @@ -100,7 +100,7 @@ module.exports = Self => { } if (!args.shipped && args.landed) { - const shippedResult = await models.Agency.getShipped(args.landed, + const shippedResult = await models.Agency.getShipped(ctx, args.landed, address.id, args.agencyModeId, args.warehouseId, myOptions); args.shipped = (shippedResult && shippedResult.shipped) || args.landed; } diff --git a/modules/ticket/back/methods/ticket/priceDifference.js b/modules/ticket/back/methods/ticket/priceDifference.js index 989e0e5ce..76a71a54b 100644 --- a/modules/ticket/back/methods/ticket/priceDifference.js +++ b/modules/ticket/back/methods/ticket/priceDifference.js @@ -81,6 +81,7 @@ module.exports = Self => { const isDeliveryBoss = await models.Account.hasRole(userId, 'deliveryBoss', myOptions); if (!isDeliveryBoss) { const zoneShipped = await models.Agency.getShipped( + ctx, args.landed, args.addressId, args.agencyModeId, diff --git a/modules/zone/back/methods/agency/getShipped.js b/modules/zone/back/methods/agency/getShipped.js index 165dd6731..dd25493d6 100644 --- a/modules/zone/back/methods/agency/getShipped.js +++ b/modules/zone/back/methods/agency/getShipped.js @@ -1,7 +1,7 @@ const ParameterizedSQL = require('loopback-connector').ParameterizedSQL; module.exports = Self => { - Self.remoteMethod('getShipped', { + Self.remoteMethodCtx('getShipped', { description: 'Returns the first shipped possible for params', accessType: 'READ', accepts: [{ @@ -34,18 +34,22 @@ module.exports = Self => { } }); - Self.getShipped = async(landed, addressFk, agencyModeFk, warehouseFk, options) => { + Self.getShipped = async(ctx, landed, addressFk, agencyModeFk, warehouseFk, options) => { const myOptions = {}; if (typeof options == 'object') Object.assign(myOptions, options); const stmts = []; + const userId = ctx.req.accessToken.userId; + const models = Self.app.models; + const isProductionAssistant = await models.Account.hasRole(userId, 'productionAssi', myOptions); stmts.push(new ParameterizedSQL( - `CALL vn.zone_getShipped(?, ?, ?, TRUE)`, [ + `CALL vn.zone_getShipped(?, ?, ?, ?)`, [ landed, addressFk, - agencyModeFk + agencyModeFk, + isProductionAssistant ] )); diff --git a/modules/zone/back/methods/agency/specs/getShipped.spec.js b/modules/zone/back/methods/agency/specs/getShipped.spec.js index 43e2c1208..b226557fb 100644 --- a/modules/zone/back/methods/agency/specs/getShipped.spec.js +++ b/modules/zone/back/methods/agency/specs/getShipped.spec.js @@ -1,6 +1,9 @@ -const app = require('vn-loopback/server/server'); +const models = require('vn-loopback/server/server').models; describe('agency getShipped()', () => { + const employeeId = 1; + const ctx = {req: {accessToken: {userId: employeeId}}}; + it('should return a shipment date', async() => { const landed = Date.vnNew(); landed.setDate(landed.getDate() + 1); @@ -8,12 +11,11 @@ describe('agency getShipped()', () => { const agencyModeFk = 7; const warehouseFk = 1; - const tx = await app.models.Agency.beginTransaction({}); + const tx = await models.Agency.beginTransaction({}); try { const options = {transaction: tx}; - - const result = await app.models.Agency.getShipped(landed, addressFk, agencyModeFk, warehouseFk, options); + const result = await models.Agency.getShipped(ctx, landed, addressFk, agencyModeFk, warehouseFk, options); expect(result).toBeDefined(); @@ -32,12 +34,12 @@ describe('agency getShipped()', () => { const agencyModeFk = 7; const warehouseFk = 1; - const tx = await app.models.Agency.beginTransaction({}); + const tx = await models.Agency.beginTransaction({}); try { const options = {transaction: tx}; - const result = await app.models.Agency.getShipped(landed, addressFk, agencyModeFk, warehouseFk, options); + const result = await models.Agency.getShipped(ctx, landed, addressFk, agencyModeFk, warehouseFk, options); expect(result).toBeUndefined(); From 1d6a541b02c720a381100f7674e20f1a0d7fad5c Mon Sep 17 00:00:00 2001 From: alexm Date: Thu, 11 May 2023 15:07:02 +0200 Subject: [PATCH 02/33] test into master --- db/changes/{230601 => 231801}/00-acl_receiptEmail.sql | 0 db/changes/{231401 => 231801}/00-deviceProduction.sql | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename db/changes/{230601 => 231801}/00-acl_receiptEmail.sql (100%) rename db/changes/{231401 => 231801}/00-deviceProduction.sql (100%) diff --git a/db/changes/230601/00-acl_receiptEmail.sql b/db/changes/231801/00-acl_receiptEmail.sql similarity index 100% rename from db/changes/230601/00-acl_receiptEmail.sql rename to db/changes/231801/00-acl_receiptEmail.sql diff --git a/db/changes/231401/00-deviceProduction.sql b/db/changes/231801/00-deviceProduction.sql similarity index 100% rename from db/changes/231401/00-deviceProduction.sql rename to db/changes/231801/00-deviceProduction.sql From f6e1ffa849af706a934d6df5ebb51ca3a94b97fe Mon Sep 17 00:00:00 2001 From: Juan Ferrer Toribio Date: Fri, 12 May 2023 09:48:22 +0200 Subject: [PATCH 03/33] refs #5517 Log loader fix --- front/salix/components/log/index.html | 1 - 1 file changed, 1 deletion(-) diff --git a/front/salix/components/log/index.html b/front/salix/components/log/index.html index c6b1ade2a..38c5035dc 100644 --- a/front/salix/components/log/index.html +++ b/front/salix/components/log/index.html @@ -16,7 +16,6 @@
From 4abc8521d366455d3b8abf37e251520729826cf2 Mon Sep 17 00:00:00 2001 From: Juan Ferrer Toribio Date: Fri, 12 May 2023 11:25:16 +0200 Subject: [PATCH 04/33] refs #5517 Style fixes --- front/core/components/json-value/index.js | 2 +- front/salix/components/log/index.html | 9 +++------ front/salix/components/log/style.scss | 3 --- 3 files changed, 4 insertions(+), 10 deletions(-) diff --git a/front/core/components/json-value/index.js b/front/core/components/json-value/index.js index 6bf0ae4aa..226bf8477 100644 --- a/front/core/components/json-value/index.js +++ b/front/core/components/json-value/index.js @@ -2,7 +2,7 @@ import ngModule from '../../module'; import Component from 'core/lib/component'; import './style.scss'; -const maxStrLen = 50; +const maxStrLen = 512; /** * Displays pretty JSON value. diff --git a/front/salix/components/log/index.html b/front/salix/components/log/index.html index 38c5035dc..550e37970 100644 --- a/front/salix/components/log/index.html +++ b/front/salix/components/log/index.html @@ -75,17 +75,14 @@ class="attributes"> - + {{::prop.nameI18n}}: , -
+
- + {{::prop.nameI18n}}: diff --git a/front/salix/components/log/style.scss b/front/salix/components/log/style.scss index 381b99039..a1f11ee2a 100644 --- a/front/salix/components/log/style.scss +++ b/front/salix/components/log/style.scss @@ -144,9 +144,6 @@ vn-log { & > .no-changes { font-style: italic; } - .json-field { - text-transform: capitalize; - } } } } From 0aa12a5efbf45fd7f6a0ca3a69013e6a9f9e4484 Mon Sep 17 00:00:00 2001 From: alexm Date: Mon, 15 May 2023 09:54:40 +0200 Subject: [PATCH 05/33] hotFix(worker_new): use postcode not postalCode --- modules/worker/back/methods/worker/new.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/worker/back/methods/worker/new.js b/modules/worker/back/methods/worker/new.js index 5ff7135a7..0bc7293a1 100644 --- a/modules/worker/back/methods/worker/new.js +++ b/modules/worker/back/methods/worker/new.js @@ -169,7 +169,7 @@ module.exports = Self => { args.lastNames, args.fi, args.street, - args.postalCode, + args.postcode, args.city, args.provinceFk, args.companyFk, @@ -186,7 +186,7 @@ module.exports = Self => { street: args.street, city: args.city, provinceFk: args.provinceFk, - postalCode: args.postalCode, + postalCode: args.postcode, mobile: args.phone, nickname: nickname, isDefaultAddress: true, From a1a3f910d39411679c87749130edf1b307a84aea Mon Sep 17 00:00:00 2001 From: alexm Date: Tue, 16 May 2023 08:46:16 +0200 Subject: [PATCH 06/33] hotFix(reset-passowrd): use model vnUser --- front/salix/components/reset-password/index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/front/salix/components/reset-password/index.js b/front/salix/components/reset-password/index.js index 20c6c34fe..ac5331f7d 100644 --- a/front/salix/components/reset-password/index.js +++ b/front/salix/components/reset-password/index.js @@ -33,7 +33,7 @@ export default class Controller { const newPassword = this.newPassword; - this.$http.post('users/reset-password', {newPassword}, {headers}) + this.$http.post('vnUsers/reset-password', {newPassword}, {headers}) .then(() => { this.vnApp.showSuccess(this.$translate.instant('Password changed!')); this.$state.go('login'); From 504791fd6d9450b884523ab3651b01b84e5766d2 Mon Sep 17 00:00:00 2001 From: alexm Date: Tue, 16 May 2023 08:48:25 +0200 Subject: [PATCH 07/33] typo --- front/salix/components/reset-password/index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/front/salix/components/reset-password/index.js b/front/salix/components/reset-password/index.js index ac5331f7d..a3ca03237 100644 --- a/front/salix/components/reset-password/index.js +++ b/front/salix/components/reset-password/index.js @@ -33,7 +33,7 @@ export default class Controller { const newPassword = this.newPassword; - this.$http.post('vnUsers/reset-password', {newPassword}, {headers}) + this.$http.post('VnUsers/reset-password', {newPassword}, {headers}) .then(() => { this.vnApp.showSuccess(this.$translate.instant('Password changed!')); this.$state.go('login'); From 30d6f56c39d36af471fc74928102906bc52bcfa7 Mon Sep 17 00:00:00 2001 From: Juan Ferrer Toribio Date: Tue, 16 May 2023 20:06:14 +0200 Subject: [PATCH 08/33] refs #5667 Style fixes, model translations --- .../core/components/multi-check/locale/es.yml | 4 +- front/core/styles/text.scss | 143 +++++++++--------- front/salix/components/log/index.html | 119 ++++++++------- front/salix/components/log/index.js | 35 ++++- front/salix/components/log/style.scss | 68 ++++----- .../account/back/locale/mail-forward/en.yml | 4 + .../account/back/locale/mail-forward/es.yml | 4 + modules/account/back/locale/mail/es.yml | 2 +- .../account/back/locale/role-inherit/en.yml | 4 + .../account/back/locale/role-inherit/es.yml | 4 + modules/account/back/locale/role/en.yml | 5 + modules/account/back/locale/role/es.yml | 5 + .../account/back/locale/vn-user}/en.yml | 4 +- .../account/back/locale/vn-user}/es.yml | 10 +- modules/client/back/locale/address/en.yml | 1 + modules/client/back/locale/address/es.yml | 1 + modules/client/back/locale/client/en.yml | 16 +- modules/client/back/locale/client/es.yml | 16 +- modules/ticket/back/locale/sale/en.yml | 4 + modules/ticket/back/locale/sale/es.yml | 4 + .../ticket/back/locale/ticket-tracking/en.yml | 1 + .../ticket/back/locale/ticket-tracking/es.yml | 1 + modules/ticket/back/locale/ticket/en.yml | 8 + modules/ticket/back/locale/ticket/es.yml | 8 + .../worker/back/locale/worker-labour/en.yml | 12 ++ .../worker/back/locale/worker-labour/es.yml | 12 ++ 26 files changed, 299 insertions(+), 196 deletions(-) create mode 100644 modules/account/back/locale/mail-forward/en.yml create mode 100644 modules/account/back/locale/mail-forward/es.yml create mode 100644 modules/account/back/locale/role-inherit/en.yml create mode 100644 modules/account/back/locale/role-inherit/es.yml create mode 100644 modules/account/back/locale/role/en.yml create mode 100644 modules/account/back/locale/role/es.yml rename {back/locale/account => modules/account/back/locale/vn-user}/en.yml (84%) rename {back/locale/account => modules/account/back/locale/vn-user}/es.yml (59%) create mode 100644 modules/worker/back/locale/worker-labour/en.yml create mode 100644 modules/worker/back/locale/worker-labour/es.yml diff --git a/front/core/components/multi-check/locale/es.yml b/front/core/components/multi-check/locale/es.yml index 5365c3392..25cde3df0 100644 --- a/front/core/components/multi-check/locale/es.yml +++ b/front/core/components/multi-check/locale/es.yml @@ -1,3 +1,3 @@ SelectAllRows: Seleccionar las {{rows}} fila(s) -All: Se han seleccionado -row(s) have been selected.: fila(s). \ No newline at end of file +Have been selected: Se han seleccionado +row(s) have been selected.: fila(s). diff --git a/front/core/styles/text.scss b/front/core/styles/text.scss index 701a84d05..190eff55d 100644 --- a/front/core/styles/text.scss +++ b/front/core/styles/text.scss @@ -1,70 +1,73 @@ -@import "./variables"; - -/* Headings */ - -.text-h1, h1 { - font-size: 2.3rem; -} -.text-h2, h2 { - font-size: 2.25rem; -} -.text-h3, h3 { - font-size: 2rem; -} -.text-h4, h4 { - font-size: 1.6rem; -} -.text-h5, h5 { - font-size: 1.3rem; -} -.text-h6, h6 { - font-size: 1.125rem; -} -.text-subtitle1 { - font-size: 1.06rem; -} -.text-subtitle2 { - font-size: 1rem; -} -.text-body1 { - font-size: .875rem; -} -.text-body2 { - font-size: .875rem; -} -.text-caption { - font-size: .875rem; -} -.text-overline { - font-size: .8rem; -} - -h1, h2, h3, h4, h5, h6 { - padding: 0; - margin-top: 0; - margin-bottom: 4px; -} - -/* Colors */ - -.text-primary { - color: $color-main; -} -.text-secondary { - color: $color-font-light; -} - -/* Helpers */ - -.text-uppercase { - text-transform: uppercase; -} -.text-center { - text-align: center; -} -.text-right { - text-align: right; -} -.text-left { - text-align: left; -} +@import "./variables"; + +/* Headings */ + +.text-h1, h1 { + font-size: 2.3rem; +} +.text-h2, h2 { + font-size: 2.25rem; +} +.text-h3, h3 { + font-size: 2rem; +} +.text-h4, h4 { + font-size: 1.6rem; +} +.text-h5, h5 { + font-size: 1.3rem; +} +.text-h6, h6 { + font-size: 1.125rem; +} +.text-subtitle1 { + font-size: 1.06rem; +} +.text-subtitle2 { + font-size: 1rem; +} +.text-body1 { + font-size: .875rem; +} +.text-body2 { + font-size: .875rem; +} +.text-caption { + font-size: .875rem; +} +.text-overline { + font-size: .8rem; +} +.text-capitalize { + text-transform: capitalize; +} + +h1, h2, h3, h4, h5, h6 { + padding: 0; + margin-top: 0; + margin-bottom: 4px; +} + +/* Colors */ + +.text-primary { + color: $color-main; +} +.text-secondary { + color: $color-font-light; +} + +/* Helpers */ + +.text-uppercase { + text-transform: uppercase; +} +.text-center { + text-align: center; +} +.text-right { + text-align: right; +} +.text-left { + text-align: left; +} diff --git a/front/salix/components/log/index.html b/front/salix/components/log/index.html index 550e37970..e04dc5525 100644 --- a/front/salix/components/log/index.html +++ b/front/salix/components/log/index.html @@ -10,7 +10,7 @@ @@ -21,7 +21,7 @@
- -
+ +
@@ -43,7 +43,7 @@
-
- - - - -
- - +
+
+ + + + +
+ + + + {{::prop.nameI18n}}: + + , + +
+
{{::prop.nameI18n}}: - , - -
-
- - {{::prop.nameI18n}}: - - - - ← - -
+ + + ← +
- - - {{::log.description}} - - - No changes - -
+
+ + + {{::log.description}} + + + No changes +
@@ -110,10 +108,6 @@
- - -
+ - - + + + + + -
+ diff --git a/front/salix/components/log/index.js b/front/salix/components/log/index.js index 803eea45e..7a126c53e 100644 --- a/front/salix/components/log/index.js +++ b/front/salix/components/log/index.js @@ -55,14 +55,14 @@ export default class Controller extends Section { set logs(value) { this._logs = value; - if (!this.logs) return; + if (!value) return; const empty = {}; const validations = window.validations; for (const log of value) { const oldValues = log.oldInstance || empty; const newValues = log.newInstance || empty; const locale = validations[log.changedModel]?.locale || empty; - log.changedModelI18n = locale.name || log.changedModel; + log.changedModelI18n = firstUpper(locale.name) || log.changedModel; let props = Object.keys(oldValues).concat(Object.keys(newValues)); props = [...new Set(props)]; @@ -71,7 +71,7 @@ export default class Controller extends Section { for (const prop of props) { log.props.push({ name: prop, - nameI18n: locale.columns?.[prop] || prop, + nameI18n: firstUpper(locale.columns?.[prop]) || prop, old: this.castJsonValue(oldValues[prop]), new: this.castJsonValue(newValues[prop]) }); @@ -79,6 +79,20 @@ export default class Controller extends Section { } } + get models() { + return this._models; + } + + set models(value) { + this._models = value; + if (!value) return; + for (const model of value) { + const name = model.changedModel; + model.changedModelI18n = + firstUpper(window.validations[name]?.locale?.name) || name; + } + } + get showModelName() { return !(this.changedModel && this.changedModelId); } @@ -93,11 +107,6 @@ export default class Controller extends Section { return action == 'delete' ? prop.old : prop.new; } - toggleAttributes(log, changesEl, force) { - log.expand = force; - changesEl.classList.toggle('expanded', force); - } - relativeDate(dateVal) { if (dateVal == null) return ''; const date = new Date(dateVal); @@ -132,6 +141,12 @@ export default class Controller extends Section { switch (prop) { case 'changedModelValue': return {[prop]: {like: `%${value}%`}}; + case 'changes': + return {or: [ + {oldInstance: {like: `%${value}%`}}, + {newInstance: {like: `%${value}%`}}, + {description: {like: `%${value}%`}} + ]}; case 'who': switch (value) { case 'all': @@ -195,6 +210,10 @@ export default class Controller extends Section { } } +function firstUpper(str) { + return str && str.charAt(0).toUpperCase() + str.substr(1); +} + ngModule.vnComponent('vnLog', { controller: Controller, template: require('./index.html'), diff --git a/front/salix/components/log/style.scss b/front/salix/components/log/style.scss index a1f11ee2a..52005366a 100644 --- a/front/salix/components/log/style.scss +++ b/front/salix/components/log/style.scss @@ -50,9 +50,9 @@ vn-log { white-space: nowrap; & > .chip { - padding: 2px 4px; - border-radius: 4px; display: inline-block; + padding: 1px 5px; + border-radius: 8px; color: $color-font-bg; &.notice { @@ -76,17 +76,17 @@ vn-log { overflow: hidden; text-overflow: ellipsis; white-space: nowrap; + color: lighten($color-primary, 10%); & > .model-name { - text-transform: capitalize; + color: $color-font; } & > .model-value { font-style: italic; - color: #c7bd2b; } & > .model-id { color: $color-font-secondary; - font-size: .9em; + font-size: .9rem; } } } @@ -94,56 +94,46 @@ vn-log { .changes { overflow: hidden; background-color: rgba(255, 255, 255, .05); - border-radius: 4px; color: $color-font-secondary; transition: max-height 150ms ease-in-out; - max-height: 28px; position: relative; + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; + max-height: 34px; - & > .expand-button, - & > .shrink-button { - display: none; - } - &.props { - padding-right: 24px; + & > .icon { + float: right; + position: relative; + cursor: pointer; - & > .expand-button, - & > .shrink-button { - position: absolute; - top: 6px; - right: 8px; - font-size: inherit; - float: right; - cursor: pointer; + & > vn-icon { + font-size: 1.2em; } & > .expand-button { display: block; } - &.expanded { - max-height: 500px; - padding-right: 0; + & > .shrink-button { + display: none; + } + } + &.expanded { + text-overflow: initial; + white-space: initial; + overflow: auto; + max-height: 600px; - & > .changes-wrapper { - text-overflow: initial; - white-space: initial; + & > .icon { + & > .expand-button { + display: none; } & > .shrink-button { display: block; } - & > .expand-button { - display: none; - } } } - & > .changes-wrapper { - padding: 4px 6px; - overflow: hidden; - text-overflow: ellipsis; - white-space: nowrap; - - & > .no-changes { - font-style: italic; - } + & > .no-changes { + font-style: italic; } } } diff --git a/modules/account/back/locale/mail-forward/en.yml b/modules/account/back/locale/mail-forward/en.yml new file mode 100644 index 000000000..2e136e664 --- /dev/null +++ b/modules/account/back/locale/mail-forward/en.yml @@ -0,0 +1,4 @@ +name: mail forward +columns: + account: account + forwardTo: forward to diff --git a/modules/account/back/locale/mail-forward/es.yml b/modules/account/back/locale/mail-forward/es.yml new file mode 100644 index 000000000..3e81f833e --- /dev/null +++ b/modules/account/back/locale/mail-forward/es.yml @@ -0,0 +1,4 @@ +name: reenvio de correo +columns: + account: cuenta + forwardTo: reenviar a diff --git a/modules/account/back/locale/mail/es.yml b/modules/account/back/locale/mail/es.yml index a0b02b45f..340f7ec50 100644 --- a/modules/account/back/locale/mail/es.yml +++ b/modules/account/back/locale/mail/es.yml @@ -1,4 +1,4 @@ -name: mail +name: correo electrónico columns: id: id receiver: receptor diff --git a/modules/account/back/locale/role-inherit/en.yml b/modules/account/back/locale/role-inherit/en.yml new file mode 100644 index 000000000..760881325 --- /dev/null +++ b/modules/account/back/locale/role-inherit/en.yml @@ -0,0 +1,4 @@ +name: subrole +columns: + role: rol + inheritsFrom: inherits diff --git a/modules/account/back/locale/role-inherit/es.yml b/modules/account/back/locale/role-inherit/es.yml new file mode 100644 index 000000000..c352c6ff2 --- /dev/null +++ b/modules/account/back/locale/role-inherit/es.yml @@ -0,0 +1,4 @@ +name: subrol +columns: + role: rol + inheritsFrom: hereda diff --git a/modules/account/back/locale/role/en.yml b/modules/account/back/locale/role/en.yml new file mode 100644 index 000000000..69199dfce --- /dev/null +++ b/modules/account/back/locale/role/en.yml @@ -0,0 +1,5 @@ +name: role +columns: + id: id + name: name + description: description diff --git a/modules/account/back/locale/role/es.yml b/modules/account/back/locale/role/es.yml new file mode 100644 index 000000000..ee025be0f --- /dev/null +++ b/modules/account/back/locale/role/es.yml @@ -0,0 +1,5 @@ +name: rol +columns: + id: id + name: nombre + description: descripción diff --git a/back/locale/account/en.yml b/modules/account/back/locale/vn-user/en.yml similarity index 84% rename from back/locale/account/en.yml rename to modules/account/back/locale/vn-user/en.yml index 0d6c5db80..135cf75b4 100644 --- a/back/locale/account/en.yml +++ b/modules/account/back/locale/vn-user/en.yml @@ -1,4 +1,4 @@ -name: account +name: user columns: id: id name: name @@ -6,7 +6,7 @@ columns: nickname: nickname lang: lang password: password - bcryptPassword: bcrypt password + bcryptPassword: BCRYPT password active: active email: email emailVerified: email verified diff --git a/back/locale/account/es.yml b/modules/account/back/locale/vn-user/es.yml similarity index 59% rename from back/locale/account/es.yml rename to modules/account/back/locale/vn-user/es.yml index 79e8a8cc6..53086ae2d 100644 --- a/back/locale/account/es.yml +++ b/modules/account/back/locale/vn-user/es.yml @@ -1,4 +1,4 @@ -name: cuenta +name: usuario columns: id: id name: nombre @@ -6,12 +6,12 @@ columns: nickname: apodo lang: idioma password: contraseña - bcryptPassword: contraseña bcrypt + bcryptPassword: contraseña BCRYPT active: activo - email: email - emailVerified: email verificado + email: correo electrónico + emailVerified: correo verificado created: creado updated: actualizado image: imagen - hasGrant: tiene permiso + hasGrant: puede delegar userFk: usuario diff --git a/modules/client/back/locale/address/en.yml b/modules/client/back/locale/address/en.yml index 3d090ba89..00f3b15f5 100644 --- a/modules/client/back/locale/address/en.yml +++ b/modules/client/back/locale/address/en.yml @@ -18,3 +18,4 @@ columns: addressFk: address incotermsFk: incoterms customsAgentFk: customs agent + isDefaultAddress: default diff --git a/modules/client/back/locale/address/es.yml b/modules/client/back/locale/address/es.yml index 1379f75a4..f2b954124 100644 --- a/modules/client/back/locale/address/es.yml +++ b/modules/client/back/locale/address/es.yml @@ -18,3 +18,4 @@ columns: addressFk: dirección incotermsFk: incoterms customsAgentFk: agente adunanas + isDefaultAddress: predeterminada diff --git a/modules/client/back/locale/client/en.yml b/modules/client/back/locale/client/en.yml index 71048f657..9d36c5977 100644 --- a/modules/client/back/locale/client/en.yml +++ b/modules/client/back/locale/client/en.yml @@ -2,7 +2,7 @@ name: client columns: id: id name: name - fi: fi + fi: tax identifier socialName: socialName contact: contact street: street @@ -14,17 +14,17 @@ columns: isActive: active credit: credit creditInsurance: credit insurance - iban: iban + iban: IBAN dueDay: due day isEqualizated: equalizated isFreezed: freezed hasToInvoiceByAddress: invoice by address hasToInvoice: has to invoice - isToBeMailed: be mailed - hasSepaVnl: sepa nnl + isToBeMailed: mailed + hasSepaVnl: sepa VNL hasLcr: lcr - hasCoreVnl: core vnl - hasCoreVnh: core vnh + hasCoreVnl: core VNL + hasCoreVnh: core VNH hasIncoterms: incoterms isTaxDataChecked: tax data checked eypbc: eypbc @@ -47,4 +47,8 @@ columns: defaultAddressFk: default address bankEntityFk: bank entity transferorFk: transferor + riskCalculated: risk calculated + isCreatedAsServed: created as served + hasInvoiceSimplified: simplified invoice + typeFk: type diff --git a/modules/client/back/locale/client/es.yml b/modules/client/back/locale/client/es.yml index 04e391af0..930b2be6f 100644 --- a/modules/client/back/locale/client/es.yml +++ b/modules/client/back/locale/client/es.yml @@ -2,7 +2,7 @@ name: cliente columns: id: id name: nombre - fi: fi + fi: identificador fiscal socialName: nombre social contact: contacto street: calle @@ -14,17 +14,17 @@ columns: isActive: activo credit: crédito creditInsurance: seguro crédito - iban: iban + iban: IBAN dueDay: día vencimiento isEqualizated: igualado isFreezed: congelado hasToInvoiceByAddress: factura por dirección hasToInvoice: tiene que facturar isToBeMailed: envío por email - hasSepaVnl: sepa nnl + hasSepaVnl: sepa VNL hasLcr: lcr - hasCoreVnl: centro vnl - hasCoreVnh: cenrto vnh + hasCoreVnl: centro VNL + hasCoreVnh: centro VNH hasIncoterms: incoterms isTaxDataChecked: datos fiscales comprobados eypbc: eypbc @@ -34,7 +34,7 @@ columns: accountingAccount: cuenta contable created: creado sageTaxTypeFk: tipo impuesto sage - sageTransactionTypeFk: tipo transacción sage + sageTransactionTypeFk: tipo transacción Sage businessTypeFk: tipo negocio salesPersonFk: comercial hasElectronicInvoice: factura electrónica @@ -47,4 +47,8 @@ columns: defaultAddressFk: dirección predeterminada bankEntityFk: entidad bancaria transferorFk: cedente + riskCalculated: riesgo calculado + isCreatedAsServed: creado como servido + hasInvoiceSimplified: factura simple + typeFk: tipo diff --git a/modules/ticket/back/locale/sale/en.yml b/modules/ticket/back/locale/sale/en.yml index f844bf0c5..c9d8f05b2 100644 --- a/modules/ticket/back/locale/sale/en.yml +++ b/modules/ticket/back/locale/sale/en.yml @@ -11,3 +11,7 @@ columns: itemFk: item ticketFk: ticket saleFk: sale + priceFixed: price fixed + isPriceFixed: has fixed price + isAdded: added + total: total diff --git a/modules/ticket/back/locale/sale/es.yml b/modules/ticket/back/locale/sale/es.yml index 8196a089c..1d61ffcd0 100644 --- a/modules/ticket/back/locale/sale/es.yml +++ b/modules/ticket/back/locale/sale/es.yml @@ -11,3 +11,7 @@ columns: itemFk: artículo ticketFk: ticket saleFk: línea + priceFixed: precio fijado + isPriceFixed: tiene precio fijado + isAdded: añadida + total: total diff --git a/modules/ticket/back/locale/ticket-tracking/en.yml b/modules/ticket/back/locale/ticket-tracking/en.yml index 15505a763..721fc7c2d 100644 --- a/modules/ticket/back/locale/ticket-tracking/en.yml +++ b/modules/ticket/back/locale/ticket-tracking/en.yml @@ -5,3 +5,4 @@ columns: ticketFk: ticket stateFk: state workerFk: worker + failFk: fail diff --git a/modules/ticket/back/locale/ticket-tracking/es.yml b/modules/ticket/back/locale/ticket-tracking/es.yml index 3459ab367..3d09fde63 100644 --- a/modules/ticket/back/locale/ticket-tracking/es.yml +++ b/modules/ticket/back/locale/ticket-tracking/es.yml @@ -5,3 +5,4 @@ columns: ticketFk: ticket stateFk: estado workerFk: trabajador + failFk: fallo diff --git a/modules/ticket/back/locale/ticket/en.yml b/modules/ticket/back/locale/ticket/en.yml index 2481c42f8..ebfe538e1 100644 --- a/modules/ticket/back/locale/ticket/en.yml +++ b/modules/ticket/back/locale/ticket/en.yml @@ -23,3 +23,11 @@ columns: agencyModeFk: agency ticketFk: ticket mergedTicket: merged ticket + isSigned: signed + isLabeled: labeled + isPrinted: printed + hour: hour + created: created + isBlocked: bloqued + hasPriority: priority + isBoxed: boxed diff --git a/modules/ticket/back/locale/ticket/es.yml b/modules/ticket/back/locale/ticket/es.yml index 558378612..111c2c33b 100644 --- a/modules/ticket/back/locale/ticket/es.yml +++ b/modules/ticket/back/locale/ticket/es.yml @@ -25,3 +25,11 @@ columns: mergedTicket: ticket fusionado withWarningAccept: aviso negativos isWithoutNegatives: sin negativos + isSigned: firmado + isLabeled: etiquetado + isPrinted: impreso + hour: hora + created: creado + isBlocked: bloqueado + hasPriority: prioritario + isBoxed: encajado diff --git a/modules/worker/back/locale/worker-labour/en.yml b/modules/worker/back/locale/worker-labour/en.yml new file mode 100644 index 000000000..f0642fbe4 --- /dev/null +++ b/modules/worker/back/locale/worker-labour/en.yml @@ -0,0 +1,12 @@ +name: contrato +columns: + id: id + companyCodeFk: company + started: started + ended: ended + payedHolidays: payed holidays + workerFk: worker + calendarTypeFk: calendar type + isHourlyLabor: hourly labor + workcenterFk: workcenter + amount: amount diff --git a/modules/worker/back/locale/worker-labour/es.yml b/modules/worker/back/locale/worker-labour/es.yml new file mode 100644 index 000000000..13ecfdb19 --- /dev/null +++ b/modules/worker/back/locale/worker-labour/es.yml @@ -0,0 +1,12 @@ +name: contrato +columns: + id: id + companyCodeFk: empresa + started: iniciado + ended: finalizado + payedHolidays: vacaciones pagadas + workerFk: trabajador + calendarTypeFk: tipo calendario + isHourlyLabor: horario laboral + workcenterFk: centro de trabajo + amount: salario From d8eeacb371eda05a3f5fb5927afa259d442fb464 Mon Sep 17 00:00:00 2001 From: Juan Ferrer Toribio Date: Tue, 16 May 2023 20:24:04 +0200 Subject: [PATCH 09/33] refs #5667 Translation improved --- modules/worker/back/locale/worker-time-control-mail/en.yml | 2 +- modules/worker/back/locale/worker-time-control-mail/es.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/worker/back/locale/worker-time-control-mail/en.yml b/modules/worker/back/locale/worker-time-control-mail/en.yml index 821a3a3c9..ec7e59e7f 100644 --- a/modules/worker/back/locale/worker-time-control-mail/en.yml +++ b/modules/worker/back/locale/worker-time-control-mail/en.yml @@ -1,4 +1,4 @@ -name: worker time control mail +name: time control mail columns: id: id workerFk: worker diff --git a/modules/worker/back/locale/worker-time-control-mail/es.yml b/modules/worker/back/locale/worker-time-control-mail/es.yml index 159fcddf5..26733eb9a 100644 --- a/modules/worker/back/locale/worker-time-control-mail/es.yml +++ b/modules/worker/back/locale/worker-time-control-mail/es.yml @@ -1,4 +1,4 @@ -name: correo de control de tiempo del trabajador +name: correo de fichadas columns: id: id workerFk: trabajador From dd9699e120fc0c9640de282c4fa91aca90ace096 Mon Sep 17 00:00:00 2001 From: Juan Ferrer Toribio Date: Tue, 16 May 2023 20:54:13 +0200 Subject: [PATCH 10/33] refs #5667 Translation fix --- front/salix/components/log/index.html | 2 +- front/salix/components/log/locale/es.yml | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/front/salix/components/log/index.html b/front/salix/components/log/index.html index e04dc5525..62f5913f4 100644 --- a/front/salix/components/log/index.html +++ b/front/salix/components/log/index.html @@ -153,7 +153,7 @@ Date: Wed, 17 May 2023 10:18:41 +0200 Subject: [PATCH 11/33] refs #5667 Style & translation fixes --- db/dump/fixtures.sql | 19 +++++++++++++++---- front/salix/components/log/style.scss | 7 +++---- .../claim/back/locale/claim-beginning/en.yml | 2 +- .../claim/back/locale/claim-beginning/es.yml | 2 +- .../back/locale/claim-development/en.yml | 2 +- .../back/locale/claim-development/es.yml | 2 +- modules/claim/back/locale/claim-dms/en.yml | 2 +- modules/claim/back/locale/claim-dms/es.yml | 2 +- modules/claim/back/locale/claim-end/en.yml | 2 +- modules/claim/back/locale/claim-end/es.yml | 2 +- .../back/locale/claim-observation/en.yml | 2 +- .../back/locale/claim-observation/es.yml | 2 +- .../client/back/locale/client-contact/en.yml | 2 +- .../client/back/locale/client-contact/es.yml | 2 +- modules/client/back/locale/client-dms/en.yml | 2 +- modules/client/back/locale/client-dms/es.yml | 2 +- .../back/locale/client-observation/en.yml | 2 +- .../back/locale/client-observation/es.yml | 2 +- .../client/back/locale/client-sample/en.yml | 2 +- .../client/back/locale/client-sample/es.yml | 2 +- modules/client/back/locale/client/en.yml | 7 ++++--- modules/client/back/locale/client/es.yml | 7 ++++--- .../client/back/locale/tpv-transaction/en.yml | 2 +- .../client/back/locale/tpv-transaction/es.yml | 2 +- .../back/locale/entry-observation/en.yml | 2 +- .../back/locale/entry-observation/es.yml | 2 +- modules/item/back/locale/item-barcode/en.yml | 2 +- modules/item/back/locale/item-barcode/es.yml | 2 +- .../item/back/locale/item-botanical/en.yml | 2 +- .../item/back/locale/item-botanical/es.yml | 2 +- modules/item/back/locale/item-tag/en.yml | 2 +- modules/item/back/locale/item-tag/es.yml | 2 +- .../item/back/locale/item-tax-country/en.yml | 2 +- .../item/back/locale/item-tax-country/es.yml | 4 ++-- modules/item/back/locale/item/es.yml | 4 ++-- modules/route/back/locale/route/es.yml | 8 ++++---- .../back/locale/supplier-account/en.yml | 4 ++-- .../back/locale/supplier-account/es.yml | 4 ++-- .../back/locale/supplier-contact/en.yml | 2 +- .../back/locale/supplier-contact/es.yml | 2 +- modules/supplier/back/locale/supplier/en.yml | 2 +- modules/supplier/back/locale/supplier/es.yml | 2 +- modules/ticket/back/locale/ticket-dms/en.yml | 2 +- modules/ticket/back/locale/ticket-dms/es.yml | 2 +- .../back/locale/ticket-observation/en.yml | 2 +- .../back/locale/ticket-observation/es.yml | 2 +- .../back/locale/ticket-packaging/en.yml | 2 +- .../back/locale/ticket-packaging/es.yml | 2 +- .../ticket/back/locale/ticket-refund/en.yml | 2 +- .../ticket/back/locale/ticket-refund/es.yml | 2 +- .../ticket/back/locale/ticket-request/en.yml | 2 +- .../ticket/back/locale/ticket-request/es.yml | 2 +- .../ticket/back/locale/ticket-service/en.yml | 2 +- .../ticket/back/locale/ticket-service/es.yml | 2 +- .../ticket/back/locale/ticket-tracking/en.yml | 2 +- .../ticket/back/locale/ticket-tracking/es.yml | 2 +- .../back/locale/travel-thermograph/en.yml | 4 ++-- .../back/locale/travel-thermograph/es.yml | 4 ++-- modules/worker/back/locale/worker-dms/en.yml | 2 +- modules/worker/back/locale/worker-dms/es.yml | 2 +- 60 files changed, 91 insertions(+), 79 deletions(-) diff --git a/db/dump/fixtures.sql b/db/dump/fixtures.sql index e69974d08..593329963 100644 --- a/db/dump/fixtures.sql +++ b/db/dump/fixtures.sql @@ -2770,10 +2770,21 @@ UPDATE `account`.`user` INSERT INTO `vn`.`ticketLog` (`originFk`, userFk, `action`, changedModel, oldInstance, newInstance, changedModelId, `description`) VALUES - (7, 18, 'update', 'Sale', '{"quantity":1}', '{"quantity":10}', 1, NULL), - (7, 18, 'update', 'Ticket', '{"quantity":1,"concept":"Chest ammo box"}', '{"quantity":10,"concept":"Chest ammo box"}', 1, NULL), - (7, 18, 'update', 'Sale', '{"price":3}', '{"price":5}', 1, NULL), - (7, 18, 'update', NULL, NULL, NULL, NULL, "Cambio cantidad Melee weapon heavy shield 1x0.5m de '5' a '10'"); + (7, 18, 'update', 'Sale', '{"quantity":1}', '{"quantity":10}', 1, NULL), + (7, 18, 'update', 'Ticket', '{"quantity":1,"concept":"Chest ammo box"}', '{"quantity":10,"concept":"Chest ammo box"}', 1, NULL), + (7, 18, 'update', 'Sale', '{"price":3}', '{"price":5}', 1, NULL), + (7, 18, 'update', NULL, NULL, NULL, NULL, "Cambio cantidad Melee weapon heavy shield 1x0.5m de '5' a '10'"); + +INSERT INTO `vn`.`ticketLog` (originFk, userFk, `action`, creationDate, description, changedModel, oldInstance, newInstance, changedModelId, changedModelValue) + VALUES + (7, 18, 'insert', '2001-01-01 10:00:03.0', NULL,'Sale','{"quantity":10}','{"quantity":15}',568,'Batman'), + (7, NULL, 'delete', '2000-12-31 15:00:03.0', NULL,'Ticket','{"quantity":99,"concept":"Chest ammo"}','{"quantity":10,"concept":"Chest ammo box"}',45,'Spider Man'), + (7, 18, 'insert', '2000-12-28 08:40:33.0', NULL,'Sale',NULL,'{"id":4252921,"clientFk":8608,"warehouseFk":60,"shipped":"2023-05-16T22:00:00.000Z","nickname":null,"addressFk":48637,"isSigned":true,"isLabeled":true,"isPrinted":true,"packages":0,"hour":0,"created":"2023-05-16T11:42:56.000Z","isBlocked":false,"hasPriority":false,"companyFk":442,"agencyModeFk":639,"landed":"2023-05-17T22:00:00.000Z","isBoxed":true,"isDeleted":true,"zoneFk":713,"zonePrice":13,"zoneBonus":0}',65893,'Super Man'), + (7, 18, 'select', '2000-12-27 03:40:45.0', 'Cambio cantidad Melee weapon heavy shield 1x0.5m de ''5'' a ''10''',NULL,NULL,NULL,NULL,NULL), + (7, 18, 'insert', '2000-04-10 09:40:15.0', NULL,'Sale','{"quantity":1}','{"quantity":10}',568,'Robin'), + (7, NULL, 'delete', '1999-05-09 10:00:03.0', NULL,'Ticket','{"quantity":1,"concept":"Chest box"}','{"quantity":10,"concept":"Chest ammo box"}',45,'Octopus'), + (7, 18, 'update', '2001-05-09 10:00:03.0', NULL,'Sale','{"id":4252921,"clientFk":8608,"warehouseFk":60,"shipped":"2023-05-16T22:00:00.000Z","nickname":null,"addressFk":48637,"isSigned":true,"isLabeled":true,"isPrinted":true,"packages":0,"hour":0,"created":"2023-05-16T11:42:56.000Z","isBlocked":false,"hasPriority":false,"companyFk":442,"agencyModeFk":639,"landed":"2023-05-17T22:00:00.000Z","isBoxed":true,"isDeleted":true,"zoneFk":713,"zonePrice":13,"zoneBonus":0}','{"id":4252921,"clientFk":8608,"warehouseFk":60,"shipped":"2023-05-16T22:00:00.000Z","nickname":"18 Agrupació comerciants Girona Centre","addressFk":48637,"isSigned":false,"isLabeled":false,"isPrinted":false,"packages":0,"hour":0,"created":"2023-05-16T11:42:56.000Z","isBlocked":true,"hasPriority":true,"companyFk":442,"agencyModeFk":639,"landed":"2023-05-17T22:00:00.000Z","isBoxed":false,"isDeleted":false,"zoneFk":713,"zonePrice":12,"zoneBonus":0}',65893,'Green Man'), + (7, 18, 'select', '2001-06-09 10:00:03.0', NULL,NULL,NULL,NULL,NULL,NULL); INSERT INTO `vn`.`osTicketConfig` (`id`, `host`, `user`, `password`, `oldStatus`, `newStatusId`, `day`, `comment`, `hostDb`, `userDb`, `passwordDb`, `portDb`, `responseType`, `fromEmailId`, `replyTo`) VALUES diff --git a/front/salix/components/log/style.scss b/front/salix/components/log/style.scss index 52005366a..74bc86b26 100644 --- a/front/salix/components/log/style.scss +++ b/front/salix/components/log/style.scss @@ -95,12 +95,13 @@ vn-log { overflow: hidden; background-color: rgba(255, 255, 255, .05); color: $color-font-secondary; - transition: max-height 150ms ease-in-out; + transition: max-height 1000ms ease-in-out; position: relative; overflow: hidden; text-overflow: ellipsis; white-space: nowrap; - max-height: 34px; + min-height: 34px; + box-sizing: border-box; & > .icon { float: right; @@ -120,8 +121,6 @@ vn-log { &.expanded { text-overflow: initial; white-space: initial; - overflow: auto; - max-height: 600px; & > .icon { & > .expand-button { diff --git a/modules/claim/back/locale/claim-beginning/en.yml b/modules/claim/back/locale/claim-beginning/en.yml index 47cc29c69..4c1520704 100644 --- a/modules/claim/back/locale/claim-beginning/en.yml +++ b/modules/claim/back/locale/claim-beginning/en.yml @@ -1,4 +1,4 @@ -name: claim beginning +name: beginning columns: id: id quantity: quantity diff --git a/modules/claim/back/locale/claim-beginning/es.yml b/modules/claim/back/locale/claim-beginning/es.yml index 5e898c25e..20110cb52 100644 --- a/modules/claim/back/locale/claim-beginning/es.yml +++ b/modules/claim/back/locale/claim-beginning/es.yml @@ -1,4 +1,4 @@ -name: comienzo reclamación +name: comienzo columns: id: id quantity: cantidad diff --git a/modules/claim/back/locale/claim-development/en.yml b/modules/claim/back/locale/claim-development/en.yml index 054381e67..875cbf121 100644 --- a/modules/claim/back/locale/claim-development/en.yml +++ b/modules/claim/back/locale/claim-development/en.yml @@ -1,4 +1,4 @@ -name: claim development +name: development columns: id: id claimFk: claim diff --git a/modules/claim/back/locale/claim-development/es.yml b/modules/claim/back/locale/claim-development/es.yml index d5223e755..c95a1c0e7 100644 --- a/modules/claim/back/locale/claim-development/es.yml +++ b/modules/claim/back/locale/claim-development/es.yml @@ -1,4 +1,4 @@ -name: desarrollo reclamación +name: desarrollo columns: id: id claimFk: reclamación diff --git a/modules/claim/back/locale/claim-dms/en.yml b/modules/claim/back/locale/claim-dms/en.yml index c76c364e7..4b54ca19b 100644 --- a/modules/claim/back/locale/claim-dms/en.yml +++ b/modules/claim/back/locale/claim-dms/en.yml @@ -1,4 +1,4 @@ -name: claim dms +name: document columns: dmsFk: dms claimFk: claim diff --git a/modules/claim/back/locale/claim-dms/es.yml b/modules/claim/back/locale/claim-dms/es.yml index 949e20a36..d471b1ff6 100644 --- a/modules/claim/back/locale/claim-dms/es.yml +++ b/modules/claim/back/locale/claim-dms/es.yml @@ -1,4 +1,4 @@ -name: documento reclamación +name: documento columns: dmsFk: dms claimFk: reclamación diff --git a/modules/claim/back/locale/claim-end/en.yml b/modules/claim/back/locale/claim-end/en.yml index f9e736d76..4565cd579 100644 --- a/modules/claim/back/locale/claim-end/en.yml +++ b/modules/claim/back/locale/claim-end/en.yml @@ -1,4 +1,4 @@ -name: claim end +name: end columns: id: id claimFk: claim diff --git a/modules/claim/back/locale/claim-end/es.yml b/modules/claim/back/locale/claim-end/es.yml index 9855eca03..e5511c166 100644 --- a/modules/claim/back/locale/claim-end/es.yml +++ b/modules/claim/back/locale/claim-end/es.yml @@ -1,4 +1,4 @@ -name: final reclamación +name: finalización columns: id: id claimFk: reclamación diff --git a/modules/claim/back/locale/claim-observation/en.yml b/modules/claim/back/locale/claim-observation/en.yml index 772ea038c..a0ba2c449 100644 --- a/modules/claim/back/locale/claim-observation/en.yml +++ b/modules/claim/back/locale/claim-observation/en.yml @@ -1,4 +1,4 @@ -name: claim observation +name: observation columns: id: id claimFk: claim diff --git a/modules/claim/back/locale/claim-observation/es.yml b/modules/claim/back/locale/claim-observation/es.yml index fae3a1ae9..9ea5e275c 100644 --- a/modules/claim/back/locale/claim-observation/es.yml +++ b/modules/claim/back/locale/claim-observation/es.yml @@ -1,4 +1,4 @@ -name: observación reclamación +name: observación columns: id: id claimFk: reclamación diff --git a/modules/client/back/locale/client-contact/en.yml b/modules/client/back/locale/client-contact/en.yml index 5bd6e25db..2b47f5b4b 100644 --- a/modules/client/back/locale/client-contact/en.yml +++ b/modules/client/back/locale/client-contact/en.yml @@ -1,4 +1,4 @@ -name: client contact +name: contact columns: id: id name: name diff --git a/modules/client/back/locale/client-contact/es.yml b/modules/client/back/locale/client-contact/es.yml index 5802c0dde..0116a537a 100644 --- a/modules/client/back/locale/client-contact/es.yml +++ b/modules/client/back/locale/client-contact/es.yml @@ -1,4 +1,4 @@ -name: contacto cliente +name: contacto columns: id: id name: nombre diff --git a/modules/client/back/locale/client-dms/en.yml b/modules/client/back/locale/client-dms/en.yml index c8ad68635..de4d6c434 100644 --- a/modules/client/back/locale/client-dms/en.yml +++ b/modules/client/back/locale/client-dms/en.yml @@ -1,4 +1,4 @@ -name: client dms +name: document columns: dmsFk: dms clientFk: client diff --git a/modules/client/back/locale/client-dms/es.yml b/modules/client/back/locale/client-dms/es.yml index c683f4764..e1744b019 100644 --- a/modules/client/back/locale/client-dms/es.yml +++ b/modules/client/back/locale/client-dms/es.yml @@ -1,4 +1,4 @@ -name: documento cliente +name: documento columns: dmsFk: dms clientFk: client diff --git a/modules/client/back/locale/client-observation/en.yml b/modules/client/back/locale/client-observation/en.yml index 2dd8393ae..0cf5e0dc1 100644 --- a/modules/client/back/locale/client-observation/en.yml +++ b/modules/client/back/locale/client-observation/en.yml @@ -1,4 +1,4 @@ -name: client observation +name: observation columns: id: id clientFk: client diff --git a/modules/client/back/locale/client-observation/es.yml b/modules/client/back/locale/client-observation/es.yml index 0fc6bbf04..b04ae63d9 100644 --- a/modules/client/back/locale/client-observation/es.yml +++ b/modules/client/back/locale/client-observation/es.yml @@ -1,4 +1,4 @@ -name: observación cliente +name: observación columns: id: id clientFk: cliente diff --git a/modules/client/back/locale/client-sample/en.yml b/modules/client/back/locale/client-sample/en.yml index 77639fbb4..91e5ba24c 100644 --- a/modules/client/back/locale/client-sample/en.yml +++ b/modules/client/back/locale/client-sample/en.yml @@ -1,4 +1,4 @@ -name: client sample +name: sample columns: id: id created: created diff --git a/modules/client/back/locale/client-sample/es.yml b/modules/client/back/locale/client-sample/es.yml index 6311eb25a..c88ff0e7e 100644 --- a/modules/client/back/locale/client-sample/es.yml +++ b/modules/client/back/locale/client-sample/es.yml @@ -1,4 +1,4 @@ -name: muestra cliente +name: muestra columns: id: id created: creado diff --git a/modules/client/back/locale/client/en.yml b/modules/client/back/locale/client/en.yml index 9d36c5977..74384461c 100644 --- a/modules/client/back/locale/client/en.yml +++ b/modules/client/back/locale/client/en.yml @@ -22,14 +22,14 @@ columns: hasToInvoice: has to invoice isToBeMailed: mailed hasSepaVnl: sepa VNL - hasLcr: lcr + hasLcr: LCR hasCoreVnl: core VNL hasCoreVnh: core VNH hasIncoterms: incoterms isTaxDataChecked: tax data checked - eypbc: eypbc + eypbc: EYPBC quality: quality - isVies: vies + isVies: VIES isRelevant: relevant accountingAccount: accounting account created: created @@ -51,4 +51,5 @@ columns: isCreatedAsServed: created as served hasInvoiceSimplified: simplified invoice typeFk: type + lastSalesPersonFk: last salesperson diff --git a/modules/client/back/locale/client/es.yml b/modules/client/back/locale/client/es.yml index 930b2be6f..47bf896d9 100644 --- a/modules/client/back/locale/client/es.yml +++ b/modules/client/back/locale/client/es.yml @@ -22,14 +22,14 @@ columns: hasToInvoice: tiene que facturar isToBeMailed: envío por email hasSepaVnl: sepa VNL - hasLcr: lcr + hasLcr: LCR hasCoreVnl: centro VNL hasCoreVnh: centro VNH hasIncoterms: incoterms isTaxDataChecked: datos fiscales comprobados - eypbc: eypbc + eypbc: EYPBC quality: calidad - isVies: vies + isVies: VIES isRelevant: importante accountingAccount: cuenta contable created: creado @@ -51,4 +51,5 @@ columns: isCreatedAsServed: creado como servido hasInvoiceSimplified: factura simple typeFk: tipo + lastSalesPersonFk: último comercial diff --git a/modules/client/back/locale/tpv-transaction/en.yml b/modules/client/back/locale/tpv-transaction/en.yml index fbe1bbadc..c70914495 100644 --- a/modules/client/back/locale/tpv-transaction/en.yml +++ b/modules/client/back/locale/tpv-transaction/en.yml @@ -1,4 +1,4 @@ -name: tpv transaction +name: TPV transaction columns: id: id merchantFk: merchant diff --git a/modules/client/back/locale/tpv-transaction/es.yml b/modules/client/back/locale/tpv-transaction/es.yml index c751b354d..7d412ba66 100644 --- a/modules/client/back/locale/tpv-transaction/es.yml +++ b/modules/client/back/locale/tpv-transaction/es.yml @@ -1,4 +1,4 @@ -name: transacción tpv +name: transacción TPV columns: id: id merchantFk: comerciante diff --git a/modules/entry/back/locale/entry-observation/en.yml b/modules/entry/back/locale/entry-observation/en.yml index efe908c9f..379683303 100644 --- a/modules/entry/back/locale/entry-observation/en.yml +++ b/modules/entry/back/locale/entry-observation/en.yml @@ -1,4 +1,4 @@ -name: entry observation +name: observation columns: id: id description: description diff --git a/modules/entry/back/locale/entry-observation/es.yml b/modules/entry/back/locale/entry-observation/es.yml index 43799ae00..8879f1e1b 100644 --- a/modules/entry/back/locale/entry-observation/es.yml +++ b/modules/entry/back/locale/entry-observation/es.yml @@ -1,4 +1,4 @@ -name: observación entrada +name: observación columns: id: id description: descripción diff --git a/modules/item/back/locale/item-barcode/en.yml b/modules/item/back/locale/item-barcode/en.yml index c1b20855f..16b18b163 100644 --- a/modules/item/back/locale/item-barcode/en.yml +++ b/modules/item/back/locale/item-barcode/en.yml @@ -1,4 +1,4 @@ -name: item barcode +name: barcode columns: id: id code: code diff --git a/modules/item/back/locale/item-barcode/es.yml b/modules/item/back/locale/item-barcode/es.yml index c1557f6d8..11d9f0c22 100644 --- a/modules/item/back/locale/item-barcode/es.yml +++ b/modules/item/back/locale/item-barcode/es.yml @@ -1,4 +1,4 @@ -name: código barras artículo +name: código barras columns: id: id code: código diff --git a/modules/item/back/locale/item-botanical/en.yml b/modules/item/back/locale/item-botanical/en.yml index f5a9e4c5a..03c66a097 100644 --- a/modules/item/back/locale/item-botanical/en.yml +++ b/modules/item/back/locale/item-botanical/en.yml @@ -1,4 +1,4 @@ -name: item botanical +name: botanical columns: itemFk: item genusFk: genus diff --git a/modules/item/back/locale/item-botanical/es.yml b/modules/item/back/locale/item-botanical/es.yml index 8e0a45491..ca7fd5bf1 100644 --- a/modules/item/back/locale/item-botanical/es.yml +++ b/modules/item/back/locale/item-botanical/es.yml @@ -1,4 +1,4 @@ -name: artículo botánico +name: botánico columns: itemFk: artículo genusFk: género diff --git a/modules/item/back/locale/item-tag/en.yml b/modules/item/back/locale/item-tag/en.yml index fee588b4c..8d8288a96 100644 --- a/modules/item/back/locale/item-tag/en.yml +++ b/modules/item/back/locale/item-tag/en.yml @@ -1,4 +1,4 @@ -name: item tag +name: tag columns: id: id value: value diff --git a/modules/item/back/locale/item-tag/es.yml b/modules/item/back/locale/item-tag/es.yml index 3e1d1a9cf..f9c9aac0b 100644 --- a/modules/item/back/locale/item-tag/es.yml +++ b/modules/item/back/locale/item-tag/es.yml @@ -1,4 +1,4 @@ -name: etiqueta artículo +name: etiqueta columns: id: id value: valor diff --git a/modules/item/back/locale/item-tax-country/en.yml b/modules/item/back/locale/item-tax-country/en.yml index 060ad9910..c85c5af43 100644 --- a/modules/item/back/locale/item-tax-country/en.yml +++ b/modules/item/back/locale/item-tax-country/en.yml @@ -1,4 +1,4 @@ -name: item tax country +name: country tax columns: id: id effectived: effectived diff --git a/modules/item/back/locale/item-tax-country/es.yml b/modules/item/back/locale/item-tax-country/es.yml index 2a0e6b5e2..48baf735b 100644 --- a/modules/item/back/locale/item-tax-country/es.yml +++ b/modules/item/back/locale/item-tax-country/es.yml @@ -1,7 +1,7 @@ -name: impuesto país del artículo +name: impuesto país columns: id: id effectived: efectivo itemFk: artículo countryFk: país - taxClassFk: clase impuestos + taxClassFk: clase impuesto diff --git a/modules/item/back/locale/item/es.yml b/modules/item/back/locale/item/es.yml index d65288954..9872afc49 100644 --- a/modules/item/back/locale/item/es.yml +++ b/modules/item/back/locale/item/es.yml @@ -27,8 +27,8 @@ columns: value9: valor9 tag10: etiqueta10 value10: valor10 - itemPackingTypeFk: embalaje del artículo - hasKgPrice: tiene precio kg + itemPackingTypeFk: tipo embalaje + hasKgPrice: precio kg family: familia expenseFk: gasto minPrice: precio mínimo diff --git a/modules/route/back/locale/route/es.yml b/modules/route/back/locale/route/es.yml index d1e38ff7e..c0a434791 100644 --- a/modules/route/back/locale/route/es.yml +++ b/modules/route/back/locale/route/es.yml @@ -1,14 +1,14 @@ name: ruta columns: id: id - created: creado + created: creada time: tiempo kmStart: km inicio kmEnd: km fin - started: comenzado - finished: terminado + started: empezada + finished: terminada gestdoc: gestdoc - cost: costo + cost: coste m3: m3 description: descripción isOk: ok diff --git a/modules/supplier/back/locale/supplier-account/en.yml b/modules/supplier/back/locale/supplier-account/en.yml index bc2add833..2bce50cfa 100644 --- a/modules/supplier/back/locale/supplier-account/en.yml +++ b/modules/supplier/back/locale/supplier-account/en.yml @@ -1,7 +1,7 @@ -name: supplier account +name: account columns: id: id - iban: iban + iban: IBAN beneficiary: beneficiary supplierFk: supplier bankEntityFk: bank entity diff --git a/modules/supplier/back/locale/supplier-account/es.yml b/modules/supplier/back/locale/supplier-account/es.yml index 0d751b387..120293c8a 100644 --- a/modules/supplier/back/locale/supplier-account/es.yml +++ b/modules/supplier/back/locale/supplier-account/es.yml @@ -1,7 +1,7 @@ -name: cuenta proveedor +name: cuenta columns: id: id - iban: iban + iban: IBAN beneficiary: beneficiario supplierFk: proveedor bankEntityFk: entidad bancaria diff --git a/modules/supplier/back/locale/supplier-contact/en.yml b/modules/supplier/back/locale/supplier-contact/en.yml index 62f923293..f79dfae19 100644 --- a/modules/supplier/back/locale/supplier-contact/en.yml +++ b/modules/supplier/back/locale/supplier-contact/en.yml @@ -1,4 +1,4 @@ -name: supplier contact +name: contact columns: id: id supplierFk: supplier diff --git a/modules/supplier/back/locale/supplier-contact/es.yml b/modules/supplier/back/locale/supplier-contact/es.yml index d35f0bf2e..486c7924d 100644 --- a/modules/supplier/back/locale/supplier-contact/es.yml +++ b/modules/supplier/back/locale/supplier-contact/es.yml @@ -1,4 +1,4 @@ -name: contacto proveedor +name: contacto columns: id: id supplierFk: proveedor diff --git a/modules/supplier/back/locale/supplier/en.yml b/modules/supplier/back/locale/supplier/en.yml index 1be941a70..25bcae1e3 100644 --- a/modules/supplier/back/locale/supplier/en.yml +++ b/modules/supplier/back/locale/supplier/en.yml @@ -4,7 +4,7 @@ columns: name: name account: account countryFk: country - nif: nif + nif: NIF phone: phone retAccount: ret account commission: commission diff --git a/modules/supplier/back/locale/supplier/es.yml b/modules/supplier/back/locale/supplier/es.yml index 6ac8379f5..678c384a9 100644 --- a/modules/supplier/back/locale/supplier/es.yml +++ b/modules/supplier/back/locale/supplier/es.yml @@ -4,7 +4,7 @@ columns: name: nombre account: cuenta countryFk: país - nif: nif + nif: NIF phone: teléfono retAccount: cuenta ret commission: comisión diff --git a/modules/ticket/back/locale/ticket-dms/en.yml b/modules/ticket/back/locale/ticket-dms/en.yml index 771e4daf3..ff4c9f14b 100644 --- a/modules/ticket/back/locale/ticket-dms/en.yml +++ b/modules/ticket/back/locale/ticket-dms/en.yml @@ -1,4 +1,4 @@ -name: ticket dms +name: document columns: dmsFk: dms ticketFk: ticket diff --git a/modules/ticket/back/locale/ticket-dms/es.yml b/modules/ticket/back/locale/ticket-dms/es.yml index 360268428..09c380732 100644 --- a/modules/ticket/back/locale/ticket-dms/es.yml +++ b/modules/ticket/back/locale/ticket-dms/es.yml @@ -1,4 +1,4 @@ -name: documento ticket +name: documento columns: dmsFk: dms ticketFk: ticket diff --git a/modules/ticket/back/locale/ticket-observation/en.yml b/modules/ticket/back/locale/ticket-observation/en.yml index 40bd567bf..5a43b5887 100644 --- a/modules/ticket/back/locale/ticket-observation/en.yml +++ b/modules/ticket/back/locale/ticket-observation/en.yml @@ -1,4 +1,4 @@ -name: ticket observation +name: observation columns: id: id description: description diff --git a/modules/ticket/back/locale/ticket-observation/es.yml b/modules/ticket/back/locale/ticket-observation/es.yml index 155eb58e2..7e72cd0c7 100644 --- a/modules/ticket/back/locale/ticket-observation/es.yml +++ b/modules/ticket/back/locale/ticket-observation/es.yml @@ -1,4 +1,4 @@ -name: observación ticket +name: observación columns: id: id description: descripción diff --git a/modules/ticket/back/locale/ticket-packaging/en.yml b/modules/ticket/back/locale/ticket-packaging/en.yml index 4dd018524..51cc01e07 100644 --- a/modules/ticket/back/locale/ticket-packaging/en.yml +++ b/modules/ticket/back/locale/ticket-packaging/en.yml @@ -1,4 +1,4 @@ -name: ticket packaging +name: packaging columns: id: id quantity: quantity diff --git a/modules/ticket/back/locale/ticket-packaging/es.yml b/modules/ticket/back/locale/ticket-packaging/es.yml index a31a8c097..b2c3e22ce 100644 --- a/modules/ticket/back/locale/ticket-packaging/es.yml +++ b/modules/ticket/back/locale/ticket-packaging/es.yml @@ -1,4 +1,4 @@ -name: embalaje ticket +name: embalaje columns: id: id quantity: cantidad diff --git a/modules/ticket/back/locale/ticket-refund/en.yml b/modules/ticket/back/locale/ticket-refund/en.yml index 961b5c8c3..7da82a1a3 100644 --- a/modules/ticket/back/locale/ticket-refund/en.yml +++ b/modules/ticket/back/locale/ticket-refund/en.yml @@ -1,4 +1,4 @@ -name: ticket refund +name: refund columns: id: id refundTicketFk: refund ticket diff --git a/modules/ticket/back/locale/ticket-refund/es.yml b/modules/ticket/back/locale/ticket-refund/es.yml index 8826ef949..d83a60c55 100644 --- a/modules/ticket/back/locale/ticket-refund/es.yml +++ b/modules/ticket/back/locale/ticket-refund/es.yml @@ -1,4 +1,4 @@ -name: ticket abono +name: abono columns: id: id refundTicketFk: ticket abono diff --git a/modules/ticket/back/locale/ticket-request/en.yml b/modules/ticket/back/locale/ticket-request/en.yml index 498a933ac..f381e0c9d 100644 --- a/modules/ticket/back/locale/ticket-request/en.yml +++ b/modules/ticket/back/locale/ticket-request/en.yml @@ -1,4 +1,4 @@ -name: ticket request +name: request columns: id: id description: description diff --git a/modules/ticket/back/locale/ticket-request/es.yml b/modules/ticket/back/locale/ticket-request/es.yml index b2871e737..5504448bf 100644 --- a/modules/ticket/back/locale/ticket-request/es.yml +++ b/modules/ticket/back/locale/ticket-request/es.yml @@ -1,4 +1,4 @@ -name: peticiones ticket +name: peticion columns: id: id description: descripción diff --git a/modules/ticket/back/locale/ticket-service/en.yml b/modules/ticket/back/locale/ticket-service/en.yml index cf4e6f43f..a7c329415 100644 --- a/modules/ticket/back/locale/ticket-service/en.yml +++ b/modules/ticket/back/locale/ticket-service/en.yml @@ -1,4 +1,4 @@ -name: ticket service +name: service columns: id: id ticketFk: ticket diff --git a/modules/ticket/back/locale/ticket-service/es.yml b/modules/ticket/back/locale/ticket-service/es.yml index ee07c13d3..4b11be6d1 100644 --- a/modules/ticket/back/locale/ticket-service/es.yml +++ b/modules/ticket/back/locale/ticket-service/es.yml @@ -1,4 +1,4 @@ -name: servicios ticket +name: servicio columns: id: id ticketFk: ticket diff --git a/modules/ticket/back/locale/ticket-tracking/en.yml b/modules/ticket/back/locale/ticket-tracking/en.yml index 721fc7c2d..497d28cc0 100644 --- a/modules/ticket/back/locale/ticket-tracking/en.yml +++ b/modules/ticket/back/locale/ticket-tracking/en.yml @@ -1,4 +1,4 @@ -name: ticket tracking +name: tracking columns: id: id created: created diff --git a/modules/ticket/back/locale/ticket-tracking/es.yml b/modules/ticket/back/locale/ticket-tracking/es.yml index 3d09fde63..8018872f4 100644 --- a/modules/ticket/back/locale/ticket-tracking/es.yml +++ b/modules/ticket/back/locale/ticket-tracking/es.yml @@ -1,4 +1,4 @@ -name: seguimiento ticket +name: seguimiento columns: id: id created: creado diff --git a/modules/travel/back/locale/travel-thermograph/en.yml b/modules/travel/back/locale/travel-thermograph/en.yml index 92acee896..d0d42d199 100644 --- a/modules/travel/back/locale/travel-thermograph/en.yml +++ b/modules/travel/back/locale/travel-thermograph/en.yml @@ -1,4 +1,4 @@ -name: travel thermograph +name: thermograph columns: id: id created: created @@ -6,5 +6,5 @@ columns: result: result warehouseFk: warehouse travelFk: travel - dmsFk: dms + dmsFk: document thermographFk: thermograph diff --git a/modules/travel/back/locale/travel-thermograph/es.yml b/modules/travel/back/locale/travel-thermograph/es.yml index 0d08863b6..086fba3e6 100644 --- a/modules/travel/back/locale/travel-thermograph/es.yml +++ b/modules/travel/back/locale/travel-thermograph/es.yml @@ -1,4 +1,4 @@ -name: travel thermograph +name: termógrafo columns: id: id created: creado @@ -6,5 +6,5 @@ columns: result: resultado warehouseFk: almacén travelFk: envío - dmsFk: dms + dmsFk: documento thermographFk: termógrafo diff --git a/modules/worker/back/locale/worker-dms/en.yml b/modules/worker/back/locale/worker-dms/en.yml index f870adaf0..b1b7b6ce4 100644 --- a/modules/worker/back/locale/worker-dms/en.yml +++ b/modules/worker/back/locale/worker-dms/en.yml @@ -1,4 +1,4 @@ -name: worker dms +name: document columns: id: id dmsFk: dms diff --git a/modules/worker/back/locale/worker-dms/es.yml b/modules/worker/back/locale/worker-dms/es.yml index c3bdea5af..878669181 100644 --- a/modules/worker/back/locale/worker-dms/es.yml +++ b/modules/worker/back/locale/worker-dms/es.yml @@ -1,4 +1,4 @@ -name: documento trabajador +name: documento columns: id: id dmsFk: dms From f55e5f9f74f47cf63fae7dd60707b4c35cfce430 Mon Sep 17 00:00:00 2001 From: Juan Ferrer Toribio Date: Wed, 17 May 2023 11:52:13 +0200 Subject: [PATCH 12/33] refs #5667 Business translations --- modules/worker/back/locale/{worker-labour => business}/en.yml | 0 modules/worker/back/locale/{worker-labour => business}/es.yml | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename modules/worker/back/locale/{worker-labour => business}/en.yml (100%) rename modules/worker/back/locale/{worker-labour => business}/es.yml (100%) diff --git a/modules/worker/back/locale/worker-labour/en.yml b/modules/worker/back/locale/business/en.yml similarity index 100% rename from modules/worker/back/locale/worker-labour/en.yml rename to modules/worker/back/locale/business/en.yml diff --git a/modules/worker/back/locale/worker-labour/es.yml b/modules/worker/back/locale/business/es.yml similarity index 100% rename from modules/worker/back/locale/worker-labour/es.yml rename to modules/worker/back/locale/business/es.yml From 058f828b9205537e1d692ca40f2a9c9187187930 Mon Sep 17 00:00:00 2001 From: alexm Date: Wed, 17 May 2023 11:54:59 +0200 Subject: [PATCH 13/33] refs #4548 fix(invoiceIn): report use invoiceIn.issued --- print/templates/reports/invoiceIn/invoiceIn.html | 2 +- print/templates/reports/invoiceIn/sql/invoice.sql | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/print/templates/reports/invoiceIn/invoiceIn.html b/print/templates/reports/invoiceIn/invoiceIn.html index 22988b654..8f072947f 100644 --- a/print/templates/reports/invoiceIn/invoiceIn.html +++ b/print/templates/reports/invoiceIn/invoiceIn.html @@ -19,7 +19,7 @@ {{$t('date')}} - {{formatDate(invoice.created, '%d-%m-%Y')}} + {{formatDate(invoice.issued, '%d-%m-%Y')}} diff --git a/print/templates/reports/invoiceIn/sql/invoice.sql b/print/templates/reports/invoiceIn/sql/invoice.sql index eea8e81a5..dae979011 100644 --- a/print/templates/reports/invoiceIn/sql/invoice.sql +++ b/print/templates/reports/invoiceIn/sql/invoice.sql @@ -1,7 +1,7 @@ SELECT i.supplierRef, s.id supplierId, - i.created, + i.issued, s.name, s.street AS postalAddress, s.nif, From f9fdf80350eb78075e8c0003301633ce38828b01 Mon Sep 17 00:00:00 2001 From: Juan Ferrer Toribio Date: Wed, 17 May 2023 12:06:31 +0200 Subject: [PATCH 14/33] refs #5667 Item translations added --- modules/item/back/locale/item/en.yml | 2 ++ modules/item/back/locale/item/es.yml | 2 ++ 2 files changed, 4 insertions(+) diff --git a/modules/item/back/locale/item/en.yml b/modules/item/back/locale/item/en.yml index d63c95c70..39e465300 100644 --- a/modules/item/back/locale/item/en.yml +++ b/modules/item/back/locale/item/en.yml @@ -44,4 +44,6 @@ columns: intrastatFk: intrastat genericFk: generic itemFk: item + density: density + compression: compression diff --git a/modules/item/back/locale/item/es.yml b/modules/item/back/locale/item/es.yml index 9872afc49..4b75b4704 100644 --- a/modules/item/back/locale/item/es.yml +++ b/modules/item/back/locale/item/es.yml @@ -44,4 +44,6 @@ columns: intrastatFk: intrastat genericFk: genérico itemFk: artículo + density: densidad + compression: compresión From 0d51987d47ca18025e795ab5197e1bd375ed66f9 Mon Sep 17 00:00:00 2001 From: Juan Ferrer Toribio Date: Wed, 17 May 2023 12:41:25 +0200 Subject: [PATCH 15/33] refs #5667 Client sample translations --- modules/client/back/locale/client-sample/en.yml | 2 ++ modules/client/back/locale/client-sample/es.yml | 2 ++ 2 files changed, 4 insertions(+) diff --git a/modules/client/back/locale/client-sample/en.yml b/modules/client/back/locale/client-sample/en.yml index 91e5ba24c..4c355ab7f 100644 --- a/modules/client/back/locale/client-sample/en.yml +++ b/modules/client/back/locale/client-sample/en.yml @@ -6,3 +6,5 @@ columns: typeFk: type userFk: user companyFk: company + workerFk: worker + balance: balance diff --git a/modules/client/back/locale/client-sample/es.yml b/modules/client/back/locale/client-sample/es.yml index c88ff0e7e..5293adaa8 100644 --- a/modules/client/back/locale/client-sample/es.yml +++ b/modules/client/back/locale/client-sample/es.yml @@ -6,3 +6,5 @@ columns: typeFk: tipo userFk: usuario companyFk: compañia + workerFk: trabajador + balance: balance From e7f9984b4b061a23127f5ae8e911a11a179cb011 Mon Sep 17 00:00:00 2001 From: Juan Ferrer Toribio Date: Wed, 17 May 2023 13:02:51 +0200 Subject: [PATCH 16/33] refs #5667 Fix decimal places --- front/core/components/json-value/index.js | 6 ++++++ front/core/components/json-value/index.spec.js | 14 ++++++++++++++ 2 files changed, 20 insertions(+) diff --git a/front/core/components/json-value/index.js b/front/core/components/json-value/index.js index 226bf8477..6b7517417 100644 --- a/front/core/components/json-value/index.js +++ b/front/core/components/json-value/index.js @@ -28,6 +28,12 @@ export default class Controller extends Component { } else { cssClass = type; switch (type) { + case 'number': + if (Number.isInteger(value)) + text = value; + else + text = Math.round((value + Number.EPSILON) * 1000) / 1000; + break; case 'boolean': text = value ? '✓' : '✗'; cssClass = value ? 'true' : 'false'; diff --git a/front/core/components/json-value/index.spec.js b/front/core/components/json-value/index.spec.js index b79d15a5d..ff7a45977 100644 --- a/front/core/components/json-value/index.spec.js +++ b/front/core/components/json-value/index.spec.js @@ -75,5 +75,19 @@ describe('Component vnJsonValue', () => { expect(el.textContent).toEqual('2050'); expect(el.className).toContain('json-number'); }); + + it('should display number when value is decimal', () => { + controller.value = 10.1; + + expect(el.textContent).toEqual('10.1'); + expect(el.className).toContain('json-number'); + }); + + it('should display rounded number when value is decimal with lot of decimals', () => { + controller.value = 10.124323234; + + expect(el.textContent).toEqual('10.124'); + expect(el.className).toContain('json-number'); + }); }); }); From c31eee4906a53eb7eda4a8123b120b7f26684671 Mon Sep 17 00:00:00 2001 From: carlossa Date: Wed, 17 May 2023 13:35:55 +0200 Subject: [PATCH 17/33] refs #5696 landed --- modules/ticket/front/sale/index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/ticket/front/sale/index.js b/modules/ticket/front/sale/index.js index 24b077476..8ae9a53e4 100644 --- a/modules/ticket/front/sale/index.js +++ b/modules/ticket/front/sale/index.js @@ -194,7 +194,7 @@ class Controller extends Section { } createClaim() { - const timeDifference = new Date().getTime() - new Date(this.ticket.shipped).getTime(); + const timeDifference = new Date().getTime() - new Date(this.ticket.landed).getTime(); const pastDays = Math.floor(timeDifference / 86400000); if (pastDays >= this.ticketConfig[0].daysForWarningClaim) From 69a25d8d0342980e8e4ed613300dd2b7a1b25a62 Mon Sep 17 00:00:00 2001 From: carlossa Date: Wed, 17 May 2023 14:04:13 +0200 Subject: [PATCH 18/33] refs #5696 horas a 00 --- modules/ticket/front/sale/index.js | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/modules/ticket/front/sale/index.js b/modules/ticket/front/sale/index.js index 8ae9a53e4..5a927d724 100644 --- a/modules/ticket/front/sale/index.js +++ b/modules/ticket/front/sale/index.js @@ -194,12 +194,18 @@ class Controller extends Section { } createClaim() { - const timeDifference = new Date().getTime() - new Date(this.ticket.landed).getTime(); + const today = new Date(); + today.setHours(0, 0, 0, 0); + const timeDifference = today.getTime() - new Date(this.ticket.landed).getTime(); + const pastDays = Math.floor(timeDifference / 86400000); if (pastDays >= this.ticketConfig[0].daysForWarningClaim) + this.$.claimConfirm.show(); + else + this.onCreateClaimAccepted(); } From 02451818efb61677e502cb88d32dbb58d554a939 Mon Sep 17 00:00:00 2001 From: alexm Date: Wed, 17 May 2023 14:31:19 +0200 Subject: [PATCH 19/33] typo --- modules/ticket/front/sale/index.js | 3 --- 1 file changed, 3 deletions(-) diff --git a/modules/ticket/front/sale/index.js b/modules/ticket/front/sale/index.js index 5a927d724..b7cdc22b9 100644 --- a/modules/ticket/front/sale/index.js +++ b/modules/ticket/front/sale/index.js @@ -201,11 +201,8 @@ class Controller extends Section { const pastDays = Math.floor(timeDifference / 86400000); if (pastDays >= this.ticketConfig[0].daysForWarningClaim) - this.$.claimConfirm.show(); - else - this.onCreateClaimAccepted(); } From e8e04423f010d218a2c77cbe36dc6e9a09066f09 Mon Sep 17 00:00:00 2001 From: Juan Ferrer Toribio Date: Wed, 17 May 2023 16:43:48 +0200 Subject: [PATCH 20/33] refs #5667 Atrs ordered by name --- e2e/paths/02-client/07_edit_web_access.spec.js | 4 ++-- front/salix/components/log/index.js | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/e2e/paths/02-client/07_edit_web_access.spec.js b/e2e/paths/02-client/07_edit_web_access.spec.js index 26b4c4e27..5386d12bd 100644 --- a/e2e/paths/02-client/07_edit_web_access.spec.js +++ b/e2e/paths/02-client/07_edit_web_access.spec.js @@ -5,8 +5,8 @@ const $ = { userName: 'vn-client-web-access vn-textfield[ng-model="$ctrl.account.name"]', email: 'vn-client-web-access vn-textfield[ng-model="$ctrl.account.email"]', saveButton: 'vn-client-web-access button[type=submit]', - nameValue: 'vn-client-log .change:nth-child(1) .basic-json:nth-child(1) vn-json-value', - activeValue: 'vn-client-log .change:nth-child(2) .basic-json:nth-child(2) vn-json-value' + nameValue: 'vn-client-log .change:nth-child(1) .basic-json:nth-child(2) vn-json-value', + activeValue: 'vn-client-log .change:nth-child(2) .basic-json:nth-child(1) vn-json-value' }; describe('Client web access path', () => { diff --git a/front/salix/components/log/index.js b/front/salix/components/log/index.js index 7a126c53e..8b2a739fd 100644 --- a/front/salix/components/log/index.js +++ b/front/salix/components/log/index.js @@ -76,6 +76,8 @@ export default class Controller extends Section { new: this.castJsonValue(newValues[prop]) }); } + log.props.sort( + (a, b) => a.nameI18n.localeCompare(b.nameI18n)); } } From 48da4b13ff7948627c6bc0bf4e9f501eedaedcf4 Mon Sep 17 00:00:00 2001 From: Juan Ferrer Toribio Date: Wed, 17 May 2023 17:08:20 +0200 Subject: [PATCH 21/33] refs #5667 Ticket translation fixes --- modules/ticket/back/locale/sale/en.yml | 1 + modules/ticket/back/locale/sale/es.yml | 1 + modules/ticket/back/locale/ticket-tracking/en.yml | 2 +- modules/ticket/back/locale/ticket-tracking/es.yml | 2 +- 4 files changed, 4 insertions(+), 2 deletions(-) diff --git a/modules/ticket/back/locale/sale/en.yml b/modules/ticket/back/locale/sale/en.yml index c9d8f05b2..09fa6735c 100644 --- a/modules/ticket/back/locale/sale/en.yml +++ b/modules/ticket/back/locale/sale/en.yml @@ -1,5 +1,6 @@ name: sale columns: + id: id concept: concept quantity: quantity price: price diff --git a/modules/ticket/back/locale/sale/es.yml b/modules/ticket/back/locale/sale/es.yml index 1d61ffcd0..8654e2a88 100644 --- a/modules/ticket/back/locale/sale/es.yml +++ b/modules/ticket/back/locale/sale/es.yml @@ -1,5 +1,6 @@ name: línea columns: + id: id concept: concepto quantity: cantidad price: precio diff --git a/modules/ticket/back/locale/ticket-tracking/en.yml b/modules/ticket/back/locale/ticket-tracking/en.yml index 497d28cc0..213b9bff5 100644 --- a/modules/ticket/back/locale/ticket-tracking/en.yml +++ b/modules/ticket/back/locale/ticket-tracking/en.yml @@ -1,4 +1,4 @@ -name: tracking +name: state columns: id: id created: created diff --git a/modules/ticket/back/locale/ticket-tracking/es.yml b/modules/ticket/back/locale/ticket-tracking/es.yml index 8018872f4..d8d7a121f 100644 --- a/modules/ticket/back/locale/ticket-tracking/es.yml +++ b/modules/ticket/back/locale/ticket-tracking/es.yml @@ -1,4 +1,4 @@ -name: seguimiento +name: estado columns: id: id created: creado From 6b0fd99eb89b5f1b42b2d657285958e66f25392d Mon Sep 17 00:00:00 2001 From: Juan Ferrer Toribio Date: Fri, 19 May 2023 10:56:15 +0200 Subject: [PATCH 22/33] refs #5667 Fixes: Style, translations, fixtures, UI --- db/dump/fixtures.sql | 20 +++++++++++--------- front/salix/components/log/index.html | 6 +----- front/salix/components/log/index.js | 5 ++++- front/salix/components/log/style.scss | 2 +- modules/ticket/back/locale/sale/es.yml | 2 +- modules/ticket/back/locale/ticket/en.yml | 3 +++ modules/ticket/back/locale/ticket/es.yml | 1 + 7 files changed, 22 insertions(+), 17 deletions(-) diff --git a/db/dump/fixtures.sql b/db/dump/fixtures.sql index 593329963..e1de46135 100644 --- a/db/dump/fixtures.sql +++ b/db/dump/fixtures.sql @@ -2775,16 +2775,18 @@ INSERT INTO `vn`.`ticketLog` (`originFk`, userFk, `action`, changedModel, oldIns (7, 18, 'update', 'Sale', '{"price":3}', '{"price":5}', 1, NULL), (7, 18, 'update', NULL, NULL, NULL, NULL, "Cambio cantidad Melee weapon heavy shield 1x0.5m de '5' a '10'"); -INSERT INTO `vn`.`ticketLog` (originFk, userFk, `action`, creationDate, description, changedModel, oldInstance, newInstance, changedModelId, changedModelValue) +INSERT INTO `vn`.`ticketLog` (originFk, userFk, `action`, creationDate, changedModel, changedModelId, changedModelValue, oldInstance, newInstance, description) VALUES - (7, 18, 'insert', '2001-01-01 10:00:03.0', NULL,'Sale','{"quantity":10}','{"quantity":15}',568,'Batman'), - (7, NULL, 'delete', '2000-12-31 15:00:03.0', NULL,'Ticket','{"quantity":99,"concept":"Chest ammo"}','{"quantity":10,"concept":"Chest ammo box"}',45,'Spider Man'), - (7, 18, 'insert', '2000-12-28 08:40:33.0', NULL,'Sale',NULL,'{"id":4252921,"clientFk":8608,"warehouseFk":60,"shipped":"2023-05-16T22:00:00.000Z","nickname":null,"addressFk":48637,"isSigned":true,"isLabeled":true,"isPrinted":true,"packages":0,"hour":0,"created":"2023-05-16T11:42:56.000Z","isBlocked":false,"hasPriority":false,"companyFk":442,"agencyModeFk":639,"landed":"2023-05-17T22:00:00.000Z","isBoxed":true,"isDeleted":true,"zoneFk":713,"zonePrice":13,"zoneBonus":0}',65893,'Super Man'), - (7, 18, 'select', '2000-12-27 03:40:45.0', 'Cambio cantidad Melee weapon heavy shield 1x0.5m de ''5'' a ''10''',NULL,NULL,NULL,NULL,NULL), - (7, 18, 'insert', '2000-04-10 09:40:15.0', NULL,'Sale','{"quantity":1}','{"quantity":10}',568,'Robin'), - (7, NULL, 'delete', '1999-05-09 10:00:03.0', NULL,'Ticket','{"quantity":1,"concept":"Chest box"}','{"quantity":10,"concept":"Chest ammo box"}',45,'Octopus'), - (7, 18, 'update', '2001-05-09 10:00:03.0', NULL,'Sale','{"id":4252921,"clientFk":8608,"warehouseFk":60,"shipped":"2023-05-16T22:00:00.000Z","nickname":null,"addressFk":48637,"isSigned":true,"isLabeled":true,"isPrinted":true,"packages":0,"hour":0,"created":"2023-05-16T11:42:56.000Z","isBlocked":false,"hasPriority":false,"companyFk":442,"agencyModeFk":639,"landed":"2023-05-17T22:00:00.000Z","isBoxed":true,"isDeleted":true,"zoneFk":713,"zonePrice":13,"zoneBonus":0}','{"id":4252921,"clientFk":8608,"warehouseFk":60,"shipped":"2023-05-16T22:00:00.000Z","nickname":"18 Agrupació comerciants Girona Centre","addressFk":48637,"isSigned":false,"isLabeled":false,"isPrinted":false,"packages":0,"hour":0,"created":"2023-05-16T11:42:56.000Z","isBlocked":true,"hasPriority":true,"companyFk":442,"agencyModeFk":639,"landed":"2023-05-17T22:00:00.000Z","isBoxed":false,"isDeleted":false,"zoneFk":713,"zonePrice":12,"zoneBonus":0}',65893,'Green Man'), - (7, 18, 'select', '2001-06-09 10:00:03.0', NULL,NULL,NULL,NULL,NULL,NULL); + (1, NULL, 'delete', '2001-06-09 11:00:04', 'Ticket', 45, 'Spider Man' , NULL, NULL, NULL), + (1, 18, 'select', '2001-06-09 11:00:03', 'Ticket', 45, 'Spider Man' , NULL, NULL, NULL), + (1, NULL, 'update', '2001-05-09 10:00:02', 'Sale', 69854, 'Armor' , '{"isPicked": false}','{"isPicked": true}', NULL), + (1, 18, 'update', '2001-01-01 10:05:01', 'Sale', 69854, 'Armor' , NULL, NULL, 'Armor quantity changed from ''15'' to ''10'''), + (1, NULL, 'delete', '2001-01-01 10:00:10', 'Sale', 5689, 'Shield' , '{"quantity":10,"concept":"Shield"}', NULL, NULL), + (1, 18, 'insert', '2000-12-31 15:00:05', 'Sale', 69854, 'Armor' , NULL,'{"quantity":15,"concept":"Armor", "price": 345.99, "itemFk": 2}', NULL), + (1, 18, 'update', '2000-12-28 08:40:45', 'Ticket', 45, 'Spider Man' , '{"warehouseFk":60,"shipped":"2023-05-16T22:00:00.000Z","nickname":"Super Man","isSigned":true,"isLabeled":true,"isPrinted":true,"packages":0,"hour":0,"isBlocked":false,"hasPriority":false,"companyFk":442,"landed":"2023-05-17T22:00:00.000Z","isBoxed":true,"isDeleted":true,"zoneFk":713,"zonePrice":13,"zoneBonus":0}','{"warehouseFk":61,"shipped":"2023-05-17T22:00:00.000Z","nickname":"Spider Man","isSigned":false,"isLabeled":false,"isPrinted":false,"packages":1,"hour":0,"isBlocked":true,"hasPriority":true,"companyFk":443,"landed":"2023-05-18T22:00:00.000Z","isBoxed":false,"isDeleted":false,"zoneFk":713,"zonePrice":13,"zoneBonus":1}', NULL), + (1, 18, 'select', '2000-12-27 03:40:30', 'Ticket', 45, NULL , NULL, NULL, NULL), + (1, 18, 'insert', '2000-04-10 09:40:15', 'Sale', 5689, 'Shield' , NULL, '{"quantity":10,"concept":"Shield", "price": 10.5, "itemFk": 1}', NULL), + (1, 18, 'insert', '1999-05-09 10:00:00', 'Ticket', 45, 'Super Man' , NULL, '{"id":45,"clientFk":8608,"warehouseFk":60,"shipped":"2023-05-16T22:00:00.000Z","nickname":"Super Man","addressFk":48637,"isSigned":true,"isLabeled":true,"isPrinted":true,"packages":0,"hour":0,"created":"2023-05-16T11:42:56.000Z","isBlocked":false,"hasPriority":false,"companyFk":442,"agencyModeFk":639,"landed":"2023-05-17T22:00:00.000Z","isBoxed":true,"isDeleted":true,"zoneFk":713,"zonePrice":13,"zoneBonus":0}', NULL); INSERT INTO `vn`.`osTicketConfig` (`id`, `host`, `user`, `password`, `oldStatus`, `newStatusId`, `day`, `comment`, `hostDb`, `userDb`, `passwordDb`, `portDb`, `responseType`, `fromEmailId`, `replyTo`) VALUES diff --git a/front/salix/components/log/index.html b/front/salix/components/log/index.html index 62f5913f4..83f3e6a04 100644 --- a/front/salix/components/log/index.html +++ b/front/salix/components/log/index.html @@ -156,10 +156,6 @@ label="Concept" ng-model="filter.changedModelValue"> - - - + diff --git a/front/salix/components/log/index.js b/front/salix/components/log/index.js index 8b2a739fd..92b85015d 100644 --- a/front/salix/components/log/index.js +++ b/front/salix/components/log/index.js @@ -142,7 +142,10 @@ export default class Controller extends Section { if (value == null || value == '') return null; switch (prop) { case 'changedModelValue': - return {[prop]: {like: `%${value}%`}}; + const or = [{changedModelId: value}]; + if (!/^[0-9]+$/.test(value)) + or.push({changedModelValue: {like: `%${value}%`}}); + return {or}; case 'changes': return {or: [ {oldInstance: {like: `%${value}%`}}, diff --git a/front/salix/components/log/style.scss b/front/salix/components/log/style.scss index 74bc86b26..84ac3da8b 100644 --- a/front/salix/components/log/style.scss +++ b/front/salix/components/log/style.scss @@ -94,7 +94,7 @@ vn-log { .changes { overflow: hidden; background-color: rgba(255, 255, 255, .05); - color: $color-font-secondary; + color: $color-font-light; transition: max-height 1000ms ease-in-out; position: relative; overflow: hidden; diff --git a/modules/ticket/back/locale/sale/es.yml b/modules/ticket/back/locale/sale/es.yml index 8654e2a88..e6a984a5d 100644 --- a/modules/ticket/back/locale/sale/es.yml +++ b/modules/ticket/back/locale/sale/es.yml @@ -6,7 +6,7 @@ columns: price: precio discount: descuento reserved: reservado - isPicked: esta seleccionado + isPicked: cogida created: creado originalQuantity: cantidad original itemFk: artículo diff --git a/modules/ticket/back/locale/ticket/en.yml b/modules/ticket/back/locale/ticket/en.yml index ebfe538e1..55d867a82 100644 --- a/modules/ticket/back/locale/ticket/en.yml +++ b/modules/ticket/back/locale/ticket/en.yml @@ -1,5 +1,6 @@ name: ticket columns: + id: id shipped: shipped landed: landed nickname: nickname @@ -23,6 +24,8 @@ columns: agencyModeFk: agency ticketFk: ticket mergedTicket: merged ticket + withWarningAccept: negative warning + isWithoutNegatives: without negatives isSigned: signed isLabeled: labeled isPrinted: printed diff --git a/modules/ticket/back/locale/ticket/es.yml b/modules/ticket/back/locale/ticket/es.yml index 111c2c33b..4977cd851 100644 --- a/modules/ticket/back/locale/ticket/es.yml +++ b/modules/ticket/back/locale/ticket/es.yml @@ -1,5 +1,6 @@ name: ticket columns: + id: id shipped: salida landed: entrega nickname: alias From 29610e52cc927081574cacbdb251ab5581d8af48 Mon Sep 17 00:00:00 2001 From: Juan Ferrer Toribio Date: Fri, 19 May 2023 11:01:34 +0200 Subject: [PATCH 23/33] refs #5667 No detail label fix --- front/salix/components/log/index.html | 2 +- front/salix/components/log/locale/es.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/front/salix/components/log/index.html b/front/salix/components/log/index.html index 83f3e6a04..8f20c2f7b 100644 --- a/front/salix/components/log/index.html +++ b/front/salix/components/log/index.html @@ -98,7 +98,7 @@ - No changes + No details
diff --git a/front/salix/components/log/locale/es.yml b/front/salix/components/log/locale/es.yml index ae37b2d95..0ff97e7e5 100644 --- a/front/salix/components/log/locale/es.yml +++ b/front/salix/components/log/locale/es.yml @@ -14,6 +14,6 @@ Views: Visualiza System: Sistema note: nota Changes: Cambios -No changes: No hay cambios +No details: Sin detalles today: hoy yesterday: ayer From a190f2152ba18d84e9ddead87d638c407a73c342 Mon Sep 17 00:00:00 2001 From: Juan Ferrer Toribio Date: Fri, 19 May 2023 11:14:29 +0200 Subject: [PATCH 24/33] refs #5667 Fixes: Translations, help --- front/salix/components/log/index.html | 13 ++++++++++--- front/salix/components/log/index.js | 2 +- front/salix/components/log/locale/es.yml | 4 +++- 3 files changed, 14 insertions(+), 5 deletions(-) diff --git a/front/salix/components/log/index.html b/front/salix/components/log/index.html index 8f20c2f7b..0b953a864 100644 --- a/front/salix/components/log/index.html +++ b/front/salix/components/log/index.html @@ -153,11 +153,18 @@ + label="Search" + ng-model="filter.search"> + + + + Date: Fri, 19 May 2023 13:51:20 +0200 Subject: [PATCH 25/33] refs #5667 Style improved --- front/core/components/avatar/index.js | 34 +------------- front/core/lib/string.js | 34 ++++++++++++++ front/salix/components/log/index.html | 26 +++++++---- front/salix/components/log/index.js | 8 ++++ front/salix/components/log/style.scss | 66 ++++++++++++++++++--------- 5 files changed, 104 insertions(+), 64 deletions(-) diff --git a/front/core/components/avatar/index.js b/front/core/components/avatar/index.js index e1aede6be..ec3a27d1d 100644 --- a/front/core/components/avatar/index.js +++ b/front/core/components/avatar/index.js @@ -1,5 +1,6 @@ import ngModule from '../../module'; import Component from 'core/lib/component'; +import {hashToColor} from '../../lib/string'; import './style.scss'; /** @@ -16,13 +17,8 @@ export default class Avatar extends Component { this._val = value; const val = value || ''; - let hash = 0; - for (let i = 0; i < val.length; i++) - hash += val.charCodeAt(i); - const color = '#' + colors[hash % colors.length]; - const el = this.element; - el.style.backgroundColor = color; + el.style.backgroundColor = hashToColor(val); el.title = val; } } @@ -35,29 +31,3 @@ ngModule.vnComponent('vnAvatar', { }, transclude: true }); - -const colors = [ - 'e2553d', // Coral - 'FFA07A', // Salmon - 'FFDAB9', // Peach - 'a17077', // Pink - 'bf0e99', // Pink light - '52a500', // Green chartreuse - '00aeae', // Cian - 'b754cf', // Purple middle - '8a69cd', // Blue lavender - '1fa8a1', // Green ocean - 'DC143C', // Red crimson - '5681cf', // Blue steel - 'FF1493', // Ping intense - '02ba02', // Green lime - '1E90FF', // Blue sky - '8B008B', // Purple dark - 'cc7000', // Orange bright - '00b5b8', // Turquoise - '8B0000', // Red dark - '008080', // Green bluish - '2F4F4F', // Gray board - '7e7e7e', // Gray - '5d5d5d', // Gray dark -]; diff --git a/front/core/lib/string.js b/front/core/lib/string.js index 50bee9873..89477245d 100644 --- a/front/core/lib/string.js +++ b/front/core/lib/string.js @@ -30,3 +30,37 @@ export function camelToKebab(str) { export function firstUpper(str) { return str.charAt(0).toUpperCase() + str.substr(1); } + +export function hashToColor(value) { + value = value || ''; + let hash = 0; + for (let i = 0; i < value.length; i++) + hash += value.charCodeAt(i); + return '#' + colors[hash % colors.length]; +} + +const colors = [ + 'FFA07A', // Salmon + 'FFDAB9', // Peach + 'a17077', // Pink + 'e2553d', // Coral + 'bf0e99', // Pink light + '52a500', // Green chartreuse + '00aeae', // Cian + 'b754cf', // Purple middle + '8a69cd', // Blue lavender + '1fa8a1', // Green ocean + 'DC143C', // Red crimson + '5681cf', // Blue steel + 'FF1493', // Ping intense + '02ba02', // Green lime + '1E90FF', // Blue sky + '8B008B', // Purple dark + 'cc7000', // Orange bright + '00b5b8', // Turquoise + '8B0000', // Red dark + '008080', // Green bluish + '2F4F4F', // Gray board + '7e7e7e', // Gray + '5d5d5d', // Gray dark +]; diff --git a/front/salix/components/log/index.html b/front/salix/components/log/index.html index 0b953a864..4c26533a5 100644 --- a/front/salix/components/log/index.html +++ b/front/salix/components/log/index.html @@ -33,24 +33,30 @@
+
+
+ + +
+
+ {{::log.changedModelI18n}} +
+
{{::$ctrl.relativeDate(log.creationDate)}}
- - {{::$ctrl.actionsText[log.action]}} -
- - {{::log.changedModelI18n}} - + ng-if="::log.changedModelId || log.changedModelValue"> #{{::log.changedModelId}} diff --git a/front/salix/components/log/index.js b/front/salix/components/log/index.js index db03b07b4..82fe4b5ab 100644 --- a/front/salix/components/log/index.js +++ b/front/salix/components/log/index.js @@ -1,5 +1,6 @@ import ngModule from '../../module'; import Section from '../section'; +import {hashToColor} from 'core/lib/string'; import './style.scss'; const validDate = /^(-?(?:[1-9][0-9]*)?[0-9]{4})-(1[0-2]|0[1-9])-(3[01]|0[1-9]|[12][0-9])T(2[0-3]|[01][0-9]):([0-5][0-9]):([0-5][0-9])(.[0-9]+)?(Z)?$/; @@ -7,6 +8,7 @@ const validDate = /^(-?(?:[1-9][0-9]*)?[0-9]{4})-(1[0-2]|0[1-9])-(3[01]|0[1-9]|[ export default class Controller extends Section { constructor($element, $) { super($element, $); + this.hashToColor = hashToColor; this.actionsText = { insert: 'Creates', update: 'Updates', @@ -19,6 +21,12 @@ export default class Controller extends Section { delete: 'alert', select: 'notice' }; + this.actionsIcon = { + insert: 'add', + update: 'update', + delete: 'remove', + select: 'search' + }; this.filter = { include: [{ relation: 'user', diff --git a/front/salix/components/log/style.scss b/front/salix/components/log/style.scss index 84ac3da8b..741af39c4 100644 --- a/front/salix/components/log/style.scss +++ b/front/salix/components/log/style.scss @@ -45,42 +45,64 @@ vn-log { overflow: hidden; & > .header { + display: flex; + justify-content: space-between; overflow: hidden; - text-overflow: ellipsis; - white-space: nowrap; - & > .chip { - display: inline-block; - padding: 1px 5px; - border-radius: 8px; - color: $color-font-bg; + & > .action-model { + display: inline-flex; + align-items: stretch; + height: 22px; + column-gap: 2px; + overflow: hidden; + max-width: 100%; - &.notice { - background-color: $color-notice-medium; + & > .action { + display: flex; + align-items: center; + justify-content: center; + color: $color-font-bg; + vertical-align: middle; + border-radius: 8px 0 0 8px; + min-width: 22px; + + &.notice { + background-color: $color-notice-medium + } + &.success { + background-color: $color-success-medium; + } + &.warning { + background-color: $color-main-medium; + } + &.alert { + background-color: lighten($color-alert, 5%); + } + & > vn-icon { + font-size: 1.2em; + } } - &.success { - background-color: $color-success-medium; - } - &.warning { - background-color: $color-main-medium; - } - &.alert { - background-color: lighten($color-alert, 5%); + & > .model-name { + display: flex; + flex-grow: 1; + align-items: center; + padding: 2px 6px; + color: $color-font-dark; + border-radius: 0 8px 8px 0; + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; } } .date { - float: right; + white-space: nowrap; } } & > .model { overflow: hidden; text-overflow: ellipsis; white-space: nowrap; - color: lighten($color-primary, 10%); - & > .model-name { - color: $color-font; - } & > .model-value { font-style: italic; } From c1e222db831d19714558b158b3464ed665082b42 Mon Sep 17 00:00:00 2001 From: Juan Ferrer Toribio Date: Fri, 19 May 2023 14:31:16 +0200 Subject: [PATCH 26/33] refs #5667 Style fixes --- front/salix/components/log/index.html | 26 ++++++------ front/salix/components/log/style.scss | 57 +++++++++++++-------------- 2 files changed, 41 insertions(+), 42 deletions(-) diff --git a/front/salix/components/log/index.html b/front/salix/components/log/index.html index 4c26533a5..9b773722e 100644 --- a/front/salix/components/log/index.html +++ b/front/salix/components/log/index.html @@ -16,7 +16,7 @@ + class="vn-w-sm vn-px-sm">
-
-
+
+ -
-
+
+
+ {{::log.changedModelI18n}} -
-
-
- {{::$ctrl.relativeDate(log.creationDate)}} +
.action { - display: flex; - align-items: center; - justify-content: center; - color: $color-font-bg; - vertical-align: middle; - border-radius: 8px 0 0 8px; - min-width: 22px; - - &.notice { - background-color: $color-notice-medium - } - &.success { - background-color: $color-success-medium; - } - &.warning { - background-color: $color-main-medium; - } - &.alert { - background-color: lighten($color-alert, 5%); - } - & > vn-icon { - font-size: 1.2em; - } - } & > .model-name { - display: flex; - flex-grow: 1; - align-items: center; - padding: 2px 6px; + display: inline-block; + padding: 2px 5px; color: $color-font-dark; - border-radius: 0 8px 8px 0; + border-radius: 8px; overflow: hidden; text-overflow: ellipsis; white-space: nowrap; @@ -97,6 +70,30 @@ vn-log { .date { white-space: nowrap; } + .action { + display: inline-flex; + align-items: center; + justify-content: center; + color: $color-font-bg; + vertical-align: middle; + border-radius: 50%; + width: 24px; + height: 24px; + font-size: 1.5em; + + &.notice { + background-color: $color-notice-medium + } + &.success { + background-color: $color-success-medium; + } + &.warning { + background-color: $color-main-medium; + } + &.alert { + background-color: lighten($color-alert, 5%); + } + } } & > .model { overflow: hidden; From 718002d5aaec94b624e8c90d728ed493bcd222cf Mon Sep 17 00:00:00 2001 From: Juan Ferrer Toribio Date: Fri, 19 May 2023 14:38:45 +0200 Subject: [PATCH 27/33] refs #5667 Style fixes --- front/salix/components/log/index.html | 17 +++++---- front/salix/components/log/style.scss | 51 +++++++++++++-------------- 2 files changed, 32 insertions(+), 36 deletions(-) diff --git a/front/salix/components/log/index.html b/front/salix/components/log/index.html index 9b773722e..b41436adf 100644 --- a/front/salix/components/log/index.html +++ b/front/salix/components/log/index.html @@ -34,17 +34,16 @@
- - - {{::$ctrl.relativeDate(log.creationDate)}} - + + + {{::$ctrl.relativeDate(log.creationDate)}}
.action-model { display: inline-flex; - align-items: stretch; - height: 22px; - column-gap: 2px; overflow: hidden; - max-width: 100%; & > .model-name { display: inline-block; @@ -67,31 +63,32 @@ vn-log { white-space: nowrap; } } - .date { + .action-date { white-space: nowrap; - } - .action { - display: inline-flex; - align-items: center; - justify-content: center; - color: $color-font-bg; - vertical-align: middle; - border-radius: 50%; - width: 24px; - height: 24px; - font-size: 1.5em; - &.notice { - background-color: $color-notice-medium - } - &.success { - background-color: $color-success-medium; - } - &.warning { - background-color: $color-main-medium; - } - &.alert { - background-color: lighten($color-alert, 5%); + .action { + display: inline-flex; + align-items: center; + justify-content: center; + color: $color-font-bg; + vertical-align: middle; + border-radius: 50%; + width: 24px; + height: 24px; + font-size: 1.5em; + + &.notice { + background-color: $color-notice-medium + } + &.success { + background-color: $color-success-medium; + } + &.warning { + background-color: $color-main-medium; + } + &.alert { + background-color: lighten($color-alert, 5%); + } } } } From 1160cbc279477e203b4ddd4d75d52230970cf6b2 Mon Sep 17 00:00:00 2001 From: Juan Ferrer Toribio Date: Sat, 20 May 2023 13:50:55 +0200 Subject: [PATCH 28/33] refs #5667 Fixes: Style, translations, icons --- front/core/lib/string.js | 13 ++++---- front/salix/components/log/index.html | 30 +++++++------------ front/salix/components/log/index.js | 8 ++--- front/salix/components/log/locale/es.yml | 6 ++-- front/salix/components/log/style.scss | 38 ++++++++++-------------- 5 files changed, 40 insertions(+), 55 deletions(-) diff --git a/front/core/lib/string.js b/front/core/lib/string.js index 89477245d..c4546a9a2 100644 --- a/front/core/lib/string.js +++ b/front/core/lib/string.js @@ -31,12 +31,15 @@ export function firstUpper(str) { return str.charAt(0).toUpperCase() + str.substr(1); } +export function djb2a(string) { + let hash = 5381; + for (let i = 0; i < string.length; i++) + hash = ((hash << 5) + hash) ^ string.charCodeAt(i); + return hash >>> 0; +} + export function hashToColor(value) { - value = value || ''; - let hash = 0; - for (let i = 0; i < value.length; i++) - hash += value.charCodeAt(i); - return '#' + colors[hash % colors.length]; + return '#' + colors[djb2a(value || '') % colors.length]; } const colors = [ diff --git a/front/salix/components/log/index.html b/front/salix/components/log/index.html index b41436adf..6e9eeff3e 100644 --- a/front/salix/components/log/index.html +++ b/front/salix/components/log/index.html @@ -36,12 +36,11 @@
- + translate-attr="::{title: $ctrl.actionsText[log.action]}"> {{::$ctrl.relativeDate(log.creationDate)}}
@@ -66,17 +65,14 @@ {{::log.changedModelValue}}
-
-
- - - - -
+
+ +
- + {{::log.description}} - - No details -
diff --git a/front/salix/components/log/index.js b/front/salix/components/log/index.js index 82fe4b5ab..7452c6636 100644 --- a/front/salix/components/log/index.js +++ b/front/salix/components/log/index.js @@ -11,9 +11,9 @@ export default class Controller extends Section { this.hashToColor = hashToColor; this.actionsText = { insert: 'Creates', - update: 'Updates', + update: 'Edits', delete: 'Deletes', - select: 'Views' + select: 'Accesses' }; this.actionsClass = { insert: 'success', @@ -23,9 +23,9 @@ export default class Controller extends Section { }; this.actionsIcon = { insert: 'add', - update: 'update', + update: 'edit', delete: 'remove', - select: 'search' + select: 'visibility' }; this.filter = { include: [{ diff --git a/front/salix/components/log/locale/es.yml b/front/salix/components/log/locale/es.yml index 6890b35a9..b73346ce1 100644 --- a/front/salix/components/log/locale/es.yml +++ b/front/salix/components/log/locale/es.yml @@ -10,12 +10,12 @@ After: Despues History: Historial Name: Nombre Creates: Crea -Updates: Actualiza +Edits: Edita Deletes: Elimina -Views: Visualiza +Accesses: Accede System: Sistema +Details: Detalles note: nota Changes: Cambios -No details: Sin detalles today: hoy yesterday: ayer diff --git a/front/salix/components/log/style.scss b/front/salix/components/log/style.scss index 117ee87e1..7a5e18049 100644 --- a/front/salix/components/log/style.scss +++ b/front/salix/components/log/style.scss @@ -1,4 +1,5 @@ @import "variables"; +@import "effects"; vn-log { .change { @@ -47,6 +48,7 @@ vn-log { & > .header { display: flex; justify-content: space-between; + align-items: center; overflow: hidden; & > .action-model { @@ -63,10 +65,10 @@ vn-log { white-space: nowrap; } } - .action-date { + & > .action-date { white-space: nowrap; - .action { + & > .action { display: inline-flex; align-items: center; justify-content: center; @@ -75,7 +77,7 @@ vn-log { border-radius: 50%; width: 24px; height: 24px; - font-size: 1.5em; + font-size: 1.4em; &.notice { background-color: $color-notice-medium @@ -111,7 +113,6 @@ vn-log { overflow: hidden; background-color: rgba(255, 255, 255, .05); color: $color-font-light; - transition: max-height 1000ms ease-in-out; position: relative; overflow: hidden; text-overflow: ellipsis; @@ -119,32 +120,23 @@ vn-log { min-height: 34px; box-sizing: border-box; - & > .icon { + & > vn-icon { + @extend %clickable; float: right; position: relative; - cursor: pointer; - - & > vn-icon { - font-size: 1.2em; - } - & > .expand-button { - display: block; - } - & > .shrink-button { - display: none; - } + transition-property: transform, background-color; + transition-duration: 150ms; + margin: -5px; + margin-left: 4px; + padding: 1px; + border-radius: 50%; } &.expanded { text-overflow: initial; white-space: initial; - & > .icon { - & > .expand-button { - display: none; - } - & > .shrink-button { - display: block; - } + & > vn-icon { + transform: rotate(180deg); } } & > .no-changes { From 35331e355fe1e44ffc630154b2bca9c5f16af711 Mon Sep 17 00:00:00 2001 From: Juan Ferrer Toribio Date: Sat, 20 May 2023 14:09:11 +0200 Subject: [PATCH 29/33] refs #5667 Fixes: Colors, translation --- front/core/lib/string.js | 35 ++++++++++++------------ front/salix/components/log/locale/es.yml | 2 +- 2 files changed, 18 insertions(+), 19 deletions(-) diff --git a/front/core/lib/string.js b/front/core/lib/string.js index c4546a9a2..fd634b31b 100644 --- a/front/core/lib/string.js +++ b/front/core/lib/string.js @@ -43,27 +43,26 @@ export function hashToColor(value) { } const colors = [ - 'FFA07A', // Salmon + 'b5b941', // Yellow 'FFDAB9', // Peach - 'a17077', // Pink - 'e2553d', // Coral - 'bf0e99', // Pink light - '52a500', // Green chartreuse - '00aeae', // Cian - 'b754cf', // Purple middle - '8a69cd', // Blue lavender - '1fa8a1', // Green ocean - 'DC143C', // Red crimson - '5681cf', // Blue steel - 'FF1493', // Ping intense - '02ba02', // Green lime - '1E90FF', // Blue sky - '8B008B', // Purple dark + 'FFA07A', // Salmon 'cc7000', // Orange bright - '00b5b8', // Turquoise + 'e2553d', // Coral '8B0000', // Red dark - '008080', // Green bluish - '2F4F4F', // Gray board + 'de4362', // Red crimson + 'FF1493', // Ping intense + 'be39a2', // Pink light + 'b754cf', // Purple middle + 'a87ba8', // Pink + '8a69cd', // Blue lavender + 'ab20ab', // Purple dark + '00b5b8', // Turquoise + '1fa8a1', // Green ocean + '5681cf', // Blue steel + '3399fe', // Blue sky + '6d9c3e', // Green chartreuse + '51bb51', // Green lime + '518b8b', // Gray board '7e7e7e', // Gray '5d5d5d', // Gray dark ]; diff --git a/front/salix/components/log/locale/es.yml b/front/salix/components/log/locale/es.yml index b73346ce1..95d930716 100644 --- a/front/salix/components/log/locale/es.yml +++ b/front/salix/components/log/locale/es.yml @@ -10,7 +10,7 @@ After: Despues History: Historial Name: Nombre Creates: Crea -Edits: Edita +Edits: Modifica Deletes: Elimina Accesses: Accede System: Sistema From 08e0bf7ddd49acf39c6048927ee2a4bfb143e724 Mon Sep 17 00:00:00 2001 From: Juan Ferrer Toribio Date: Sat, 20 May 2023 14:16:24 +0200 Subject: [PATCH 30/33] refs #5667 Color fixes --- front/core/lib/string.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/front/core/lib/string.js b/front/core/lib/string.js index fd634b31b..9f68ef8bb 100644 --- a/front/core/lib/string.js +++ b/front/core/lib/string.js @@ -44,8 +44,8 @@ export function hashToColor(value) { const colors = [ 'b5b941', // Yellow - 'FFDAB9', // Peach - 'FFA07A', // Salmon + 'ae9681', // Peach + 'd78767', // Salmon 'cc7000', // Orange bright 'e2553d', // Coral '8B0000', // Red dark From a4beb84e665b26ce45d396daf638ca5ba62dd62c Mon Sep 17 00:00:00 2001 From: Juan Ferrer Toribio Date: Sat, 20 May 2023 16:49:34 +0200 Subject: [PATCH 31/33] refs #5667 Translations fixes --- front/salix/components/log/index.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/front/salix/components/log/index.html b/front/salix/components/log/index.html index 6e9eeff3e..e656231ff 100644 --- a/front/salix/components/log/index.html +++ b/front/salix/components/log/index.html @@ -180,7 +180,7 @@ ng-model="filter.actions.insert"> From 69b892f2fd0d31a4f2d8b4c453546def49f73910 Mon Sep 17 00:00:00 2001 From: Juan Ferrer Toribio Date: Sat, 20 May 2023 16:59:39 +0200 Subject: [PATCH 32/33] refs #5667 Translations --- modules/ticket/back/locale/expedition/en.yml | 4 ++++ modules/ticket/back/locale/expedition/es.yml | 4 ++++ modules/ticket/back/locale/ticket/en.yml | 1 + modules/ticket/back/locale/ticket/es.yml | 1 + 4 files changed, 10 insertions(+) diff --git a/modules/ticket/back/locale/expedition/en.yml b/modules/ticket/back/locale/expedition/en.yml index 1834984ea..5ec5d5ecd 100644 --- a/modules/ticket/back/locale/expedition/en.yml +++ b/modules/ticket/back/locale/expedition/en.yml @@ -8,3 +8,7 @@ columns: agencyModeFk: agency workerFk: worker packagingFk: packaging + hasNewRoute: new route + hostFk: PC + isBox: box + itemPackingTypeFk: packing type diff --git a/modules/ticket/back/locale/expedition/es.yml b/modules/ticket/back/locale/expedition/es.yml index 32f72b943..cda577f18 100644 --- a/modules/ticket/back/locale/expedition/es.yml +++ b/modules/ticket/back/locale/expedition/es.yml @@ -8,3 +8,7 @@ columns: agencyModeFk: agencia workerFk: trabajador packagingFk: embalaje + hasNewRoute: nueva ruta + hostFk: PC + isBox: caja + itemPackingTypeFk: tipo empaquetado diff --git a/modules/ticket/back/locale/ticket/en.yml b/modules/ticket/back/locale/ticket/en.yml index 55d867a82..96f7569ef 100644 --- a/modules/ticket/back/locale/ticket/en.yml +++ b/modules/ticket/back/locale/ticket/en.yml @@ -34,3 +34,4 @@ columns: isBlocked: bloqued hasPriority: priority isBoxed: boxed + clonedFrom: cloned from diff --git a/modules/ticket/back/locale/ticket/es.yml b/modules/ticket/back/locale/ticket/es.yml index 4977cd851..1cb8f478e 100644 --- a/modules/ticket/back/locale/ticket/es.yml +++ b/modules/ticket/back/locale/ticket/es.yml @@ -34,3 +34,4 @@ columns: isBlocked: bloqueado hasPriority: prioritario isBoxed: encajado + clonedFrom: Clonado de From e08f84881214e446417238fd0a6aa6923b47dacb Mon Sep 17 00:00:00 2001 From: Juan Ferrer Toribio Date: Sun, 21 May 2023 14:35:50 +0200 Subject: [PATCH 33/33] refs #5667 Model id html fix --- front/salix/components/log/index.html | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/front/salix/components/log/index.html b/front/salix/components/log/index.html index e656231ff..d5675975b 100644 --- a/front/salix/components/log/index.html +++ b/front/salix/components/log/index.html @@ -57,13 +57,8 @@ class="model vn-pb-sm vn-px-sm" title="{{::log.changedModelValue}}" ng-if="::log.changedModelId || log.changedModelValue"> - - #{{::log.changedModelId}} - - - {{::log.changedModelValue}} - + #{{::log.changedModelId}} + {{::log.changedModelValue}}