diff --git a/front/salix/components/log/index.js b/front/salix/components/log/index.js
index 803eea45e..7452c6636 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,11 +8,12 @@ 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',
+ update: 'Edits',
delete: 'Deletes',
- select: 'Views'
+ select: 'Accesses'
};
this.actionsClass = {
insert: 'success',
@@ -19,6 +21,12 @@ export default class Controller extends Section {
delete: 'alert',
select: 'notice'
};
+ this.actionsIcon = {
+ insert: 'add',
+ update: 'edit',
+ delete: 'remove',
+ select: 'visibility'
+ };
this.filter = {
include: [{
relation: 'user',
@@ -55,14 +63,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,11 +79,27 @@ 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])
});
}
+ log.props.sort(
+ (a, b) => a.nameI18n.localeCompare(b.nameI18n));
+ }
+ }
+
+ 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;
}
}
@@ -93,11 +117,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);
@@ -130,8 +149,17 @@ export default class Controller extends Section {
function getParam(prop, value) {
if (value == null || value == '') return null;
switch (prop) {
- case 'changedModelValue':
- return {[prop]: {like: `%${value}%`}};
+ case 'search':
+ const or = [{changedModelId: value}];
+ if (!/^[0-9]+$/.test(value))
+ or.push({changedModelValue: {like: `%${value}%`}});
+ return {or};
+ case 'changes':
+ return {or: [
+ {oldInstance: {like: `%${value}%`}},
+ {newInstance: {like: `%${value}%`}},
+ {description: {like: `%${value}%`}}
+ ]};
case 'who':
switch (value) {
case 'all':
@@ -195,6 +223,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/locale/es.yml b/front/salix/components/log/locale/es.yml
index 385b42147..95d930716 100644
--- a/front/salix/components/log/locale/es.yml
+++ b/front/salix/components/log/locale/es.yml
@@ -1,5 +1,8 @@
Date: Fecha
-Model: Modelo
+Concept: Concepto
+Search: Buscar
+Search by id or concept: Buscar por identificador o concepto
+Entity: Entidad
Action: Acción
Author: Autor
Before: Antes
@@ -7,12 +10,12 @@ After: Despues
History: Historial
Name: Nombre
Creates: Crea
-Updates: Actualiza
+Edits: Modifica
Deletes: Elimina
-Views: Visualiza
+Accesses: Accede
System: Sistema
+Details: Detalles
note: nota
Changes: Cambios
-No changes: No hay cambios
today: hoy
yesterday: ayer
diff --git a/front/salix/components/log/style.scss b/front/salix/components/log/style.scss
index b78dc3824..7a5e18049 100644
--- a/front/salix/components/log/style.scss
+++ b/front/salix/components/log/style.scss
@@ -1,10 +1,11 @@
@import "variables";
+@import "effects";
vn-log {
.change {
display: flex;
- & > .user-wrapper {
+ & > .left {
position: relative;
padding-right: 10px;
@@ -34,7 +35,7 @@ vn-log {
bottom: -8px;
}
}
- &:last-child > .user-wrapper > .line {
+ &:last-child > .left > .line {
display: none;
}
.detail {
@@ -45,31 +46,52 @@ vn-log {
overflow: hidden;
& > .header {
+ display: flex;
+ justify-content: space-between;
+ align-items: center;
overflow: hidden;
- text-overflow: ellipsis;
- white-space: nowrap;
- & > .chip {
- padding: 2px 4px;
- border-radius: 4px;
- display: inline-block;
- color: $color-font-bg;
+ & > .action-model {
+ display: inline-flex;
+ overflow: hidden;
- &.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-name {
+ display: inline-block;
+ padding: 2px 5px;
+ color: $color-font-dark;
+ border-radius: 8px;
+ overflow: hidden;
+ text-overflow: ellipsis;
+ white-space: nowrap;
}
}
- .date {
- float: right;
+ & > .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.4em;
+
+ &.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 {
@@ -77,16 +99,12 @@ vn-log {
text-overflow: ellipsis;
white-space: nowrap;
- & > .model-name {
- text-transform: capitalize;
- }
& > .model-value {
font-style: italic;
- color: #c7bd2b;
}
& > .model-id {
color: $color-font-secondary;
- font-size: .9em;
+ font-size: .9rem;
}
}
}
@@ -94,59 +112,35 @@ 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;
+ color: $color-font-light;
position: relative;
+ overflow: hidden;
+ text-overflow: ellipsis;
+ white-space: nowrap;
+ min-height: 34px;
+ box-sizing: border-box;
- & > .expand-button,
- & > .shrink-button {
- display: none;
+ & > vn-icon {
+ @extend %clickable;
+ float: right;
+ position: relative;
+ transition-property: transform, background-color;
+ transition-duration: 150ms;
+ margin: -5px;
+ margin-left: 4px;
+ padding: 1px;
+ border-radius: 50%;
}
- &.props {
- padding-right: 24px;
+ &.expanded {
+ text-overflow: initial;
+ white-space: initial;
- & > .expand-button,
- & > .shrink-button {
- position: absolute;
- top: 6px;
- right: 8px;
- font-size: inherit;
- float: right;
- cursor: pointer;
- }
- & > .expand-button {
- display: block;
- }
- &.expanded {
- max-height: 500px;
- padding-right: 0;
-
- & > .changes-wrapper {
- text-overflow: initial;
- white-space: initial;
- }
- & > .shrink-button {
- display: block;
- }
- & > .expand-button {
- display: none;
- }
+ & > vn-icon {
+ transform: rotate(180deg);
}
}
- & > .changes-wrapper {
- padding: 4px 6px;
- overflow: hidden;
- text-overflow: ellipsis;
- white-space: nowrap;
-
- & > .no-changes {
- font-style: italic;
- }
- .json-field {
- text-transform: capitalize;
- }
+ & > .no-changes {
+ font-style: italic;
}
}
}
diff --git a/front/salix/components/reset-password/index.js b/front/salix/components/reset-password/index.js
index 20c6c34fe..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('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');
diff --git a/loopback/locale/en.json b/loopback/locale/en.json
index cffedd891..e950b981b 100644
--- a/loopback/locale/en.json
+++ b/loopback/locale/en.json
@@ -172,4 +172,4 @@
"Comment added to client": "Comment added to client",
"This ticket is already a refund": "This ticket is already a refund",
"A claim with that sale already exists": "A claim with that sale already exists"
-}
\ No newline at end of file
+}
diff --git a/loopback/locale/es.json b/loopback/locale/es.json
index 45993bdd5..d88a4ebc9 100644
--- a/loopback/locale/es.json
+++ b/loopback/locale/es.json
@@ -84,6 +84,7 @@
"The current ticket can't be modified": "El ticket actual no puede ser modificado",
"The current claim can't be modified": "La reclamación actual no puede ser modificada",
"The sales of this ticket can't be modified": "Las lineas de este ticket no pueden ser modificadas",
+ "The sales do not exists": "La(s) línea(s) seleccionada(s) no existe(n)",
"Please select at least one sale": "Por favor selecciona al menos una linea",
"All sales must belong to the same ticket": "Todas las lineas deben pertenecer al mismo ticket",
"NO_ZONE_FOR_THIS_PARAMETERS": "Para este día no hay ninguna zona configurada",
@@ -290,5 +291,7 @@
"isTaxDataChecked": "Datos comprobados",
"comercialId": "Id comercial",
"comercialName": "Comercial",
- "Invalid NIF for VIES": "Invalid NIF for VIES"
-}
\ No newline at end of file
+ "Invalid NIF for VIES": "Invalid NIF for VIES",
+ "Ticket does not exist": "Este ticket no existe",
+ "Ticket is already signed": "Este ticket ya ha sido firmado"
+}
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/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/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-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..4c355ab7f 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
@@ -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 6311eb25a..5293adaa8 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
@@ -6,3 +6,5 @@ columns:
typeFk: tipo
userFk: usuario
companyFk: compañia
+ workerFk: trabajador
+ balance: balance
diff --git a/modules/client/back/locale/client/en.yml b/modules/client/back/locale/client/en.yml
index 71048f657..74384461c 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,22 +14,22 @@ 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
- hasLcr: lcr
- hasCoreVnl: core vnl
- hasCoreVnh: core vnh
+ isToBeMailed: mailed
+ hasSepaVnl: sepa VNL
+ 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
@@ -47,4 +47,9 @@ columns:
defaultAddressFk: default address
bankEntityFk: bank entity
transferorFk: transferor
+ riskCalculated: risk calculated
+ 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 04e391af0..47bf896d9 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,27 +14,27 @@ 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
- hasLcr: lcr
- hasCoreVnl: centro vnl
- hasCoreVnh: cenrto vnh
+ hasSepaVnl: sepa VNL
+ 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
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,9 @@ columns:
defaultAddressFk: dirección predeterminada
bankEntityFk: entidad bancaria
transferorFk: cedente
+ riskCalculated: riesgo calculado
+ 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/client/back/methods/client/summary.js b/modules/client/back/methods/client/summary.js
index caa3d8033..7dab1f68b 100644
--- a/modules/client/back/methods/client/summary.js
+++ b/modules/client/back/methods/client/summary.js
@@ -27,7 +27,6 @@ module.exports = Self => {
Object.assign(myOptions, options);
const summaryObj = await getSummary(models.Client, clientFk, myOptions);
-
summaryObj.mana = await models.Client.getMana(clientFk, myOptions);
summaryObj.debt = await models.Client.getDebt(clientFk, myOptions);
summaryObj.averageInvoiced = await models.Client.getAverageInvoiced(clientFk, myOptions);
@@ -115,6 +114,12 @@ module.exports = Self => {
fields: ['claimingRate', 'priceIncreasing'],
limit: 1
}
+ },
+ {
+ relation: 'businessType',
+ scope: {
+ fields: ['description']
+ }
}
],
where: {id: clientId}
diff --git a/modules/client/back/methods/defaulter/filter.js b/modules/client/back/methods/defaulter/filter.js
index 748581913..736c29f9c 100644
--- a/modules/client/back/methods/defaulter/filter.js
+++ b/modules/client/back/methods/defaulter/filter.js
@@ -67,9 +67,13 @@ module.exports = Self => {
uw.id workerFk,
uw.name workerName,
c.creditInsurance,
- d.defaulterSinced
+ d.defaulterSinced,
+ cn.country,
+ pm.name payMethod
FROM vn.defaulter d
JOIN vn.client c ON c.id = d.clientFk
+ JOIN vn.country cn ON cn.id = c.countryFk
+ JOIN vn.payMethod pm ON pm.id = c.payMethodFk
LEFT JOIN vn.clientObservation co ON co.clientFk = c.id
LEFT JOIN account.user u ON u.id = c.salesPersonFk
LEFT JOIN account.user uw ON uw.id = co.workerFk
diff --git a/modules/client/back/models/defaulter.json b/modules/client/back/models/defaulter.json
index ddff1d214..03d68ea71 100644
--- a/modules/client/back/models/defaulter.json
+++ b/modules/client/back/models/defaulter.json
@@ -29,6 +29,16 @@
"type": "belongsTo",
"model": "Client",
"foreignKey": "clientFk"
+ },
+ "country": {
+ "type": "belongsTo",
+ "model": "Country",
+ "foreignKey": "country"
+ },
+ "payMethod": {
+ "type": "belongsTo",
+ "model": "PayMethod",
+ "foreignKey": "payMethod"
}
}
}
\ No newline at end of file
diff --git a/modules/client/front/defaulter/index.html b/modules/client/front/defaulter/index.html
index 8f22629a9..4f662b62b 100644
--- a/modules/client/front/defaulter/index.html
+++ b/modules/client/front/defaulter/index.html
@@ -57,6 +57,13 @@
|
Comercial
|
+
+ Country
+ |
+
+ P.Method
+ |
@@ -111,6 +118,12 @@
{{::defaulter.salesPersonName | dashIfEmpty}}
+ |
+ {{::defaulter.country}}
+ |
+
+ {{::defaulter.payMethod}}
+ |
{{::defaulter.amount | currency: 'EUR': 2}} |
+
+
diff --git a/modules/client/front/summary/locale/es.yml b/modules/client/front/summary/locale/es.yml
index ca6e96fef..c1fde0c17 100644
--- a/modules/client/front/summary/locale/es.yml
+++ b/modules/client/front/summary/locale/es.yml
@@ -23,3 +23,4 @@ Latest tickets: Últimos tickets
Rating: Clasificación
Value from 1 to 20. The higher the better value: Valor del 1 al 20. Cuanto más alto mejor valoración
Go to grafana: Ir a grafana
+Business type: Tipo de negocio
\ No newline at end of file
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/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 d65288954..4b75b4704 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
@@ -44,4 +44,6 @@ columns:
intrastatFk: intrastat
genericFk: genérico
itemFk: artículo
+ density: densidad
+ compression: compresión
diff --git a/modules/item/back/methods/item/getBalance.js b/modules/item/back/methods/item/getBalance.js
index 50372652d..5751b0a04 100644
--- a/modules/item/back/methods/item/getBalance.js
+++ b/modules/item/back/methods/item/getBalance.js
@@ -26,8 +26,8 @@ module.exports = Self => {
Object.assign(myOptions, options);
const where = filter.where;
- const query = 'CALL vn.item_getBalance(?, ?)';
- const [diary] = await Self.rawSql(query, [where.itemFk, where.warehouseFk], myOptions);
+ const query = 'CALL vn.item_getBalance(?, ?, ?)';
+ const [diary] = await Self.rawSql(query, [where.itemFk, where.warehouseFk, where.date], myOptions);
for (const entry of diary)
if (entry.clientType === 'loses') entry.highlighted = true;
diff --git a/modules/item/back/methods/item/specs/getBalance.spec.js b/modules/item/back/methods/item/specs/getBalance.spec.js
index 779516b19..1ffd3c302 100644
--- a/modules/item/back/methods/item/specs/getBalance.spec.js
+++ b/modules/item/back/methods/item/specs/getBalance.spec.js
@@ -21,7 +21,8 @@ describe('item getBalance()', () => {
const filter = {
where: {
itemFk: 1,
- warehouseFk: 1
+ warehouseFk: 1,
+ date: null
}
};
const results = await models.Item.getBalance(filter, options);
@@ -45,14 +46,16 @@ describe('item getBalance()', () => {
const firstFilter = {
where: {
itemFk: 1,
- warehouseFk: 1
+ warehouseFk: 1,
+ date: null
}
};
const secondFilter = {
where: {
itemFk: 2,
- warehouseFk: 1
+ warehouseFk: 1,
+ date: null
}
};
diff --git a/modules/item/front/diary/index.html b/modules/item/front/diary/index.html
index 0f00f5854..481cec51a 100644
--- a/modules/item/front/diary/index.html
+++ b/modules/item/front/diary/index.html
@@ -25,6 +25,16 @@
ng-model="$ctrl.warehouseFk"
label="Select warehouse">
+
+
+
+
@@ -44,7 +54,7 @@
-
{{::sale.shipped | date:'dd/MM/yyyy' }}
@@ -99,13 +109,13 @@
-
-
-
diff --git a/modules/item/front/diary/index.js b/modules/item/front/diary/index.js
index 03134913f..1d2e34a66 100644
--- a/modules/item/front/diary/index.js
+++ b/modules/item/front/diary/index.js
@@ -38,12 +38,8 @@ class Controller extends Section {
if (value && value != this._warehouseFk) {
this._warehouseFk = value;
this.card.warehouseFk = value;
+ this.filter.where.warehouseFk = this.warehouseFk;
- this.$state.go(this.$state.current.name, {
- warehouseFk: value
- });
-
- this.filter.where.warehouseFk = value;
this.$.model.refresh();
}
}
@@ -52,6 +48,28 @@ class Controller extends Section {
return this._warehouseFk;
}
+ set date(value) {
+ this._date = value;
+ this.filter.where.date = value;
+ this.filter.where.warehouseFk = this.warehouseFk;
+
+ this.$.model.refresh();
+ }
+
+ get date() {
+ return this._date;
+ }
+
+ set showOld(value) {
+ this._showOld = value;
+ if (!this._showOld) this.date = null;
+ else this.date = new Date();
+ }
+
+ get showOld() {
+ return this._showOld;
+ }
+
scrollToLine(lineFk) {
this.$.$applyAsync(() => {
const hashFk = this.lineFk || lineFk;
diff --git a/modules/item/front/diary/locale/es.yml b/modules/item/front/diary/locale/es.yml
index e00816d78..a312da774 100644
--- a/modules/item/front/diary/locale/es.yml
+++ b/modules/item/front/diary/locale/es.yml
@@ -1,4 +1,5 @@
In: Entrada
Out: Salida
Visible quantity: Cantidad visible
-Ticket/Entry: Ticket/Entrada
\ No newline at end of file
+Ticket/Entry: Ticket/Entrada
+Show what's before the inventory: Mostrar lo anterior al inventario
diff --git a/modules/item/front/diary/style.scss b/modules/item/front/diary/style.scss
index e8d261ec2..0a6cafcb9 100644
--- a/modules/item/front/diary/style.scss
+++ b/modules/item/front/diary/style.scss
@@ -27,4 +27,7 @@ vn-item-diary {
overflow: hidden;
text-overflow: ellipsis;
}
-}
\ No newline at end of file
+ .table-check{
+ justify-content: center;
+ }
+}
diff --git a/modules/item/front/fixed-price/style.scss b/modules/item/front/fixed-price/style.scss
index 97ceaf7cd..f70ec2f50 100644
--- a/modules/item/front/fixed-price/style.scss
+++ b/modules/item/front/fixed-price/style.scss
@@ -2,8 +2,8 @@
vn-fixed-price{
smart-table table{
[shrink-field]{
- width: 80px;
- max-width: 80px;
+ width: 90px;
+ max-width: 90px;
}
[shrink-field-expand]{
width: 150px;
@@ -15,8 +15,8 @@ vn-fixed-price{
align-items: center;
text-align: center;
vn-input-number {
- width: 90px;
- max-width: 90px;
+ width: 75px;
+ max-width: 75px;
}
}
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/route/front/main/index.html b/modules/route/front/main/index.html
index 7d4cd33ee..f1bed84ff 100644
--- a/modules/route/front/main/index.html
+++ b/modules/route/front/main/index.html
@@ -2,7 +2,7 @@
vn-id="model"
url="Routes/filter"
limit="20"
- order="created DESC">
+ order="created DESC, id DESC">
-
\ No newline at end of file
+
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/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/sale/en.yml b/modules/ticket/back/locale/sale/en.yml
index f844bf0c5..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
@@ -11,3 +12,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..e6a984a5d 100644
--- a/modules/ticket/back/locale/sale/es.yml
+++ b/modules/ticket/back/locale/sale/es.yml
@@ -1,13 +1,18 @@
name: línea
columns:
+ id: id
concept: concepto
quantity: cantidad
price: precio
discount: descuento
reserved: reservado
- isPicked: esta seleccionado
+ isPicked: cogida
created: creado
originalQuantity: cantidad original
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-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 15505a763..213b9bff5 100644
--- a/modules/ticket/back/locale/ticket-tracking/en.yml
+++ b/modules/ticket/back/locale/ticket-tracking/en.yml
@@ -1,7 +1,8 @@
-name: ticket tracking
+name: state
columns:
id: id
created: created
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..d8d7a121f 100644
--- a/modules/ticket/back/locale/ticket-tracking/es.yml
+++ b/modules/ticket/back/locale/ticket-tracking/es.yml
@@ -1,7 +1,8 @@
-name: seguimiento ticket
+name: estado
columns:
id: id
created: creado
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..96f7569ef 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,3 +24,14 @@ columns:
agencyModeFk: agency
ticketFk: ticket
mergedTicket: merged ticket
+ withWarningAccept: negative warning
+ isWithoutNegatives: without negatives
+ isSigned: signed
+ isLabeled: labeled
+ isPrinted: printed
+ hour: hour
+ created: created
+ 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 558378612..1cb8f478e 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
@@ -25,3 +26,12 @@ 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
+ clonedFrom: Clonado de
diff --git a/modules/ticket/back/methods/sale/canEdit.js b/modules/ticket/back/methods/sale/canEdit.js
index 3091ebca7..cb3f2420a 100644
--- a/modules/ticket/back/methods/sale/canEdit.js
+++ b/modules/ticket/back/methods/sale/canEdit.js
@@ -38,6 +38,9 @@ module.exports = Self => {
}
}, myOptions);
+ if (!salesData.length)
+ throw new UserError(`The sales do not exists`);
+
const ticketId = salesData[0].ticketFk;
const isTicketEditable = await models.Ticket.isEditable(ctx, ticketId, myOptions);
@@ -62,7 +65,5 @@ module.exports = Self => {
throw new UserError('It is not possible to modify cloned sales');
if (!shouldEditFloramondo)
throw new UserError('It is not possible to modify sales that their articles are from Floramondo');
-
- return true;
};
};
diff --git a/modules/ticket/back/methods/sale/specs/canEdit.spec.js b/modules/ticket/back/methods/sale/specs/canEdit.spec.js
index 62f98421a..eef9136a8 100644
--- a/modules/ticket/back/methods/sale/specs/canEdit.spec.js
+++ b/modules/ticket/back/methods/sale/specs/canEdit.spec.js
@@ -17,6 +17,32 @@ describe('sale canEdit()', () => {
});
});
+ describe('sale not exists', () => {
+ it('should return error if sale not exists', async() => {
+ const tx = await models.Sale.beginTransaction({});
+
+ try {
+ const options = {transaction: tx};
+
+ const developerId = 9;
+ const ctx = {req: {accessToken: {userId: developerId}}};
+
+ let max = await models.Sale.findOne({fields: ['id'], order: 'id DESC'}, options);
+ max.id = max.id + 1;
+
+ const sales = [max.id];
+ await models.Sale.canEdit(ctx, sales, options);
+
+ await tx.rollback();
+ } catch (e) {
+ await tx.rollback();
+ error = e.message;
+ }
+
+ expect(error).toEqual('The sales do not exists');
+ });
+ });
+
describe('sale editTracked', () => {
it('should return true if the role is production regardless of the saleTrackings', async() => {
const tx = await models.Sale.beginTransaction({});
@@ -29,9 +55,7 @@ describe('sale canEdit()', () => {
const sales = [25];
- const result = await models.Sale.canEdit(ctx, sales, options);
-
- expect(result).toEqual(true);
+ await models.Sale.canEdit(ctx, sales, options);
await tx.rollback();
} catch (e) {
@@ -51,9 +75,7 @@ describe('sale canEdit()', () => {
const sales = [10];
- const result = await models.Sale.canEdit(ctx, sales, options);
-
- expect(result).toEqual(true);
+ await models.Sale.canEdit(ctx, sales, options);
await tx.rollback();
} catch (e) {
@@ -87,9 +109,7 @@ describe('sale canEdit()', () => {
});
const ctx = {req: {accessToken: {userId: role.id}}};
- const result = await models.Sale.canEdit(ctx, saleCloned, options);
-
- expect(result).toEqual(true);
+ await models.Sale.canEdit(ctx, saleCloned, options);
await tx.rollback();
} catch (e) {
@@ -150,9 +170,7 @@ describe('sale canEdit()', () => {
const saleToEdit = await models.Sale.findById(sales[0], null, options);
await saleToEdit.updateAttribute('itemFk', 9, options);
- const result = await models.Sale.canEdit(ctx, sales, options);
-
- expect(result).toEqual(true);
+ await models.Sale.canEdit(ctx, sales, options);
await tx.rollback();
} catch (e) {
diff --git a/modules/ticket/back/methods/state/editableStates.js b/modules/ticket/back/methods/state/editableStates.js
index 061097a65..487814dd2 100644
--- a/modules/ticket/back/methods/state/editableStates.js
+++ b/modules/ticket/back/methods/state/editableStates.js
@@ -1,3 +1,4 @@
+const mergeFilters = require('vn-loopback/util/filter').mergeFilters;
module.exports = Self => {
Self.remoteMethodCtx('editableStates', {
description: 'Gets the editable states according the user role ',
@@ -19,25 +20,16 @@ module.exports = Self => {
Self.editableStates = async(ctx, filter, options) => {
const models = Self.app.models;
const userId = ctx.req.accessToken.userId;
- const myOptions = {};
+ const myOptions = {...(options || {})};
- if (typeof options == 'object')
- Object.assign(myOptions, options);
-
- let statesList = await models.State.find(filter, myOptions);
const isProduction = await models.VnUser.hasRole(userId, 'production', myOptions);
- const isSalesPerson = await models.VnUser.hasRole(userId, 'salesPerson', myOptions);
const isAdministrative = await models.VnUser.hasRole(userId, 'administrative', myOptions);
- if (isProduction || isAdministrative)
- return statesList;
+ if (!isProduction && !isAdministrative)
+ filter = mergeFilters(filter, {where: {alertLevel: 0}});
- if (isSalesPerson) {
- return statesList = statesList.filter(stateList =>
- stateList.alertLevel === 0 || stateList.code === 'PICKER_DESIGNED'
- );
- }
+ const states = await models.State.find(filter, myOptions);
- return statesList.filter(stateList => stateList.alertLevel === 0);
+ return states;
};
};
diff --git a/modules/ticket/back/methods/state/specs/editableState.spec.js b/modules/ticket/back/methods/state/specs/editableState.spec.js
index c75242be0..2e1ce0c19 100644
--- a/modules/ticket/back/methods/state/specs/editableState.spec.js
+++ b/modules/ticket/back/methods/state/specs/editableState.spec.js
@@ -24,31 +24,6 @@ describe('ticket editableStates()', () => {
}
});
- it(`should return the expected states by a specific role`, async() => {
- const tx = await models.State.beginTransaction({});
-
- try {
- const options = {transaction: tx};
-
- const productionRole = 18;
- const ctx = {req: {accessToken: {userId: productionRole}}};
-
- const editableStates = await models.State.editableStates(ctx, filter, options);
-
- const deliveredState = editableStates.some(state => state.code == 'DELIVERED');
-
- const pickerDesignedState = editableStates.some(state => state.code == 'PICKER_DESIGNED');
-
- expect(deliveredState).toBeFalsy();
- expect(pickerDesignedState).toBeTruthy();
-
- await tx.rollback();
- } catch (e) {
- await tx.rollback();
- throw e;
- }
- });
-
it(`should return again the expected state by a specific role`, async() => {
const tx = await models.State.beginTransaction({});
@@ -70,4 +45,25 @@ describe('ticket editableStates()', () => {
throw e;
}
});
+
+ it(`should return the expected state matching with the name`, async() => {
+ const tx = await models.State.beginTransaction({});
+
+ try {
+ const options = {transaction: tx};
+
+ const employeeRole = 1;
+ const ctx = {req: {accessToken: {userId: employeeRole}}};
+ const filter = {where: {name: {like: '%Previa OK%'}}};
+
+ const [editableStates] = await models.State.editableStates(ctx, filter, options);
+
+ expect(editableStates.name).toBe('Previa OK');
+
+ await tx.rollback();
+ } catch (e) {
+ await tx.rollback();
+ throw e;
+ }
+ });
});
diff --git a/modules/ticket/back/methods/ticket/closeAll.js b/modules/ticket/back/methods/ticket/closeAll.js
index 3726d85b7..6690126b9 100644
--- a/modules/ticket/back/methods/ticket/closeAll.js
+++ b/modules/ticket/back/methods/ticket/closeAll.js
@@ -52,7 +52,7 @@ module.exports = Self => {
JOIN province p ON p.id = c.provinceFk
JOIN country co ON co.id = p.countryFk
LEFT JOIN account.emailUser eu ON eu.userFk = c.salesPersonFk
- WHERE al.code = 'PACKED' OR (am.code = 'refund' AND al.code != 'delivered')
+ WHERE (al.code = 'PACKED' OR (am.code = 'refund' AND al.code != 'delivered'))
AND DATE(t.shipped) BETWEEN DATE_ADD(?, INTERVAL -2 DAY)
AND util.dayEnd(?)
AND t.refFk IS NULL
diff --git a/modules/ticket/back/methods/ticket/componentUpdate.js b/modules/ticket/back/methods/ticket/componentUpdate.js
index 531d13b51..b03301204 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.VnUser.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/makeInvoice.js b/modules/ticket/back/methods/ticket/makeInvoice.js
index bd899ef7b..d8ec5eb9a 100644
--- a/modules/ticket/back/methods/ticket/makeInvoice.js
+++ b/modules/ticket/back/methods/ticket/makeInvoice.js
@@ -24,7 +24,6 @@ module.exports = function(Self) {
});
Self.makeInvoice = async(ctx, ticketsIds, options) => {
- const userId = ctx.req.accessToken.userId;
const models = Self.app.models;
const date = Date.vnNew();
date.setHours(0, 0, 0, 0);
@@ -42,6 +41,7 @@ module.exports = function(Self) {
let serial;
let invoiceId;
+ let invoiceOut;
try {
const tickets = await models.Ticket.find({
where: {
@@ -89,24 +89,14 @@ module.exports = function(Self) {
invoiceId = resultInvoice.id;
- for (let ticket of tickets) {
- const ticketInvoice = await models.Ticket.findById(ticket.id, {
- fields: ['refFk']
- }, myOptions);
-
- await models.TicketLog.create({
- originFk: ticket.id,
- userFk: userId,
- action: 'insert',
- changedModel: 'Ticket',
- changedModelId: ticket.id,
- newInstance: ticketInvoice
- }, myOptions);
- }
-
if (serial != 'R' && invoiceId)
await Self.rawSql('CALL invoiceOutBooking(?)', [invoiceId], myOptions);
+ invoiceOut = await models.InvoiceOut.findById(invoiceId, {
+ include: {
+ relation: 'client'
+ }
+ }, myOptions);
if (tx) await tx.commit();
} catch (e) {
if (tx) await tx.rollback();
@@ -116,6 +106,15 @@ module.exports = function(Self) {
if (serial != 'R' && invoiceId)
await models.InvoiceOut.createPdf(ctx, invoiceId);
+ if (invoiceId) {
+ ctx.args = {
+ reference: invoiceOut.ref,
+ recipientId: invoiceOut.clientFk,
+ recipient: invoiceOut.client().email
+ };
+ await models.InvoiceOut.invoiceEmail(ctx, invoiceOut.ref);
+ }
+
return {invoiceFk: invoiceId, serial: serial};
};
};
diff --git a/modules/ticket/back/methods/ticket/merge.js b/modules/ticket/back/methods/ticket/merge.js
index 8aaca1085..9a6f859f7 100644
--- a/modules/ticket/back/methods/ticket/merge.js
+++ b/modules/ticket/back/methods/ticket/merge.js
@@ -63,10 +63,11 @@ module.exports = Self => {
newInstance: {mergedTicket: ticket.originId}
};
- await models.TicketLog.create(ticketDestinationLogRecord, myOptions);
await models.Sale.updateAll({ticketFk: ticket.originId}, {ticketFk: ticket.destinationId}, myOptions);
- await models.Ticket.setDeleted(ctx, ticket.originId, myOptions);
- await models.Chat.sendCheckingPresence(ctx, ticket.workerFk, message);
+ if (await models.Ticket.setDeleted(ctx, ticket.originId, myOptions)) {
+ await models.TicketLog.create(ticketDestinationLogRecord, myOptions);
+ await models.Chat.sendCheckingPresence(ctx, ticket.workerFk, message);
+ }
}
if (tx)
await tx.commit();
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 a0a10d997..16812dcb0 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.VnUser.hasRole(userId, 'deliveryBoss', myOptions);
if (!isDeliveryBoss) {
const zoneShipped = await models.Agency.getShipped(
+ ctx,
args.landed,
args.addressId,
args.agencyModeId,
diff --git a/modules/ticket/back/methods/ticket/saveSign.js b/modules/ticket/back/methods/ticket/saveSign.js
index aede7de8e..b8f9d5ced 100644
--- a/modules/ticket/back/methods/ticket/saveSign.js
+++ b/modules/ticket/back/methods/ticket/saveSign.js
@@ -29,8 +29,7 @@ module.exports = Self => {
}
});
- Self.saveSign = async(ctx, options) => {
- const args = Object.assign({}, ctx.args);
+ Self.saveSign = async(ctx, tickets, location, signedTime, options) => {
const models = Self.app.models;
const myOptions = {};
let tx;
@@ -48,9 +47,9 @@ module.exports = Self => {
async function setLocation(ticketId) {
await models.Delivery.create({
ticketFk: ticketId,
- longitude: args.location.Longitude,
- latitude: args.location.Latitude,
- dated: args.signedTime || new Date()
+ longitude: location.Longitude,
+ latitude: location.Latitude,
+ dated: signedTime || new Date()
}, myOptions);
}
@@ -107,9 +106,9 @@ module.exports = Self => {
}
try {
- for (let i = 0; i < args.tickets.length; i++) {
+ for (const ticketId of tickets) {
const ticketState = await models.TicketState.findOne(
- {where: {ticketFk: args.tickets[i]},
+ {where: {ticketFk: ticketId},
fields: ['alertLevel']
}, myOptions);
@@ -117,16 +116,19 @@ module.exports = Self => {
fields: ['id']
}, myOptions);
+ if (!ticketState)
+ throw new UserError('Ticket does not exist');
if (ticketState.alertLevel < packedAlertLevel.id)
throw new UserError('This ticket cannot be signed because it has not been boxed');
- else if (!await gestDocExists(args.tickets[i])) {
- if (args.location) setLocation(args.tickets[i]);
- if (!gestDocCreated) await createGestDoc(args.tickets[i]);
- await models.TicketDms.create({ticketFk: args.tickets[i], dmsFk: dms[0].id}, myOptions);
- const ticket = await models.Ticket.findById(args.tickets[i], null, myOptions);
- await ticket.updateAttribute('isSigned', true, myOptions);
- await Self.rawSql(`CALL vn.ticket_setState(?, ?)`, [args.tickets[i], 'DELIVERED'], myOptions);
- }
+ if (await gestDocExists(ticketId))
+ throw new UserError('Ticket is already signed');
+
+ if (location) setLocation(ticketId);
+ if (!gestDocCreated) await createGestDoc(ticketId);
+ await models.TicketDms.create({ticketFk: ticketId, dmsFk: dms[0].id}, myOptions);
+ const ticket = await models.Ticket.findById(ticketId, null, myOptions);
+ await ticket.updateAttribute('isSigned', true, myOptions);
+ await Self.rawSql(`CALL vn.ticket_setState(?, ?)`, [ticketId, 'DELIVERED'], myOptions);
}
if (tx) await tx.commit();
diff --git a/modules/ticket/back/methods/ticket/setDeleted.js b/modules/ticket/back/methods/ticket/setDeleted.js
index 2889160d1..8c7f9d546 100644
--- a/modules/ticket/back/methods/ticket/setDeleted.js
+++ b/modules/ticket/back/methods/ticket/setDeleted.js
@@ -36,6 +36,9 @@ module.exports = Self => {
}
try {
+ const ticketToDelete = await models.Ticket.findById(id, {fields: ['isDeleted']}, myOptions);
+ if (ticketToDelete.isDeleted) return false;
+
const userId = ctx.req.accessToken.userId;
const isEditable = await Self.isEditable(ctx, id, myOptions);
diff --git a/modules/ticket/back/methods/ticket/specs/makeInvoice.spec.js b/modules/ticket/back/methods/ticket/specs/makeInvoice.spec.js
index 24d4a48ba..270ba5c93 100644
--- a/modules/ticket/back/methods/ticket/specs/makeInvoice.spec.js
+++ b/modules/ticket/back/methods/ticket/specs/makeInvoice.spec.js
@@ -6,6 +6,9 @@ describe('ticket makeInvoice()', () => {
const ticketId = 11;
const clientId = 1102;
const activeCtx = {
+ getLocale: () => {
+ return 'en';
+ },
accessToken: {userId: userId},
headers: {origin: 'http://localhost:5000'},
};
@@ -67,6 +70,7 @@ describe('ticket makeInvoice()', () => {
it('should invoice a ticket, then try again to fail', async() => {
const invoiceOutModel = models.InvoiceOut;
spyOn(invoiceOutModel, 'createPdf');
+ spyOn(invoiceOutModel, 'invoiceEmail');
const tx = await models.Ticket.beginTransaction({});
@@ -90,6 +94,7 @@ describe('ticket makeInvoice()', () => {
it('should success to invoice a ticket', async() => {
const invoiceOutModel = models.InvoiceOut;
spyOn(invoiceOutModel, 'createPdf');
+ spyOn(invoiceOutModel, 'invoiceEmail');
const tx = await models.Ticket.beginTransaction({});
diff --git a/modules/ticket/back/methods/ticket/transferSales.js b/modules/ticket/back/methods/ticket/transferSales.js
index 48035648c..e3137487f 100644
--- a/modules/ticket/back/methods/ticket/transferSales.js
+++ b/modules/ticket/back/methods/ticket/transferSales.js
@@ -78,7 +78,7 @@ module.exports = Self => {
const saleIds = sales.map(sale => sale.id);
const hasClaimedSales = await models.ClaimBeginning.findOne({where: {saleFk: {inq: saleIds}}});
- if (hasClaimedSales)
+ if (ticketId != id && hasClaimedSales)
throw new UserError(`Can't transfer claimed sales`);
for (const sale of sales) {
diff --git a/modules/ticket/front/advance/index.html b/modules/ticket/front/advance/index.html
index 007f80fe6..c937fe2ac 100644
--- a/modules/ticket/front/advance/index.html
+++ b/modules/ticket/front/advance/index.html
@@ -122,7 +122,7 @@
| {{::ticket.ipt | dashIfEmpty}} |
+ class="chip {{ticket.classColor}}">
{{::ticket.state | dashIfEmpty}}
|
@@ -150,7 +150,7 @@
{{::ticket.futureIpt | dashIfEmpty}} |
+ class="chip {{ticket.classColor}}">
{{::ticket.futureState | dashIfEmpty}}
|
diff --git a/modules/ticket/front/descriptor-menu/index.js b/modules/ticket/front/descriptor-menu/index.js
index e32363f09..987d6a3f1 100644
--- a/modules/ticket/front/descriptor-menu/index.js
+++ b/modules/ticket/front/descriptor-menu/index.js
@@ -142,9 +142,10 @@ class Controller extends Section {
sendPdfDeliveryNote($data) {
let query = `tickets/${this.id}/delivery-note-email`;
- if (this.hasDocuwareFile) query = `docuwares/${this.id}/delivery-note-email`;
+ if (this.hasDocuwareFile) query = `docuwares/delivery-note-email`;
return this.vnEmail.send(query, {
+ id: this.id,
recipientId: this.ticket.client.id,
recipient: $data.email
});
diff --git a/modules/ticket/front/descriptor-menu/index.spec.js b/modules/ticket/front/descriptor-menu/index.spec.js
index 48998325a..5d27acff1 100644
--- a/modules/ticket/front/descriptor-menu/index.spec.js
+++ b/modules/ticket/front/descriptor-menu/index.spec.js
@@ -141,6 +141,7 @@ describe('Ticket Component vnTicketDescriptorMenu', () => {
const $data = {email: 'brucebanner@gothamcity.com'};
const params = {
+ id: 16,
recipient: $data.email,
recipientId: ticket.client.id
};
diff --git a/modules/ticket/front/future/index.html b/modules/ticket/front/future/index.html
index 8628bb34c..2f0290c27 100644
--- a/modules/ticket/front/future/index.html
+++ b/modules/ticket/front/future/index.html
@@ -137,7 +137,7 @@
{{::ticket.ipt | dashIfEmpty}} |
+ class="chip {{ticket.classColor}}">
{{::ticket.state}}
|
@@ -158,7 +158,7 @@
{{::ticket.futureIpt | dashIfEmpty}} |
+ class="chip {{ticket.classColor}}">
{{::ticket.futureState}}
|
diff --git a/modules/ticket/front/future/index.js b/modules/ticket/front/future/index.js
index 1732c562c..66d626993 100644
--- a/modules/ticket/front/future/index.js
+++ b/modules/ticket/front/future/index.js
@@ -95,13 +95,6 @@ export default class Controller extends Section {
return checkedLines;
}
- stateColor(state) {
- if (state === 'OK')
- return 'success';
- else if (state === 'Libre')
- return 'notice';
- }
-
dateRange(value) {
const minHour = new Date(value);
minHour.setHours(0, 0, 0, 0);
diff --git a/modules/ticket/front/future/index.spec.js b/modules/ticket/front/future/index.spec.js
index 188421298..ca29c6df7 100644
--- a/modules/ticket/front/future/index.spec.js
+++ b/modules/ticket/front/future/index.spec.js
@@ -60,24 +60,6 @@ describe('Component vnTicketFuture', () => {
});
});
- describe('stateColor()', () => {
- it('should return success to the OK tickets', () => {
- const ok = controller.stateColor(controller.$.model.data[0].state);
- const notOk = controller.stateColor(controller.$.model.data[1].state);
-
- expect(ok).toEqual('success');
- expect(notOk).not.toEqual('success');
- });
-
- it('should return success to the FREE tickets', () => {
- const notFree = controller.stateColor(controller.$.model.data[0].state);
- const free = controller.stateColor(controller.$.model.data[1].state);
-
- expect(free).toEqual('notice');
- expect(notFree).not.toEqual('notice');
- });
- });
-
describe('dateRange()', () => {
it('should return two dates with the hours at the start and end of the given date', () => {
const dateRange = controller.dateRange(today);
diff --git a/modules/ticket/front/main/index.html b/modules/ticket/front/main/index.html
index 82b5e58cd..e1e6c4e47 100644
--- a/modules/ticket/front/main/index.html
+++ b/modules/ticket/front/main/index.html
@@ -16,4 +16,4 @@
-
\ No newline at end of file
+
diff --git a/modules/ticket/front/main/index.js b/modules/ticket/front/main/index.js
index 3f9482fc4..c49418cfc 100644
--- a/modules/ticket/front/main/index.js
+++ b/modules/ticket/front/main/index.js
@@ -1,5 +1,6 @@
import ngModule from '../module';
import ModuleMain from 'salix/components/module-main';
+const UserError = require('vn-loopback/util/user-error');
export default class Ticket extends ModuleMain {
fetchParams($params) {
@@ -14,10 +15,19 @@ export default class Ticket extends ModuleMain {
'scopeDays'
];
+ const seachPanelParams = Object.entries($params);
+ const hasFromParam = seachPanelParams.some(subarray => subarray.length > 0 && subarray[0] === 'from');
+ const hasToParam = seachPanelParams.some(subarray => subarray.length > 0 && subarray[0] === 'to');
+
+ if ((hasFromParam && !hasToParam) || (!hasFromParam && hasToParam))
+ throw new UserError(`Date range must have 'from' and 'to'`);
+
const hasExcludedParams = excludedParams.some(param => {
return $params && $params[param] != undefined;
});
+
const hasParams = Object.entries($params).length;
+
if (!hasParams || !hasExcludedParams)
$params.scopeDays = 1;
@@ -28,7 +38,6 @@ export default class Ticket extends ModuleMain {
const to = new Date(from.getTime());
to.setDate(to.getDate() + $params.scopeDays);
to.setHours(23, 59, 59, 999);
-
Object.assign($params, {from, to});
}
diff --git a/modules/ticket/front/main/locale/es.yml b/modules/ticket/front/main/locale/es.yml
new file mode 100644
index 000000000..8db264e45
--- /dev/null
+++ b/modules/ticket/front/main/locale/es.yml
@@ -0,0 +1 @@
+Date range must have 'from' and 'to': El rango de fechas debe tener 'desde' y 'hasta'
diff --git a/modules/ticket/front/sale/index.html b/modules/ticket/front/sale/index.html
index 6c37230ae..b2c0db18d 100644
--- a/modules/ticket/front/sale/index.html
+++ b/modules/ticket/front/sale/index.html
@@ -488,6 +488,12 @@
on-accept="$ctrl.onCreateClaimAccepted()">
+
+
+
- Add claim
-
+ Add claim
= this.ticketConfig[0].daysForWarningClaim)
@@ -241,7 +244,12 @@ class Controller extends Section {
const query = `tickets/${this.ticket.id}/transferSales`;
this.$http.post(query, params)
- .then(res => this.$state.go('ticket.card.sale', {id: res.data.id}));
+ .then(res => {
+ if (res.data && res.data.id === this.ticket.id) {
+ this.$.transfer.hide();
+ this.$.model.refresh();
+ } else this.$state.go('ticket.card.sale', {id: res.data.id});
+ });
}
showEditPricePopover(event, sale) {
diff --git a/modules/ticket/front/sale/locale/es.yml b/modules/ticket/front/sale/locale/es.yml
index bb61db824..6eb558a56 100644
--- a/modules/ticket/front/sale/locale/es.yml
+++ b/modules/ticket/front/sale/locale/es.yml
@@ -42,3 +42,4 @@ Claim mana: Maná reclamación
History: Historial
Do you want to continue?: ¿Desea continuar?
Claim out of time: Reclamación fuera de plazo
+Do you want to create a claim?: ¿Quieres crear una reclamación?
\ No newline at end of file
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/business/en.yml b/modules/worker/back/locale/business/en.yml
new file mode 100644
index 000000000..f0642fbe4
--- /dev/null
+++ b/modules/worker/back/locale/business/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/business/es.yml b/modules/worker/back/locale/business/es.yml
new file mode 100644
index 000000000..13ecfdb19
--- /dev/null
+++ b/modules/worker/back/locale/business/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
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
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
diff --git a/modules/worker/back/methods/worker/new.js b/modules/worker/back/methods/worker/new.js
index 5ff7135a7..398411118 100644
--- a/modules/worker/back/methods/worker/new.js
+++ b/modules/worker/back/methods/worker/new.js
@@ -1,4 +1,4 @@
-/* eslint max-len: ["error", { "code": 130 }]*/
+/* eslint max-len: ["error", { "code": 150 }]*/
const UserError = require('vn-loopback/util/user-error');
module.exports = Self => {
@@ -54,18 +54,6 @@ module.exports = Self => {
description: `The worker province`,
required: true,
},
- {
- arg: 'iban',
- type: 'string',
- description: `The worker iban`,
- required: true,
- },
- {
- arg: 'bankEntityFk',
- type: 'number',
- description: `The worker bank entity`,
- required: true,
- },
{
arg: 'companyFk',
type: 'number',
@@ -101,6 +89,22 @@ module.exports = Self => {
type: 'date',
description: `The worker birth`,
required: true,
+ },
+ {
+ arg: 'payMethodFk',
+ type: 'number',
+ description: `The client payMethod`,
+ required: true,
+ },
+ {
+ arg: 'iban',
+ type: 'string',
+ description: `The client iban`,
+ },
+ {
+ arg: 'bankEntityFk',
+ type: 'number',
+ description: `The client bank entity`,
}
],
returns: {
@@ -139,7 +143,7 @@ module.exports = Self => {
if (!client) {
const nickname = args.firstName.concat(' ', args.lastNames);
- const workerConfig = await models.WorkerConfig.findOne({fields: ['roleFk']});
+ const workerConfig = await models.WorkerConfig.findOne({fields: ['roleFk', 'businessTypeFk']});
const [randomPassword] = await models.Worker.rawSql(
'SELECT account.passwordGenerate() as password;'
);
@@ -162,6 +166,10 @@ module.exports = Self => {
myOptions
);
+ const payMethod = await models.PayMethod.findById(args.payMethodFk, {fields: ['isIbanRequiredForClients']});
+ if (payMethod.isIbanRequiredForClients && !args.iban)
+ throw new UserError(`That payment method requires an IBAN`);
+
await models.Worker.rawSql(
'CALL vn.clientCreate(?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)',
[
@@ -169,7 +177,7 @@ module.exports = Self => {
args.lastNames,
args.fi,
args.street,
- args.postalCode,
+ args.postcode,
args.city,
args.provinceFk,
args.companyFk,
@@ -186,7 +194,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,
@@ -196,15 +204,17 @@ module.exports = Self => {
client = await models.Client.findById(
user.id,
- {fields: ['id', 'name', 'socialName', 'street', 'city', 'iban', 'bankEntityFk', 'defaultAddressFk', 'fi']},
+ {fields: ['id', 'name', 'socialName', 'street', 'city', 'iban', 'bankEntityFk', 'defaultAddressFk', 'businessTypeFk', 'fi']},
myOptions
);
await client.updateAttributes(
{
+ payMethod: args.payMethod,
iban: args.iban,
bankEntityFk: args.bankEntityFk,
defaultAddressFk: address.id,
+ businessTypeFk: workerConfig.businessTypeFk,
},
myOptions
);
diff --git a/modules/worker/back/methods/worker/specs/new.spec.js b/modules/worker/back/methods/worker/specs/new.spec.js
index dbcc66683..44f6e9b09 100644
--- a/modules/worker/back/methods/worker/specs/new.spec.js
+++ b/modules/worker/back/methods/worker/specs/new.spec.js
@@ -27,14 +27,14 @@ describe('Worker new', () => {
street: 'S/ defaultWorkerStreet',
city: 'defaultWorkerCity',
provinceFk: 1,
- iban: 'ES8304879798578129532677',
- bankEntityFk: 128,
companyFk: 442,
postcode: '46680',
phone: '123456789',
code: 'DWW',
bossFk: 9,
- birth: '2022-12-11T23:00:00.000Z'
+ birth: '2022-12-11T23:00:00.000Z',
+ payMethodFk: 1,
+ roleFk: 1
};
it('should return error if personal mail already exists', async() => {
@@ -105,6 +105,33 @@ describe('Worker new', () => {
expect(error.message).toEqual('This worker already exists');
});
+ it('should return error if payMethod require iban', async() => {
+ const payMethodIbanRequired = await models.PayMethod.findOne({
+ where: {
+ isIbanRequiredForClients: true
+ },
+ fields: ['id']
+ });
+
+ const tx = await models.Worker.beginTransaction({});
+
+ let error;
+ try {
+ const options = {transaction: tx};
+ const ctx = {
+ args: Object.assign({}, defaultWorker, {payMethodFk: payMethodIbanRequired.id})
+ };
+ await models.Worker.new(ctx, options);
+
+ await tx.rollback();
+ } catch (e) {
+ error = e;
+ await tx.rollback();
+ }
+
+ expect(error.message).toEqual('That payment method requires an IBAN');
+ });
+
it('should create a new worker', async() => {
const newWorker = await models.Worker.new({args: defaultWorker});
diff --git a/modules/worker/back/models/worker-config.json b/modules/worker/back/models/worker-config.json
index 05cdfef42..f7f257669 100644
--- a/modules/worker/back/models/worker-config.json
+++ b/modules/worker/back/models/worker-config.json
@@ -14,6 +14,12 @@
},
"roleFk": {
"type": "number"
+ },
+ "payMethodFk": {
+ "type": "number"
+ },
+ "businessTypeFk": {
+ "type": "string"
}
},
"acls": [
diff --git a/modules/worker/front/create/index.html b/modules/worker/front/create/index.html
index 5f5ab9d07..eb45704a7 100644
--- a/modules/worker/front/create/index.html
+++ b/modules/worker/front/create/index.html
@@ -142,12 +142,19 @@
+
+
+ on-change="$ctrl.autofillBic()"
+ rule>
{
+ if (res.data) this.worker.payMethodFk = res.data.payMethodFk;
+ });
}
onSubmit() {
+ if (!this.worker.iban && !this.worker.bankEntityFk) {
+ delete this.worker.iban;
+ delete this.worker.bankEntityFk;
+ }
+
return this.$.watcher.submit().then(json => {
this.$state.go('worker.card.basicData', {id: json.data.id});
});
diff --git a/modules/worker/front/create/locale/es.yml b/modules/worker/front/create/locale/es.yml
index 8c79d770c..1a0f03ef6 100644
--- a/modules/worker/front/create/locale/es.yml
+++ b/modules/worker/front/create/locale/es.yml
@@ -10,3 +10,4 @@ Street: Dirección
Postcode: Código postal
Web user: Usuario Web
Access permission: Permiso de acceso
+Pay method: Método de pago
diff --git a/modules/zone/back/methods/agency/getShipped.js b/modules/zone/back/methods/agency/getShipped.js
index 165dd6731..7ef912abd 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.VnUser.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 c262357a7..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 {models} = 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);
@@ -12,8 +15,7 @@ describe('agency getShipped()', () => {
try {
const options = {transaction: tx};
-
- const result = await models.Agency.getShipped(landed, addressFk, agencyModeFk, warehouseFk, options);
+ const result = await models.Agency.getShipped(ctx, landed, addressFk, agencyModeFk, warehouseFk, options);
expect(result).toBeDefined();
@@ -37,7 +39,7 @@ describe('agency getShipped()', () => {
try {
const options = {transaction: tx};
- const result = await models.Agency.getShipped(landed, addressFk, agencyModeFk, warehouseFk, options);
+ const result = await models.Agency.getShipped(ctx, landed, addressFk, agencyModeFk, warehouseFk, options);
expect(result).toBeUndefined();
diff --git a/package-lock.json b/package-lock.json
index d373248fd..05ff6466a 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
{
"name": "salix-back",
- "version": "23.18.01",
+ "version": "23.22.01",
"lockfileVersion": 1,
"requires": true,
"packages": {
diff --git a/package.json b/package.json
index 4b4f552ac..7a0dc5b7c 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "salix-back",
- "version": "23.20.01",
+ "version": "23.24.01",
"author": "Verdnatura Levante SL",
"description": "Salix backend",
"license": "GPL-3.0",
diff --git a/print/core/components/report-footer/report-footer.js b/print/core/components/report-footer/report-footer.js
index 0eaab8ce4..077ef0bde 100755
--- a/print/core/components/report-footer/report-footer.js
+++ b/print/core/components/report-footer/report-footer.js
@@ -4,13 +4,14 @@ const db = require('../../database');
module.exports = {
name: 'report-footer',
async serverPrefetch() {
- this.company = await db.findOne(
- `SELECT
- ci.footnotes
- FROM companyI18n ci
- JOIN company c ON c.id = ci.companyFk
- WHERE c.code = ? AND ci.lang = (SELECT lang FROM account.user WHERE id = ?)`,
- [this.companyCode, this.recipientId]);
+ this.company = await db.findOne(`
+ SELECT IFNULL(ci.footnotes, cl.footnotes) as footnotes
+ FROM company c
+ LEFT JOIN companyL10n cl ON c.id = cl.id
+ LEFT JOIN companyI18n ci ON ci.companyFk = cl.id
+ AND ci.lang = (SELECT lang FROM account.user where id = ?)
+ WHERE c.code = ?`,
+ [this.recipientId, this.companyCode]);
},
props: ['leftText', 'companyCode', 'recipientId', 'centerText']
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,
|