diff --git a/modules/client/front/routes.json b/modules/client/front/routes.json
index ac5e78d99..765fbc637 100644
--- a/modules/client/front/routes.json
+++ b/modules/client/front/routes.json
@@ -16,7 +16,7 @@
{"state": "client.card.note.index", "icon": "insert_drive_file"},
{"state": "client.card.credit.index", "icon": "credit_card"},
{"state": "client.card.greuge.index", "icon": "work"},
- {"state": "client.card.balance.index", "icon": "icon-invoices"},
+ {"state": "client.card.balance.index", "icon": "icon-invoice"},
{"state": "client.card.recovery.index", "icon": "icon-recovery"},
{"state": "client.card.webAccess", "icon": "cloud"},
{"state": "client.card.log", "icon": "history"},
diff --git a/modules/entry/front/buy/import/index.html b/modules/entry/front/buy/import/index.html
index ada92fcc3..154e74ffc 100644
--- a/modules/entry/front/buy/import/index.html
+++ b/modules/entry/front/buy/import/index.html
@@ -113,7 +113,6 @@
diff --git a/modules/entry/front/buy/import/index.js b/modules/entry/front/buy/import/index.js
index 2f13b2746..a88476240 100644
--- a/modules/entry/front/buy/import/index.js
+++ b/modules/entry/front/buy/import/index.js
@@ -133,7 +133,7 @@ class Controller extends Section {
case 'producerFk':
case 'typeFk':
case 'size':
- case 'ink':
+ case 'inkFk':
where[key] = value;
}
}
diff --git a/modules/item/back/models/item.json b/modules/item/back/models/item.json
index fd4b6b079..9b78264f7 100644
--- a/modules/item/back/models/item.json
+++ b/modules/item/back/models/item.json
@@ -176,6 +176,11 @@
"model": "Expense",
"foreignKey": "expenseFk"
},
+ "generic": {
+ "type": "belongsTo",
+ "model": "Item",
+ "foreignKey": "genericFk"
+ },
"tags": {
"type": "hasMany",
"model": "ItemTag",
diff --git a/modules/item/front/basic-data/index.html b/modules/item/front/basic-data/index.html
index cec7a063f..e926e3180 100644
--- a/modules/item/front/basic-data/index.html
+++ b/modules/item/front/basic-data/index.html
@@ -137,6 +137,29 @@
ng-model="$ctrl.item.compression"
rule>
+
+
+ {{::id}} - {{::name}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ID
+ Item
+ Size
+ Producer
+ Color
+
+
+
+
+
+
+ {{::item.id}}
+
+
+ {{::item.name}}
+ {{::item.size}}
+ {{::item.producer.name}}
+ {{::item.ink.name}}
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/modules/item/front/basic-data/index.js b/modules/item/front/basic-data/index.js
index 1a256c65b..5a303f15f 100644
--- a/modules/item/front/basic-data/index.js
+++ b/modules/item/front/basic-data/index.js
@@ -17,6 +17,65 @@ class Controller extends Section {
return this.$http.patch(query, this.newIntrastat)
.then(res => this.item.intrastatFk = res.data.id);
}
+
+ itemSearchFunc($search) {
+ return /^\d+$/.test($search)
+ ? {id: $search}
+ : {name: {like: '%' + $search + '%'}};
+ }
+
+ showFilterDialog(item) {
+ this.activeItem = item;
+ this.itemFilterParams = {};
+ this.itemFilter = {
+ include: [
+ {
+ relation: 'producer',
+ scope: {
+ fields: ['name']
+ }
+ },
+ {
+ relation: 'ink',
+ scope: {
+ fields: ['name']
+ }
+ }
+ ]
+ };
+
+ this.$.filterDialog.show();
+ }
+
+ selectItem(id) {
+ this.activeItem['genericFk'] = id;
+ this.$.filterDialog.hide();
+ }
+
+ filter() {
+ const filter = this.itemFilter;
+ const params = this.itemFilterParams;
+ const where = {};
+ for (let key in params) {
+ const value = params[key];
+ if (!value) continue;
+
+ switch (key) {
+ case 'name':
+ where[key] = {like: `%${value}%`};
+ break;
+ case 'producerFk':
+ case 'typeFk':
+ case 'size':
+ case 'inkFk':
+ where[key] = value;
+ }
+ }
+
+ filter.where = where;
+
+ this.$.itemsModel.applyFilter(filter);
+ }
}
ngModule.vnComponent('vnItemBasicData', {
diff --git a/modules/item/front/basic-data/locale/es.yml b/modules/item/front/basic-data/locale/es.yml
index 9fd3ca3c4..d59752ebb 100644
--- a/modules/item/front/basic-data/locale/es.yml
+++ b/modules/item/front/basic-data/locale/es.yml
@@ -10,4 +10,5 @@ New intrastat: Nuevo intrastat
Identifier: Identificador
Fragile: Frágil
Is shown at website, app that this item cannot travel (wreath, palms, ...): Se muestra en la web, app que este artículo no puede viajar (coronas, palmas, ...)
-Multiplier: Multiplicador
\ No newline at end of file
+Multiplier: Multiplicador
+Generic: Genérico
\ No newline at end of file
diff --git a/modules/route/back/methods/route/getSuggestedTickets.js b/modules/route/back/methods/route/getSuggestedTickets.js
index 49d7c1977..c1d6b67fe 100644
--- a/modules/route/back/methods/route/getSuggestedTickets.js
+++ b/modules/route/back/methods/route/getSuggestedTickets.js
@@ -55,7 +55,13 @@ module.exports = Self => {
{
relation: 'address',
scope: {
- fields: ['id', 'street', 'postalCode', 'city'],
+ fields: ['street', 'city', 'provinceFk', 'phone', 'nickname', 'postalCode'],
+ include: {
+ relation: 'province',
+ scope: {
+ fields: ['name']
+ }
+ }
}
},
]
diff --git a/modules/route/front/tickets/index.html b/modules/route/front/tickets/index.html
index 6329dbb1a..7d515b67c 100644
--- a/modules/route/front/tickets/index.html
+++ b/modules/route/front/tickets/index.html
@@ -142,10 +142,15 @@
Ticket
Client
-
Packages
-
Warehouse
-
Postcode
+
Province
+
+
+ Population
+
+
+
PC
Address
+
Warehouse
@@ -165,10 +170,11 @@
{{::ticket.nickname}}
- {{::ticket.packages}}
- {{::ticket.warehouse.name}}
+ {{::ticket.address.province.name}}
+ {{::ticket.address.city}}
{{::ticket.address.postalCode}}
{{::ticket.address.street}}
+ {{::ticket.warehouse.name}}
diff --git a/modules/route/front/tickets/locale/es.yml b/modules/route/front/tickets/locale/es.yml
index 6fa29e5ca..d4ab440a7 100644
--- a/modules/route/front/tickets/locale/es.yml
+++ b/modules/route/front/tickets/locale/es.yml
@@ -10,4 +10,5 @@ Ticket not found: No se ha encontrado el ticket
The selected ticket is not suitable for this route: El ticket seleccionado no es apto para esta ruta
PC: CP
The route's vehicle doesn't have a departing warehouse: El vehículo de la ruta no tiene un almacén de salida
-The route doesn't have a vehicle: La ruta no tiene un vehículo
\ No newline at end of file
+The route doesn't have a vehicle: La ruta no tiene un vehículo
+Population: Población
\ No newline at end of file
diff --git a/modules/supplier/front/routes.json b/modules/supplier/front/routes.json
index 9be6b7a85..3d3814f5d 100644
--- a/modules/supplier/front/routes.json
+++ b/modules/supplier/front/routes.json
@@ -13,7 +13,7 @@
{"state": "supplier.card.fiscalData", "icon": "account_balance"},
{"state": "supplier.card.billingData", "icon": "icon-payment"},
{"state": "supplier.card.address.index", "icon": "icon-delivery"},
- {"state": "supplier.card.account", "icon": "icon-accounts"},
+ {"state": "supplier.card.account", "icon": "icon-account"},
{"state": "supplier.card.contact", "icon": "contact_phone"},
{"state": "supplier.card.log", "icon": "history"},
{"state": "supplier.card.consumption", "icon": "show_chart"}
diff --git a/modules/ticket/front/index/index.html b/modules/ticket/front/index/index.html
index 096f57e05..852675f76 100644
--- a/modules/ticket/front/index/index.html
+++ b/modules/ticket/front/index/index.html
@@ -167,7 +167,7 @@
tooltip-position="left">