-
-
+
![]()
-
-
- {{::$ctrl.relativeDate(log.creationDate)}}
+
+
@@ -196,18 +210,6 @@
label="To"
ng-model="filter.to">
-
-
-
-
-
-
diff --git a/front/salix/components/log/index.js b/front/salix/components/log/index.js
index ba7c5bc55..8aea255a2 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,27 +63,61 @@ 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;
+ const castJsonValue = this.castJsonValue;
- let props = Object.keys(oldValues).concat(Object.keys(newValues));
+ for (const log of value) {
+ const notDelete = log.action != 'delete';
+ const olds = (notDelete ? log.oldInstance : null) || empty;
+ const vals = (notDelete ? log.newInstance : log.oldInstance) || empty;
+ const locale = validations[log.changedModel]?.locale || empty;
+ log.changedModelI18n = firstUpper(locale.name) || log.changedModel;
+
+ let props = Object.keys(olds).concat(Object.keys(vals));
props = [...new Set(props)];
log.props = [];
for (const prop of props) {
+ if (prop.endsWith('$')) continue;
log.props.push({
name: prop,
- nameI18n: locale.columns?.[prop] || prop,
- old: this.castJsonValue(oldValues[prop]),
- new: this.castJsonValue(newValues[prop])
+ nameI18n: firstUpper(locale.columns?.[prop]) || prop,
+ old: getVal(olds, prop),
+ val: getVal(vals, prop)
});
}
+ log.props.sort(
+ (a, b) => a.nameI18n.localeCompare(b.nameI18n));
+ }
+
+ function getVal(vals, prop) {
+ let val, id;
+ const showProp = `${prop}$`;
+
+ if (vals[showProp] != null) {
+ val = vals[showProp];
+ id = vals[prop];
+ } else
+ val = vals[prop];
+
+ return {val: castJsonValue(val), id};
+ }
+ }
+
+ 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;
}
}
@@ -89,15 +131,6 @@ export default class Controller extends Section {
: value;
}
- mainVal(prop, action) {
- 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 +163,18 @@ 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 = [];
+ if (/^\s*[0-9]+\s*$/.test(value))
+ return {changedModelId: value.trim()};
+ else
+ return {changedModelValue: {like: `%${value}%`}};
+ case 'changes':
+ return {or: [
+ {oldJson: {like: `%${value}%`}},
+ {newJson: {like: `%${value}%`}},
+ {description: {like: `%${value}%`}}
+ ]};
case 'who':
switch (value) {
case 'all':
@@ -160,6 +203,9 @@ export default class Controller extends Section {
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};
}
@@ -175,6 +221,14 @@ export default class Controller extends Section {
return this.$.model.applyFilter(lbFilter);
}
+ filterByEntity(log) {
+ this.$.filter = {
+ who: 'all',
+ search: log.changedModelId,
+ changedModel: log.changedModel
+ };
+ }
+
searchUser(search) {
if (/^[0-9]+$/.test(search)) {
return {id: search};
@@ -192,6 +246,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'),
@@ -203,3 +261,12 @@ ngModule.vnComponent('vnLog', {
url: '@'
}
});
+
+ngModule.component('vnLogValue', {
+ template:
+ '
@@ -33,6 +35,7 @@
fields="['accountingTypeFk']"
include="{relation: 'accountingType'}"
ng-model="$ctrl.bankFk"
+ vn-name="bank"
search-function="$ctrl.bankSearchFunc($search)"
selection="$ctrl.bankSelection"
order="id"
@@ -43,6 +46,7 @@
vn-focus
label="Amount"
ng-model="$ctrl.amountPaid"
+ vn-name="amountPaid"
step="0.01"
required="true"
max="$ctrl.maxAmount">
@@ -52,6 +56,7 @@
@@ -60,6 +65,7 @@
@@ -70,23 +76,27 @@
+ step="0.01"
+ vn-name="deliveredAmount">
+ label="Amount to return"
+ vn-name="amountToReturn">
+ ng-model="$ctrl.viewReceipt"
+ vn-name="viewReceipt">
+ ng-model="$ctrl.sendEmail"
+ vn-name="sendEmail">
diff --git a/modules/client/front/billing-data/index.html b/modules/client/front/billing-data/index.html
index 410681930..bd4f86d1c 100644
--- a/modules/client/front/billing-data/index.html
+++ b/modules/client/front/billing-data/index.html
@@ -14,7 +14,6 @@
- {{bic}} {{name}}
+
+
@@ -100,9 +96,7 @@
-
-
-
\ No newline at end of file
+
diff --git a/modules/client/front/credit-management/index.html b/modules/client/front/credit-management/index.html
index d7456fd06..b9064ff69 100644
--- a/modules/client/front/credit-management/index.html
+++ b/modules/client/front/credit-management/index.html
@@ -68,7 +68,7 @@
{{::clientInforma.rating}}
- {{::clientInforma.recommendedCredit}}
+ {{::clientInforma.recommendedCredit | currency: 'EUR': 2}}
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}}
+
+
+
+
-
@@ -66,14 +66,15 @@
vn-focus
url="Items/withName"
ng-model="buy.itemFk"
- show-field="name"
+ show-field="id"
value-field="id"
search-function="$ctrl.itemSearchFunc($search)"
on-change="$ctrl.saveBuy(buy)"
order="id DESC"
tabindex="1">
- {{::id}} - {{::name}}
+
@@ -174,7 +175,7 @@
-
{{buy.quantity * buy.buyingValue | currency: 'EUR':2}}
@@ -246,4 +247,4 @@
question="You are going to delete buy(s) from this entry"
message="Continue anyway?"
on-accept="$ctrl.deleteBuys()">
-
\ No newline at end of file
+
diff --git a/modules/entry/front/create/index.html b/modules/entry/front/create/index.html
index ed08b5c76..e1e4dc064 100644
--- a/modules/entry/front/create/index.html
+++ b/modules/entry/front/create/index.html
@@ -21,7 +21,8 @@
order="nickname"
required="true">
- {{::id}} - {{::nickname}}
+
@@ -31,11 +32,16 @@
ng-model="$ctrl.entry.travelFk"
url="Travels/filter"
search-function="$ctrl.searchFunction($search)"
+ show-field="warehouseInName"
order="id"
required="true">
- {{::agencyModeName}} - {{::warehouseInName}} ({{::shipped | date: 'dd/MM/yyyy'}}) →
- {{::warehouseOutName}} ({{::landed | date: 'dd/MM/yyyy'}})
+
diff --git a/modules/invoiceIn/back/methods/invoice-in/toBook.js b/modules/invoiceIn/back/methods/invoice-in/toBook.js
index 588d53f1f..877552f41 100644
--- a/modules/invoiceIn/back/methods/invoice-in/toBook.js
+++ b/modules/invoiceIn/back/methods/invoice-in/toBook.js
@@ -21,7 +21,7 @@ module.exports = Self => {
Self.toBook = async(ctx, id, options) => {
let tx;
- const myOptions = {};
+ const myOptions = {userId: ctx.req.accessToken.userId};
if (typeof options == 'object')
Object.assign(myOptions, options);
diff --git a/modules/invoiceIn/back/models/invoice-in-log.json b/modules/invoiceIn/back/models/invoice-in-log.json
index 70892d0f9..43ebb4c55 100644
--- a/modules/invoiceIn/back/models/invoice-in-log.json
+++ b/modules/invoiceIn/back/models/invoice-in-log.json
@@ -5,57 +5,5 @@
"mysql": {
"table": "invoiceInLog"
}
- },
- "properties": {
- "id": {
- "id": true,
- "type": "number",
- "forceId": false
- },
- "originFk": {
- "type": "number",
- "required": true
- },
- "userFk": {
- "type": "number"
- },
- "action": {
- "type": "string",
- "required": true
- },
- "changedModel": {
- "type": "string"
- },
- "oldInstance": {
- "type": "object"
- },
- "newInstance": {
- "type": "object"
- },
- "creationDate": {
- "type": "date"
- },
- "changedModelId": {
- "type": "string"
- },
- "changedModelValue": {
- "type": "string"
- },
- "description": {
- "type": "string"
- }
- },
- "relations": {
- "user": {
- "type": "belongsTo",
- "model": "VnUser",
- "foreignKey": "userFk"
- }
- },
- "scope": {
- "order": [
- "creationDate DESC",
- "id DESC"
- ]
}
}
diff --git a/modules/invoiceIn/front/tax/index.html b/modules/invoiceIn/front/tax/index.html
index acc9cf492..e13f769ce 100644
--- a/modules/invoiceIn/front/tax/index.html
+++ b/modules/invoiceIn/front/tax/index.html
@@ -34,7 +34,7 @@
rule>
{{id}}: {{name}}
-
@@ -57,7 +57,10 @@
search-function="{or: [{id: $search}, {vat: {like: '%'+ $search +'%'}}]}"
selection="taxRateSelection"
rule>
- {{id}}: {{vat}}
+
+
- {{id}}: {{transaction}}
+
+
-
+
@@ -105,7 +111,7 @@
-
+
@@ -115,7 +121,7 @@
@@ -129,7 +135,7 @@
@@ -140,4 +146,4 @@
-
\ No newline at end of file
+
diff --git a/modules/invoiceOut/back/methods/invoiceOut/book.js b/modules/invoiceOut/back/methods/invoiceOut/book.js
index 7aa0eac1f..af5633ff2 100644
--- a/modules/invoiceOut/back/methods/invoiceOut/book.js
+++ b/modules/invoiceOut/back/methods/invoiceOut/book.js
@@ -1,6 +1,6 @@
module.exports = Self => {
- Self.remoteMethod('book', {
+ Self.remoteMethodCtx('book', {
description: 'Book an invoiceOut',
accessType: 'WRITE',
accepts: {
@@ -20,10 +20,10 @@ module.exports = Self => {
}
});
- Self.book = async(ref, options) => {
+ Self.book = async(ctx, ref, options) => {
const models = Self.app.models;
let tx;
- const myOptions = {};
+ const myOptions = {userId: ctx.req.accessToken.userId};
if (typeof options == 'object')
Object.assign(myOptions, options);
diff --git a/modules/invoiceOut/back/methods/invoiceOut/clientsToInvoice.js b/modules/invoiceOut/back/methods/invoiceOut/clientsToInvoice.js
index f18b0c682..63b00fe38 100644
--- a/modules/invoiceOut/back/methods/invoiceOut/clientsToInvoice.js
+++ b/modules/invoiceOut/back/methods/invoiceOut/clientsToInvoice.js
@@ -36,7 +36,7 @@ module.exports = Self => {
Self.clientsToInvoice = async(ctx, clientId, invoiceDate, maxShipped, companyFk, options) => {
let tx;
- const myOptions = {};
+ const myOptions = {userId: ctx.req.accessToken.userId};
if (typeof options == 'object')
Object.assign(myOptions, options);
diff --git a/modules/invoiceOut/back/methods/invoiceOut/createManualInvoice.js b/modules/invoiceOut/back/methods/invoiceOut/createManualInvoice.js
index a458aa18e..18e6903d6 100644
--- a/modules/invoiceOut/back/methods/invoiceOut/createManualInvoice.js
+++ b/modules/invoiceOut/back/methods/invoiceOut/createManualInvoice.js
@@ -51,7 +51,7 @@ module.exports = Self => {
const args = ctx.args;
let tx;
- const myOptions = {};
+ const myOptions = {userId: ctx.req.accessToken.userId};
if (typeof options == 'object')
Object.assign(myOptions, options);
diff --git a/modules/invoiceOut/back/methods/invoiceOut/createPdf.js b/modules/invoiceOut/back/methods/invoiceOut/createPdf.js
index a9c151ae4..dfdb3c1a7 100644
--- a/modules/invoiceOut/back/methods/invoiceOut/createPdf.js
+++ b/modules/invoiceOut/back/methods/invoiceOut/createPdf.js
@@ -25,7 +25,6 @@ module.exports = Self => {
Self.createPdf = async function(ctx, id, options) {
const models = Self.app.models;
- const userId = ctx.req.accessToken.userId;
if (process.env.NODE_ENV == 'test')
throw new UserError(`Action not allowed on the test environment`);
@@ -43,9 +42,9 @@ module.exports = Self => {
try {
const invoiceOut = await Self.findById(id, null, myOptions);
- const hasInvoicing = await models.VnUser.hasRole(userId, 'invoicing', myOptions);
+ const canCreatePdf = await models.ACL.checkAccessAcl(ctx, 'InvoiceOut', 'canCreatePdf', 'WRITE');
- if (invoiceOut.hasPdf && !hasInvoicing)
+ if (invoiceOut.hasPdf && !canCreatePdf)
throw new UserError(`You don't have enough privileges`);
await invoiceOut.updateAttributes({
diff --git a/modules/invoiceOut/back/methods/invoiceOut/invoiceClient.js b/modules/invoiceOut/back/methods/invoiceOut/invoiceClient.js
index c8f8a6778..421cbaea1 100644
--- a/modules/invoiceOut/back/methods/invoiceOut/invoiceClient.js
+++ b/modules/invoiceOut/back/methods/invoiceOut/invoiceClient.js
@@ -50,7 +50,7 @@ module.exports = Self => {
Self.invoiceClient = async(ctx, options) => {
const args = ctx.args;
const models = Self.app.models;
- const myOptions = {};
+ const myOptions = {userId: ctx.req.accessToken.userId};
let tx;
if (typeof options == 'object')
diff --git a/modules/invoiceOut/back/methods/invoiceOut/refund.js b/modules/invoiceOut/back/methods/invoiceOut/refund.js
index ad480dc7d..1b7ccc1e4 100644
--- a/modules/invoiceOut/back/methods/invoiceOut/refund.js
+++ b/modules/invoiceOut/back/methods/invoiceOut/refund.js
@@ -1,12 +1,20 @@
module.exports = Self => {
- Self.remoteMethod('refund', {
+ Self.remoteMethodCtx('refund', {
description: 'Create refund tickets with sales and services if provided',
accessType: 'WRITE',
- accepts: [{
- arg: 'ref',
- type: 'string',
- description: 'The invoice reference'
- }],
+ accepts: [
+ {
+ arg: 'ref',
+ type: 'string',
+ description: 'The invoice reference',
+ required: true
+ },
+ {
+ arg: 'withWarehouse',
+ type: 'boolean',
+ required: true
+ }
+ ],
returns: {
type: ['number'],
root: true
@@ -17,7 +25,7 @@ module.exports = Self => {
}
});
- Self.refund = async(ref, options) => {
+ Self.refund = async(ctx, ref, withWarehouse, options) => {
const models = Self.app.models;
const myOptions = {};
let tx;
@@ -35,7 +43,7 @@ module.exports = Self => {
const tickets = await models.Ticket.find(filter, myOptions);
const ticketsIds = tickets.map(ticket => ticket.id);
- const refundedTickets = await models.Ticket.refund(ticketsIds, myOptions);
+ const refundedTickets = await models.Ticket.refund(ctx, ticketsIds, withWarehouse, myOptions);
if (tx) await tx.commit();
diff --git a/modules/invoiceOut/back/methods/invoiceOut/specs/book.spec.js b/modules/invoiceOut/back/methods/invoiceOut/specs/book.spec.js
index ee72f2218..3af7542ca 100644
--- a/modules/invoiceOut/back/methods/invoiceOut/specs/book.spec.js
+++ b/modules/invoiceOut/back/methods/invoiceOut/specs/book.spec.js
@@ -1,6 +1,7 @@
const models = require('vn-loopback/server/server').models;
describe('invoiceOut book()', () => {
+ const ctx = {req: {accessToken: {userId: 9}}};
const invoiceOutId = 5;
it('should update the booked property', async() => {
@@ -12,7 +13,7 @@ describe('invoiceOut book()', () => {
const bookedDate = originalInvoiceOut.booked;
const invoiceOutRef = originalInvoiceOut.ref;
- await models.InvoiceOut.book(invoiceOutRef, options);
+ await models.InvoiceOut.book(ctx, invoiceOutRef, options);
const updatedInvoiceOut = await models.InvoiceOut.findById(invoiceOutId, {}, options);
diff --git a/modules/invoiceOut/back/methods/invoiceOut/specs/refund.spec.js b/modules/invoiceOut/back/methods/invoiceOut/specs/refund.spec.js
index 35f2b4023..072fcc12c 100644
--- a/modules/invoiceOut/back/methods/invoiceOut/specs/refund.spec.js
+++ b/modules/invoiceOut/back/methods/invoiceOut/specs/refund.spec.js
@@ -3,6 +3,8 @@ const LoopBackContext = require('loopback-context');
describe('InvoiceOut refund()', () => {
const userId = 5;
+ const ctx = {req: {accessToken: userId}};
+ const withWarehouse = true;
const activeCtx = {
accessToken: {userId: userId},
};
@@ -15,7 +17,7 @@ describe('InvoiceOut refund()', () => {
const options = {transaction: tx};
try {
- const result = await models.InvoiceOut.refund('T1111111', options);
+ const result = await models.InvoiceOut.refund(ctx, 'T1111111', withWarehouse, options);
expect(result).toBeDefined();
diff --git a/modules/invoiceOut/front/descriptor-menu/index.html b/modules/invoiceOut/front/descriptor-menu/index.html
index 389fcf81b..106f8e3cc 100644
--- a/modules/invoiceOut/front/descriptor-menu/index.html
+++ b/modules/invoiceOut/front/descriptor-menu/index.html
@@ -76,14 +76,27 @@
translate>
Show CITES letter
-
- Refund
+ Refund...
+
+
+
+ with warehouse
+
+
+ without warehouse
+
+
+
@@ -97,12 +110,7 @@
on-accept="$ctrl.bookInvoiceOut()"
question="Are you sure you want to book this invoice?">
-
-
-
@@ -148,4 +156,4 @@
-
\ No newline at end of file
+
diff --git a/modules/invoiceOut/front/descriptor-menu/index.js b/modules/invoiceOut/front/descriptor-menu/index.js
index 57ea653a8..38c3c9434 100644
--- a/modules/invoiceOut/front/descriptor-menu/index.js
+++ b/modules/invoiceOut/front/descriptor-menu/index.js
@@ -114,9 +114,9 @@ class Controller extends Section {
});
}
- refundInvoiceOut() {
+ refundInvoiceOut(withWarehouse) {
const query = 'InvoiceOuts/refund';
- const params = {ref: this.invoiceOut.ref};
+ const params = {ref: this.invoiceOut.ref, withWarehouse: withWarehouse};
this.$http.post(query, params).then(res => {
const refundTicket = res.data;
this.vnApp.showSuccess(this.$t('The following refund ticket have been created', {
diff --git a/modules/invoiceOut/front/descriptor-menu/locale/es.yml b/modules/invoiceOut/front/descriptor-menu/locale/es.yml
index df0ba57cf..393efd58c 100644
--- a/modules/invoiceOut/front/descriptor-menu/locale/es.yml
+++ b/modules/invoiceOut/front/descriptor-menu/locale/es.yml
@@ -13,10 +13,11 @@ InvoiceOut deleted: Factura eliminada
Are you sure you want to delete this invoice?: Estas seguro de eliminar esta factura?
Are you sure you want to clone this invoice?: Estas seguro de clonar esta factura?
InvoiceOut booked: Factura asentada
-Are you sure you want to book this invoice?: Estas seguro de querer asentar esta factura?
+Are you sure you want to book this invoice?: Estas seguro de querer asentar esta factura?
Are you sure you want to refund this invoice?: Estas seguro de querer abonar esta factura?
Create a single ticket with all the content of the current invoice: Crear un ticket unico con todo el contenido de la factura actual
Regenerate PDF invoice: Regenerar PDF factura
The invoice PDF document has been regenerated: El documento PDF de la factura ha sido regenerado
The email can't be empty: El correo no puede estar vacío
The following refund tickets have been created: "Se han creado los siguientes tickets de abono: {{ticketIds}}"
+Refund...: Abono...
diff --git a/modules/invoiceOut/front/global-invoicing/index.html b/modules/invoiceOut/front/global-invoicing/index.html
index ebe46b84a..6d5b16329 100644
--- a/modules/invoiceOut/front/global-invoicing/index.html
+++ b/modules/invoiceOut/front/global-invoicing/index.html
@@ -98,7 +98,10 @@
ng-model="$ctrl.clientId"
required="true"
ng-if="$ctrl.clientsToInvoice == 'one'">
- {{::id}} - {{::name}}
+
+
- {{::id}} - {{::nickname}}
+
Or
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..9e3d7cad5 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 data
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..75b1587a5 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: datos botánicos
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..ea40fd34b 100644
--- a/modules/item/back/locale/item/en.yml
+++ b/modules/item/back/locale/item/en.yml
@@ -35,7 +35,7 @@ columns:
packingOut: packing out
hasMinPrice: has min price
isFragile: fragile
- isFloramondo: is floramondo
+ isFloramondo: floramondo
packingShelve: packing shelve
isLaid: laid
inkFk: ink
@@ -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..973f5e94f 100644
--- a/modules/item/back/locale/item/es.yml
+++ b/modules/item/back/locale/item/es.yml
@@ -27,15 +27,15 @@ 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
packingOut: empaquetar
hasMinPrice: tiene precio mínimo
isFragile: frágil
- isFloramondo: es floramondo
+ isFloramondo: floramondo
packingShelve: estantería embalaje
isLaid: puesto
inkFk: tinta
@@ -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..d4e2d0f74 100644
--- a/modules/item/back/methods/item/getBalance.js
+++ b/modules/item/back/methods/item/getBalance.js
@@ -1,5 +1,5 @@
module.exports = Self => {
- Self.remoteMethod('getBalance', {
+ Self.remoteMethodCtx('getBalance', {
description: 'Returns the ',
accessType: 'READ',
accepts: [{
@@ -19,15 +19,15 @@ module.exports = Self => {
}
});
- Self.getBalance = async(filter, options) => {
- const myOptions = {};
+ Self.getBalance = async(ctx, filter, options) => {
+ const myOptions = {userId: ctx.req.accessToken.userId};
if (typeof options == 'object')
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/new.js b/modules/item/back/methods/item/new.js
index d066f2c9f..c82e2a6b1 100644
--- a/modules/item/back/methods/item/new.js
+++ b/modules/item/back/methods/item/new.js
@@ -1,7 +1,7 @@
let UserError = require('vn-loopback/util/user-error');
module.exports = Self => {
- Self.remoteMethod('new', {
+ Self.remoteMethodCtx('new', {
description: 'returns the created item',
accessType: 'WRITE',
accepts: [{
@@ -19,9 +19,9 @@ module.exports = Self => {
}
});
- Self.new = async(params, options) => {
+ Self.new = async(ctx, params, options) => {
const models = Self.app.models;
- const myOptions = {};
+ const myOptions = {userId: ctx.req.accessToken.userId};
let tx;
if (typeof options == 'object')
diff --git a/modules/item/back/methods/item/specs/getBalance.spec.js b/modules/item/back/methods/item/specs/getBalance.spec.js
index 779516b19..e013d8956 100644
--- a/modules/item/back/methods/item/specs/getBalance.spec.js
+++ b/modules/item/back/methods/item/specs/getBalance.spec.js
@@ -2,6 +2,7 @@ const models = require('vn-loopback/server/server').models;
const LoopBackContext = require('loopback-context');
describe('item getBalance()', () => {
+ const ctx = {req: {accessToken: {userId: 9}}};
it('should return the balance lines of a client type loses in which one has highlighted true', async() => {
const tx = await models.Item.beginTransaction({});
const options = {transaction: tx};
@@ -21,10 +22,11 @@ describe('item getBalance()', () => {
const filter = {
where: {
itemFk: 1,
- warehouseFk: 1
+ warehouseFk: 1,
+ date: null
}
};
- const results = await models.Item.getBalance(filter, options);
+ const results = await models.Item.getBalance(ctx, filter, options);
const result = results.find(element => element.clientType == 'loses');
@@ -45,19 +47,21 @@ 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
}
};
- const firstItemBalance = await models.Item.getBalance(firstFilter, options);
- const secondItemBalance = await models.Item.getBalance(secondFilter, options);
+ const firstItemBalance = await models.Item.getBalance(ctx, firstFilter, options);
+ const secondItemBalance = await models.Item.getBalance(ctx, secondFilter, options);
expect(firstItemBalance[9].claimFk).toEqual(null);
expect(secondItemBalance[5].claimFk).toEqual(2);
diff --git a/modules/item/back/methods/item/specs/new.spec.js b/modules/item/back/methods/item/specs/new.spec.js
index a1c741649..2ffaf87a5 100644
--- a/modules/item/back/methods/item/specs/new.spec.js
+++ b/modules/item/back/methods/item/specs/new.spec.js
@@ -2,6 +2,7 @@ const models = require('vn-loopback/server/server').models;
const LoopBackContext = require('loopback-context');
describe('item new()', () => {
+ const ctx = {req: {accessToken: {userId: 9}}};
beforeAll(async() => {
const activeCtx = {
accessToken: {userId: 9},
@@ -30,7 +31,7 @@ describe('item new()', () => {
tag: 1
};
- let item = await models.Item.new(itemParams, options);
+ let item = await models.Item.new(ctx, itemParams, options);
let itemType = await models.ItemType.findById(item.typeFk, options);
diff --git a/modules/item/back/models/item-log.json b/modules/item/back/models/item-log.json
index 19c132187..8b8534d11 100644
--- a/modules/item/back/models/item-log.json
+++ b/modules/item/back/models/item-log.json
@@ -5,54 +5,5 @@
"mysql": {
"table": "itemLog"
}
- },
- "properties": {
- "id": {
- "id": true,
- "type": "number",
- "forceId": false
- },
- "originFk": {
- "type": "number",
- "required": true
- },
- "userFk": {
- "type": "number"
- },
- "action": {
- "type": "string",
- "required": true
- },
- "changedModel": {
- "type": "string"
- },
- "oldInstance": {
- "type": "object"
- },
- "newInstance": {
- "type": "object"
- },
- "creationDate": {
- "type": "date"
- },
- "changedModelId": {
- "type": "number"
- },
- "changedModelValue": {
- "type": "string"
- },
- "description": {
- "type": "string"
- }
- },
- "relations": {
- "user": {
- "type": "belongsTo",
- "model": "VnUser",
- "foreignKey": "userFk"
- }
- },
- "scope": {
- "order": ["creationDate DESC", "id DESC"]
}
}
diff --git a/modules/item/front/basic-data/index.html b/modules/item/front/basic-data/index.html
index 974aa37d8..a7e603bd1 100644
--- a/modules/item/front/basic-data/index.html
+++ b/modules/item/front/basic-data/index.html
@@ -20,47 +20,52 @@
-
-
-
-
-
-
-
+ ng-model="$ctrl.item.stemMultiplier"
+ vn-name="stemMultiplier">
- {{::id}} - {{::name}}
+
+ ng-model="$ctrl.item.isActive"
+ vn-name="isActive">
+ ng-model="$ctrl.item.hasKgPrice"
+ vn-name="priceInKg">
@@ -211,16 +221,19 @@
message="New intrastat">
-
-
diff --git a/modules/item/front/create/index.html b/modules/item/front/create/index.html
index 15e212250..b284abf06 100644
--- a/modules/item/front/create/index.html
+++ b/modules/item/front/create/index.html
@@ -18,6 +18,7 @@
+ label="Tag"
+ vn-name="tag">
+ value-field="priority"
+ vn-name="priority">
-
-
-
+ ng-model="$ctrl.item.originFk"
+ vn-name="origin">
diff --git a/modules/item/front/descriptor/index.html b/modules/item/front/descriptor/index.html
index 8e85e043f..7c442d364 100644
--- a/modules/item/front/descriptor/index.html
+++ b/modules/item/front/descriptor/index.html
@@ -1,3 +1,8 @@
+
+
+ data="warehouses"
+ show-field="name"
+ value="id">
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/index.html b/modules/item/front/fixed-price/index.html
index 9a143d10d..d9a955fe1 100644
--- a/modules/item/front/fixed-price/index.html
+++ b/modules/item/front/fixed-price/index.html
@@ -81,7 +81,8 @@
class="dense"
url="Items/withName"
ng-model="price.itemFk"
- show-field="name"
+ fields="['name']"
+ show-field="id"
value-field="id"
search-function="$ctrl.itemSearchFunc($search)"
on-change="$ctrl.upsertPrice(price, true)"
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/item/front/request-search-panel/index.html b/modules/item/front/request-search-panel/index.html
index dfafb02f3..a76684776 100644
--- a/modules/item/front/request-search-panel/index.html
+++ b/modules/item/front/request-search-panel/index.html
@@ -1,4 +1,9 @@
-
-
\ 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/travel/back/methods/thermograph/createThermograph.js b/modules/travel/back/methods/thermograph/createThermograph.js
index 75d967628..243e2129f 100644
--- a/modules/travel/back/methods/thermograph/createThermograph.js
+++ b/modules/travel/back/methods/thermograph/createThermograph.js
@@ -1,5 +1,5 @@
module.exports = Self => {
- Self.remoteMethod('createThermograph', {
+ Self.remoteMethodCtx('createThermograph', {
description: 'Creates a new thermograph',
accessType: 'WRITE',
accepts: [{
@@ -36,10 +36,10 @@ module.exports = Self => {
}
});
- Self.createThermograph = async(thermographId, model, temperatureFk, warehouseId, options) => {
+ Self.createThermograph = async(ctx, thermographId, model, temperatureFk, warehouseId, options) => {
const models = Self.app.models;
let tx;
- const myOptions = {};
+ const myOptions = {userId: ctx.req.accessToken.userId};
const date = Date.vnNew();
if (typeof options == 'object')
diff --git a/modules/travel/back/methods/thermograph/specs/createThermograph.spec.js b/modules/travel/back/methods/thermograph/specs/createThermograph.spec.js
index 32014e303..90855bf81 100644
--- a/modules/travel/back/methods/thermograph/specs/createThermograph.spec.js
+++ b/modules/travel/back/methods/thermograph/specs/createThermograph.spec.js
@@ -5,6 +5,7 @@ describe('Termograph createThermograph()', () => {
const model = 'DISPOSABLE';
const temperatureFk = 'COOL';
const warehouseId = 1;
+ const ctx = {req: {accessToken: {userId: 9}}};
it(`should create a thermograph which is saved in both thermograph and travelThermograph`, async() => {
const tx = await models.Thermograph.beginTransaction({});
@@ -12,7 +13,7 @@ describe('Termograph createThermograph()', () => {
try {
const options = {transaction: tx};
- const createdThermograph = await models.Thermograph.createThermograph(thermographId, model, temperatureFk, warehouseId, options);
+ const createdThermograph = await models.Thermograph.createThermograph(ctx, thermographId, model, temperatureFk, warehouseId, options);
expect(createdThermograph.id).toEqual(thermographId);
expect(createdThermograph.model).toEqual(model);
@@ -37,8 +38,8 @@ describe('Termograph createThermograph()', () => {
try {
const options = {transaction: tx};
- await models.Thermograph.createThermograph(thermographId, model, temperatureFk, warehouseId, options);
- await models.Thermograph.createThermograph(thermographId, model, temperatureFk, warehouseId, options);
+ await models.Thermograph.createThermograph(ctx, thermographId, model, temperatureFk, warehouseId, options);
+ await models.Thermograph.createThermograph(ctx, thermographId, model, temperatureFk, warehouseId, options);
await tx.rollback();
} catch (e) {
diff --git a/modules/travel/back/methods/travel/deleteThermograph.js b/modules/travel/back/methods/travel/deleteThermograph.js
index ba541c560..d22fc8b29 100644
--- a/modules/travel/back/methods/travel/deleteThermograph.js
+++ b/modules/travel/back/methods/travel/deleteThermograph.js
@@ -26,9 +26,9 @@ module.exports = Self => {
await models.Dms.removeFile(ctx, travelThermograph.dmsFk);
await Self.rawSql(`
- UPDATE travelThermograph
- SET travelFk = NULL, dmsFk = NULL
- WHERE id = ?`, [id]);
+ UPDATE travelThermograph
+ SET travelFk = NULL, dmsFk = NULL
+ WHERE id = ?`, [id], {userId});
const oldInstance = {
travelFk: travelThermograph.travelFk,
diff --git a/modules/travel/back/model-config.json b/modules/travel/back/model-config.json
index 34321ba78..ed5c071b3 100644
--- a/modules/travel/back/model-config.json
+++ b/modules/travel/back/model-config.json
@@ -14,6 +14,9 @@
"TravelThermograph": {
"dataSource": "vn"
},
+ "TravelConfig": {
+ "dataSource": "vn"
+ },
"Temperature": {
"dataSource": "vn"
}
diff --git a/modules/travel/back/models/travel-config.json b/modules/travel/back/models/travel-config.json
new file mode 100644
index 000000000..360c0b81a
--- /dev/null
+++ b/modules/travel/back/models/travel-config.json
@@ -0,0 +1,49 @@
+{
+ "name": "TravelConfig",
+ "base": "VnModel",
+ "options": {
+ "mysql": {
+ "table": "travelConfig"
+ }
+ },
+ "properties": {
+ "id": {
+ "type": "number",
+ "id": true
+ },
+ "warehouseInFk": {
+ "type": "number"
+ },
+ "warehouseOutFk": {
+ "type": "number"
+ },
+ "agencyFk": {
+ "type": "number"
+ },
+ "companyFk": {
+ "type": "number"
+ }
+ },
+ "relations": {
+ "warehouseIn": {
+ "type": "belongsTo",
+ "model": "Warehouse",
+ "foreignKey": "warehouseInFk"
+ },
+ "warehouseOut": {
+ "type": "belongsTo",
+ "model": "Warehouse",
+ "foreignKey": "warehouseOutFk"
+ },
+ "agency": {
+ "type": "belongsTo",
+ "model": "AgencyMode",
+ "foreignKey": "agencyFk"
+ },
+ "company": {
+ "type": "belongsTo",
+ "model": "Company",
+ "foreignKey": "companyFk"
+ }
+ }
+}
diff --git a/modules/travel/back/models/travel-log.json b/modules/travel/back/models/travel-log.json
index e781c2948..e01d57943 100644
--- a/modules/travel/back/models/travel-log.json
+++ b/modules/travel/back/models/travel-log.json
@@ -5,54 +5,5 @@
"mysql": {
"table": "travelLog"
}
- },
- "properties": {
- "id": {
- "id": true,
- "type": "number",
- "forceId": false
- },
- "originFk": {
- "type": "number",
- "required": true
- },
- "userFk": {
- "type": "number"
- },
- "action": {
- "type": "string",
- "required": true
- },
- "changedModel": {
- "type": "string"
- },
- "oldInstance": {
- "type": "object"
- },
- "newInstance": {
- "type": "object"
- },
- "creationDate": {
- "type": "date"
- },
- "changedModelId": {
- "type": "string"
- },
- "changedModelValue": {
- "type": "string"
- },
- "description": {
- "type": "string"
- }
- },
- "relations": {
- "user": {
- "type": "belongsTo",
- "model": "VnUser",
- "foreignKey": "userFk"
- }
- },
- "scope": {
- "order": ["creationDate DESC", "id DESC"]
}
}
diff --git a/modules/travel/front/basic-data/index.html b/modules/travel/front/basic-data/index.html
index e7143ffc0..783208d9a 100644
--- a/modules/travel/front/basic-data/index.html
+++ b/modules/travel/front/basic-data/index.html
@@ -17,7 +17,8 @@
+ ng-model="$ctrl.travel.ref"
+ vn-name="reference">
+ label="Agency"
+ vn-name="agencyMode">
+ ng-model="$ctrl.travel.shipped"
+ vn-name="shipped">
+ ng-model="$ctrl.travel.landed"
+ vn-name="landed">
+ ng-model="$ctrl.travel.ref"
+ vn-name="reference">
@@ -22,22 +24,26 @@
+ ng-model="$ctrl.travel.shipped"
+ vn-name="shipped">
+ ng-model="$ctrl.travel.landed"
+ vn-name="landed">
diff --git a/modules/travel/front/extra-community-search-panel/index.html b/modules/travel/front/extra-community-search-panel/index.html
index 09fbb8949..c0d726718 100644
--- a/modules/travel/front/extra-community-search-panel/index.html
+++ b/modules/travel/front/extra-community-search-panel/index.html
@@ -1,4 +1,9 @@
{{$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,
diff --git a/webpack.config.js b/webpack.config.js
index 66f2179a9..a102b838e 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -9,7 +9,7 @@ let mode = env == 'development' ? env : 'production';
let baseConfig = {
entry: {salix: 'salix'},
- mode: mode,
+ mode,
output: {
path: path.join(__dirname, 'dist'),
publicPath: '/'
@@ -20,13 +20,13 @@ let baseConfig = {
test: /\.js$/,
loader: 'babel-loader',
exclude: /node_modules/,
- query: {
+ options: {
presets: ['@babel/preset-env'],
plugins: ['@babel/plugin-syntax-dynamic-import']
}
}, {
test: /\.yml$/,
- loader: 'json-loader!yaml-loader'
+ use: ['json-loader!yaml-loader']
}, {
test: /\.html$/,
loader: 'html-loader',
@@ -38,39 +38,34 @@ let baseConfig = {
}
}, {
test: /\.css$/,
- use: [
- {
- loader: 'style-loader'
- }, {
- loader: 'css-loader'
- }
- ]
+ use: ['style-loader', 'css-loader']
}, {
test: /\.scss$/,
use: [
- {
- loader: 'style-loader'
- }, {
- loader: 'css-loader'
- }, {
+ 'style-loader', 'css-loader', {
loader: 'sass-loader',
options: {
// XXX: Don't work in Firefox
// https://github.com/webpack-contrib/style-loader/issues/303
// sourceMap: true,
- includePaths: [
- path.resolve(__dirname, 'front/core/styles')
- ]
+ sassOptions: {
+ includePaths: [
+ path.resolve(__dirname, 'front/core/styles/')
+ ]
+ }
}
}
]
}, {
- test: /\.(svg|png|ttf|woff|woff2)$/,
- loader: 'file-loader'
+ test: /\.(woff(2)?|ttf|eot|svg|png)(\?v=\d+\.\d+\.\d+)?$/,
+ type: 'asset/resource',
}, {
test: /manifest\.json$/,
type: 'javascript/auto',
- loader: 'file-loader'
+ loader: 'file-loader',
+ options: {
+ esModule: false,
+ }
}
]
},
@@ -105,7 +100,7 @@ let baseConfig = {
chunks: ['salix']
}),
new webpack.DefinePlugin({
- 'process.env.NODE_ENV': JSON.stringify(process.env.NODE_ENV)
+ 'process.env.NODE_ENV': JSON.stringify(env)
})
],
devtool: 'source-map',
@@ -124,7 +119,7 @@ let prodConfig = {
chunkFilename: '[id].[chunkhash].js'
},
plugins: [
- new webpack.HashedModuleIdsPlugin()
+ new webpack.ids.HashedModuleIdsPlugin()
],
performance: {
maxEntrypointSize: 2000000,
+
-
+
+ {{::log.changedModelI18n}}
+
+
+
+ {{::$ctrl.relativeDate(log.creationDate)}}
+
+
-
- {{::$ctrl.actionsText[log.action]}}
-
-
- {{::log.changedModelI18n}}
-
-
- #{{::log.changedModelId}}
-
-
- {{::log.changedModelValue}}
-
+
-
-
+ label="Changes"
+ ng-model="filter.changes">
+
+
+
+
-
+
+ #{{::log.changedModelId}}
+
+
+ {{::log.changedModelValue}}
-
-
+
+
+
+
-
-
-
+
-
-
-
+
+
+
+ {{::prop.nameI18n}}:
+
+
Compensation
{{::bic}}
+ {{::name}}
+ {{::name}}
+ #{{::id}}
{{::nickname}}
+ #{{::id}}
+ {{::agencyModeName}}
+ - {{::warehouseInName}} ({{::shipped | date: 'dd/MM/yyyy'}})
+ → {{::warehouseOutName}} ({{::landed | date: 'dd/MM/yyyy'}})
+
+ #{{::id}}
{{::vat}}
+ #{{::id}}
+ {{::transaction}}
+ #{{::id}}
+ {{::name}}
+ #{{::id}}
+ #{{::id}}
+ {{::nickname}}
{{name}}
+ {{::name}}
- {{category.name}}
+ {{::category.name}}
{{::id}}
+ {{::description}}
+
+ #{{::id}}
+
{{::name}}
+
+ #{{::id}}
+
{{::id}}
+ {{::description}}
+
+ #{{::id}}
+
+
+
+
+
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 @@