+
+
+
+
diff --git a/front/salix/components/log/index.js b/front/salix/components/log/index.js
index 1c54aa9b8..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,17 +8,30 @@ 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',
+ update: 'warning',
+ delete: 'alert',
+ select: 'notice'
+ };
+ this.actionsIcon = {
+ insert: 'add',
+ update: 'edit',
+ delete: 'remove',
+ select: 'visibility'
};
this.filter = {
include: [{
relation: 'user',
scope: {
- fields: ['name'],
+ fields: ['nickname', 'name', 'image'],
include: {
relation: 'worker',
scope: {
@@ -27,6 +41,20 @@ export default class Controller extends Section {
},
}],
};
+
+ this.dateFilter = this.$filter('date');
+ this.lang = this.$translate.use();
+ this.today = Date.vnNew();
+ this.today.setHours(0, 0, 0, 0);
+ }
+
+ $postLink() {
+ this.resetFilter();
+ this.$.$watch(
+ () => this.$.filter,
+ () => this.applyFilter(),
+ true
+ );
}
get logs() {
@@ -35,13 +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 = firstUpper(locale.name) || log.changedModel;
let props = Object.keys(oldValues).concat(Object.keys(newValues));
props = [...new Set(props)];
@@ -49,11 +78,28 @@ export default class Controller extends Section {
log.props = [];
for (const prop of props) {
log.props.push({
- name: locale[prop] || prop,
- old: this.formatValue(oldValues[prop]),
- new: this.formatValue(newValues[prop])
+ name: 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;
}
}
@@ -61,39 +107,126 @@ export default class Controller extends Section {
return !(this.changedModel && this.changedModelId);
}
- formatValue(value) {
- let type = typeof value;
+ castJsonValue(value) {
+ return typeof value === 'string' && validDate.test(value)
+ ? new Date(value)
+ : value;
+ }
- if (type === 'string' && validDate.test(value)) {
- value = new Date(value);
- type = typeof value;
- }
+ mainVal(prop, action) {
+ return action == 'delete' ? prop.old : prop.new;
+ }
- switch (type) {
- case 'boolean':
- return value ? '✓' : '✗';
- case 'object':
- if (value instanceof Date) {
- const hasZeroTime =
- value.getHours() === 0 &&
- value.getMinutes() === 0 &&
- value.getSeconds() === 0;
- const format = hasZeroTime ? 'dd/MM/yyyy' : 'dd/MM/yyyy HH:mm:ss';
- return this.$filter('date')(value, format);
+ relativeDate(dateVal) {
+ if (dateVal == null) return '';
+ const date = new Date(dateVal);
+ const dateZeroTime = new Date(dateVal);
+ dateZeroTime.setHours(0, 0, 0, 0);
+ const diff = Math.trunc((this.today.getTime() - dateZeroTime.getTime()) / (1000 * 3600 * 24));
+
+ let format;
+ if (diff == 0)
+ format = `'${this.$t('today')}'`;
+ else if (diff == 1)
+ format = `'${this.$t('yesterday')}'`;
+ else if (diff > 1 && diff < 7)
+ format = `'${date.toLocaleDateString(this.lang, {weekday: 'short'})}'`;
+ else if (this.today.getFullYear() == date.getFullYear())
+ format = `d '${date.toLocaleDateString(this.lang, {month: 'short'})}'`;
+ else
+ format = `dd/MM/yyyy`;
+
+ return this.dateFilter(date, `${format} HH:mm`);
+ }
+
+ resetFilter() {
+ this.$.filter = {who: 'all'};
+ }
+
+ applyFilter() {
+ const filter = this.$.filter;
+
+ function getParam(prop, value) {
+ if (value == null || value == '') return null;
+ switch (prop) {
+ 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':
+ return null;
+ case 'user':
+ return {userFk: {neq: null}};
+ case 'system':
+ return {userFk: null};
+ }
+ case 'actions':
+ const inq = [];
+ for (const action in value) {
+ if (value[action])
+ inq.push(action);
+ }
+ return inq.length ? {action: {inq}} : null;
+ case 'from':
+ if (filter.to) {
+ return {creationDate: {gte: value}};
+ } else {
+ const to = new Date(value);
+ to.setHours(23, 59, 59, 999);
+ return {creationDate: {between: [value, to]}};
+ }
+ case 'to':
+ const to = new Date(value);
+ to.setHours(23, 59, 59, 999);
+ return {creationDate: {lte: to}};
+ case 'userFk':
+ return filter.who != 'system'
+ ? {[prop]: value} : null;
+ default:
+ return {[prop]: value};
}
- else
- return value;
- default:
- return value;
+ }
+
+ const and = [];
+ for (const prop in filter) {
+ const param = getParam(prop, filter[prop]);
+ if (param) and.push(param);
+ }
+
+ const lbFilter = and.length ? {where: {and}} : null;
+ return this.$.model.applyFilter(lbFilter);
+ }
+
+ searchUser(search) {
+ if (/^[0-9]+$/.test(search)) {
+ return {id: search};
+ } else {
+ return {or: [
+ {name: search},
+ {nickname: {like: `%${search}%`}}
+ ]}
}
}
- showWorkerDescriptor(event, workerId) {
- if (!workerId) return;
- this.$.workerDescriptor.show(event.target, workerId);
+ showWorkerDescriptor(event, log) {
+ if (log.user?.worker)
+ this.$.workerDescriptor.show(event.target, log.userFk);
}
}
+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/index.spec.js b/front/salix/components/log/index.spec.js
new file mode 100644
index 000000000..d01a08967
--- /dev/null
+++ b/front/salix/components/log/index.spec.js
@@ -0,0 +1,97 @@
+import './index';
+
+describe('Salix Component vnLog', () => {
+ let controller;
+ let $scope;
+ let $element;
+
+ beforeEach(ngModule('salix'));
+
+ beforeEach(inject(($componentController, $rootScope) => {
+ $scope = $rootScope.$new();
+ $element = angular.element('
@@ -14,25 +14,25 @@
+ rule="VnUser">
+ rule="VnUser">
+ rule="VnUser">
diff --git a/modules/account/front/card/index.js b/modules/account/front/card/index.js
index 5266592f3..e06f991bb 100644
--- a/modules/account/front/card/index.js
+++ b/modules/account/front/card/index.js
@@ -14,9 +14,9 @@ class Controller extends ModuleCard {
};
return Promise.all([
- this.$http.get(`Accounts/${this.$params.id}`, {filter})
+ this.$http.get(`VnUsers/${this.$params.id}`, {filter})
.then(res => this.user = res.data),
- this.$http.get(`UserAccounts/${this.$params.id}/exists`)
+ this.$http.get(`Accounts/${this.$params.id}/exists`)
.then(res => this.hasAccount = res.data.exists)
]);
}
diff --git a/modules/account/front/card/index.spec.js b/modules/account/front/card/index.spec.js
index cd28c458a..204b897e4 100644
--- a/modules/account/front/card/index.spec.js
+++ b/modules/account/front/card/index.spec.js
@@ -15,8 +15,8 @@ describe('component vnUserCard', () => {
it('should reload the controller data', () => {
controller.$params.id = 1;
- $httpBackend.expectGET('Accounts/1').respond('foo');
- $httpBackend.expectGET('UserAccounts/1/exists').respond({exists: true});
+ $httpBackend.expectGET('VnUsers/1').respond('foo');
+ $httpBackend.expectGET('Accounts/1/exists').respond({exists: true});
controller.reload();
$httpBackend.flush();
diff --git a/modules/account/front/create/index.html b/modules/account/front/create/index.html
index ca4a2f840..ee2de926a 100644
--- a/modules/account/front/create/index.html
+++ b/modules/account/front/create/index.html
@@ -1,6 +1,6 @@
@@ -14,24 +14,24 @@
+ rule="VnUser">
+ rule="VnUser">
+ rule="VnUser">
this.hasAccount = res.data.exists);
}
onDelete() {
- return this.$http.delete(`Accounts/${this.id}`)
+ return this.$http.delete(`VnUsers/${this.id}`)
.then(() => this.$state.go('account.index'))
.then(() => this.vnApp.showSuccess(this.$t('User removed')));
}
@@ -69,12 +69,12 @@ class Controller extends Descriptor {
}
onEnableAccount() {
- return this.$http.post(`UserAccounts`, {id: this.id})
+ return this.$http.post(`Accounts`, {id: this.id})
.then(() => this.onSwitchAccount(true));
}
onDisableAccount() {
- return this.$http.delete(`UserAccounts/${this.id}`)
+ return this.$http.delete(`Accounts/${this.id}`)
.then(() => this.onSwitchAccount(false));
}
@@ -88,7 +88,7 @@ class Controller extends Descriptor {
}
onSetActive(active) {
- return this.$http.patch(`Accounts/${this.id}`, {active})
+ return this.$http.patch(`VnUsers/${this.id}`, {active})
.then(() => {
this.user.active = active;
const message = active
diff --git a/modules/account/front/descriptor/index.spec.js b/modules/account/front/descriptor/index.spec.js
index f5e7aa7d4..46c7e376c 100644
--- a/modules/account/front/descriptor/index.spec.js
+++ b/modules/account/front/descriptor/index.spec.js
@@ -10,7 +10,7 @@ describe('component vnUserDescriptor', () => {
beforeEach(inject(($componentController, _$httpBackend_) => {
$httpBackend = _$httpBackend_;
- $httpBackend.whenGET('UserAccounts/1/exists').respond({exists: true});
+ $httpBackend.whenGET('Accounts/1/exists').respond({exists: true});
controller = $componentController('vnUserDescriptor', {$element: null}, {user});
jest.spyOn(controller, 'emit');
@@ -21,7 +21,7 @@ describe('component vnUserDescriptor', () => {
it('should delete entity and go to index', () => {
controller.$state.go = jest.fn();
- $httpBackend.expectDELETE('Accounts/1').respond();
+ $httpBackend.expectDELETE('VnUsers/1').respond();
controller.onDelete();
$httpBackend.flush();
@@ -61,7 +61,7 @@ describe('component vnUserDescriptor', () => {
describe('onEnableAccount()', () => {
it('should make request to enable account', () => {
- $httpBackend.expectPOST('UserAccounts', {id: 1}).respond();
+ $httpBackend.expectPOST('Accounts', {id: 1}).respond();
controller.onEnableAccount();
$httpBackend.flush();
@@ -73,7 +73,7 @@ describe('component vnUserDescriptor', () => {
describe('onDisableAccount()', () => {
it('should make request to disable account', () => {
- $httpBackend.expectDELETE('UserAccounts/1').respond();
+ $httpBackend.expectDELETE('Accounts/1').respond();
controller.onDisableAccount();
$httpBackend.flush();
@@ -85,7 +85,7 @@ describe('component vnUserDescriptor', () => {
describe('onSetActive()', () => {
it('should make request to activate/deactivate the user', () => {
- $httpBackend.expectPATCH('Accounts/1', {active: true}).respond();
+ $httpBackend.expectPATCH('VnUsers/1', {active: true}).respond();
controller.onSetActive(true);
$httpBackend.flush();
diff --git a/modules/account/front/index.js b/modules/account/front/index.js
index 0cd0c4955..695f36967 100644
--- a/modules/account/front/index.js
+++ b/modules/account/front/index.js
@@ -19,3 +19,5 @@ import './ldap';
import './samba';
import './accounts';
import './privileges';
+import './user-log';
+import './role-log';
diff --git a/modules/account/front/locale/es.yml b/modules/account/front/locale/es.yml
index 18e2c06a1..7988cbda6 100644
--- a/modules/account/front/locale/es.yml
+++ b/modules/account/front/locale/es.yml
@@ -8,4 +8,5 @@ Role: Rol
Mail aliases: Alias de correo
Account not enabled: Cuenta no habilitada
Inherited roles: Roles heredados
-Go to the user: Ir al usuario
\ No newline at end of file
+Go to the user: Ir al usuario
+Log: Histórico
diff --git a/modules/account/front/main/index.html b/modules/account/front/main/index.html
index 5736b3a3b..5872a328d 100644
--- a/modules/account/front/main/index.html
+++ b/modules/account/front/main/index.html
@@ -1,11 +1,12 @@
-
diff --git a/modules/account/front/role-log/index.js b/modules/account/front/role-log/index.js
new file mode 100644
index 000000000..02448ccaa
--- /dev/null
+++ b/modules/account/front/role-log/index.js
@@ -0,0 +1,7 @@
+import ngModule from '../module';
+import Section from 'salix/components/section';
+
+ngModule.vnComponent('vnRoleLog', {
+ template: require('./index.html'),
+ controller: Section,
+});
diff --git a/modules/account/front/routes.json b/modules/account/front/routes.json
index a6f2f5d3f..cc66df103 100644
--- a/modules/account/front/routes.json
+++ b/modules/account/front/routes.json
@@ -20,12 +20,14 @@
{"state": "account.card.roles", "icon": "group"},
{"state": "account.card.mailForwarding", "icon": "forward"},
{"state": "account.card.aliases", "icon": "email"},
- {"state": "account.card.privileges", "icon": "badge"}
+ {"state": "account.card.privileges", "icon": "badge"},
+ {"state": "account.card.log", "icon": "history"}
],
"role": [
{"state": "account.role.card.basicData", "icon": "settings"},
{"state": "account.role.card.subroles", "icon": "groups"},
- {"state": "account.role.card.inherited", "icon": "account_tree"}
+ {"state": "account.role.card.inherited", "icon": "account_tree"},
+ {"state": "account.role.card.log", "icon": "history"}
],
"alias": [
{"state": "account.alias.card.basicData", "icon": "settings"},
@@ -80,6 +82,18 @@
"description": "Basic data",
"acl": ["hr"]
},
+ {
+ "url" : "/log",
+ "state": "account.card.log",
+ "component": "vn-user-log",
+ "description": "Log"
+ },
+ {
+ "url" : "/log",
+ "state": "account.role.card.log",
+ "component": "vn-role-log",
+ "description": "Log"
+ },
{
"url": "/roles",
"state": "account.card.roles",
diff --git a/modules/account/front/summary/index.js b/modules/account/front/summary/index.js
index 8ed025b61..8d30070e9 100644
--- a/modules/account/front/summary/index.js
+++ b/modules/account/front/summary/index.js
@@ -15,7 +15,7 @@ class Controller extends Summary {
}
}
};
- this.$http.get(`Accounts/${value.id}`, {filter})
+ this.$http.get(`VnUsers/${value.id}`, {filter})
.then(res => this.$.summary = res.data);
}
get isHr() {
diff --git a/modules/account/front/user-log/index.html b/modules/account/front/user-log/index.html
new file mode 100644
index 000000000..5a77ed7b9
--- /dev/null
+++ b/modules/account/front/user-log/index.html
@@ -0,0 +1 @@
+
+
-
+ label="Change destination"
+ disabled="$ctrl.checked.length == 0"
+ ng-click="changeDestination.show()">
+
+
+
-
-
-
+
diff --git a/modules/claim/front/descriptor/index.js b/modules/claim/front/descriptor/index.js
index 0dddadbe1..5e9ea5140 100644
--- a/modules/claim/front/descriptor/index.js
+++ b/modules/claim/front/descriptor/index.js
@@ -17,6 +17,10 @@ class Controller extends Descriptor {
}
sendPickupOrder() {
+ if (!this.claim.client.email) {
+ this.vnApp.showError(this.$t('The client does not have an email'));
+ return;
+ }
return this.vnEmail.send(`Claims/${this.claim.id}/claim-pickup-email`, {
recipient: this.claim.client.email,
recipientId: this.claim.clientFk
diff --git a/modules/claim/front/locale/es.yml b/modules/claim/front/locale/es.yml
index 419e62f56..f6dac2b83 100644
--- a/modules/claim/front/locale/es.yml
+++ b/modules/claim/front/locale/es.yml
@@ -20,3 +20,4 @@ Photos: Fotos
Go to the claim: Ir a la reclamación
Sale tracking: Líneas preparadas
Ticket tracking: Estados del ticket
+The client does not have an email: El cliente no tiene email
diff --git a/modules/claim/front/photos/index.html b/modules/claim/front/photos/index.html
index 9e00ee02f..8b1378917 100644
--- a/modules/claim/front/photos/index.html
+++ b/modules/claim/front/photos/index.html
@@ -1,48 +1 @@
-
-
diff --git a/print/templates/reports/entry-order/sql/entry.sql b/print/templates/reports/entry-order/sql/entry.sql
index 57b8d9293..c30eebca8 100644
--- a/print/templates/reports/entry-order/sql/entry.sql
+++ b/print/templates/reports/entry-order/sql/entry.sql
@@ -1,7 +1,6 @@
SELECT
e.id,
e.invoiceNumber,
- e.notes,
c.code companyCode,
t.landed
FROM entry e
diff --git a/print/templates/reports/expedition-pallet-label/sql/labelData.sql b/print/templates/reports/expedition-pallet-label/sql/labelData.sql
index 0661dbe0f..b2a805251 100644
--- a/print/templates/reports/expedition-pallet-label/sql/labelData.sql
+++ b/print/templates/reports/expedition-pallet-label/sql/labelData.sql
@@ -12,8 +12,8 @@ SELECT ep.id palletFk,
JOIN vn.expedition e ON e.id = es.expeditionFk
JOIN vn.ticket t ON t.id = e.ticketFk
JOIN vn.route r ON r.id = t.routeFk
- LEFT JOIN vn2008.Rutas_monitor rm ON rm.Id_Ruta = r.id
+ LEFT JOIN vn.routesMonitor rm ON rm.routeFk = r.id
LEFT JOIN vn.expeditionTruck et2 ON et2.id = rm.expeditionTruckFk
WHERE ep.id = ?
GROUP BY ep.id, t.routeFk
- ORDER BY t.routeFk
\ No newline at end of file
+ ORDER BY t.routeFk
diff --git a/print/templates/reports/invoice-incoterms/invoice-incoterms.js b/print/templates/reports/invoice-incoterms/invoice-incoterms.js
index fcaffe5de..2c183b6cc 100755
--- a/print/templates/reports/invoice-incoterms/invoice-incoterms.js
+++ b/print/templates/reports/invoice-incoterms/invoice-incoterms.js
@@ -11,7 +11,7 @@ module.exports = {
},
props: {
reference: {
- type: Number,
+ type: String,
required: true,
description: 'The invoice ref'
}
diff --git a/print/templates/reports/invoice/invoice.html b/print/templates/reports/invoice/invoice.html
index 7a1ed3319..727621b2c 100644
--- a/print/templates/reports/invoice/invoice.html
+++ b/print/templates/reports/invoice/invoice.html
@@ -1,9 +1,11 @@
+
+ ![]()
+
+
+
+
+
+
+
+
+
+
+ {{::$ctrl.relativeDate(log.creationDate)}}
+
+
+
+ {{::log.changedModelI18n}}
+
+
+
+ #{{::log.changedModelId}}
+ {{::log.changedModelValue}}
+
+
+
+
+
+
+
+ {{::prop.nameI18n}}:
-
-
- {{::log.changedModel}}
-
-
- {{::$ctrl.actionsText[log.action]}}
-
-
- {{::log.changedModelValue}}
-
-
-
-
-
-
+| Field | -Before | -After | -
|---|---|---|
| {{prop.name}} | -{{prop.old}} | -{{prop.new}} | -
- {{::log.description}}
+
+
-
-
-
-
-
-
- {{$t('notes')}}
-{{entry.notes}}
-
+
+
+
@@ -240,7 +242,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,
{{$t('observations')}}
@@ -264,7 +266,9 @@
v-bind:company-code="invoice.companyCode"
v-bind:left-text="$t('invoiceRef', [invoice.ref])"
v-bind:center-text="client.socialName"
+ v-bind:recipient-id="client.id"
v-bind="$props"
+
>
diff --git a/print/templates/reports/invoice/invoice.js b/print/templates/reports/invoice/invoice.js
index 42988113f..1c9965d3b 100755
--- a/print/templates/reports/invoice/invoice.js
+++ b/print/templates/reports/invoice/invoice.js
@@ -11,8 +11,12 @@ module.exports = {
this.client = await this.findOneFromDef('client', [this.reference]);
this.taxes = await this.rawSqlFromDef(`taxes`, [this.reference]);
this.hasIntrastat = await this.findValueFromDef(`hasIntrastat`, [this.reference]);
- this.intrastat = await this.rawSqlFromDef(`intrastat`,
- [this.reference, this.reference, this.reference, this.reference]);
+ this.intrastat = await this.rawSqlFromDef(`intrastat`, [
+ this.reference,
+ this.reference,
+ this.reference,
+ this.reference
+ ]);
this.rectified = await this.rawSqlFromDef(`rectified`, [this.reference]);
this.hasIncoterms = await this.findValueFromDef(`hasIncoterms`, [this.reference]);
diff --git a/print/templates/reports/invoice/sql/invoice.sql b/print/templates/reports/invoice/sql/invoice.sql
index 0f12e4f53..303fa937f 100644
--- a/print/templates/reports/invoice/sql/invoice.sql
+++ b/print/templates/reports/invoice/sql/invoice.sql
@@ -11,7 +11,7 @@ FROM invoiceOut io
JOIN client c ON c.id = io.clientFk
JOIN payMethod pm ON pm.id = c.payMethodFk
JOIN company cny ON cny.id = io.companyFk
- JOIN supplierAccount sa ON sa.id = cny.supplierAccountFk
+ LEFT JOIN supplierAccount sa ON sa.id = cny.supplierAccountFk
LEFT JOIN invoiceOutSerial ios ON ios.code = io.serial
LEFT JOIN ticket t ON t.refFk = io.ref
WHERE t.refFk = ?
\ No newline at end of file
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 @@