{{name}}
-
- {{category.name}}
-
-
-
- Id/{{$ctrl.$t('Name')}}: {{$ctrl.filter.search}}
-
-
- {{$ctrl.$t('Category')}}: {{category.selection.name}}
-
-
- {{$ctrl.$t('Type')}}: {{type.selection.name}}
-
-
- {{$ctrl.$t('Buyer')}}: {{buyer.selection.nickname}}
-
-
- {{$ctrl.$t('Warehouse')}}: {{warehouse.selection.name}}
-
-
- {{$ctrl.$t('Started')}}: {{$ctrl.filter.started | date:'dd/MM/yyyy'}}
-
-
- {{$ctrl.$t('Ended')}}: {{$ctrl.filter.ended | date:'dd/MM/yyyy'}}
-
-
- {{$ctrl.$t('For me')}}: {{$ctrl.filter.mine ? '✓' : '✗'}}
-
-
- {{$ctrl.$t('Minimum price')}}: {{$ctrl.filter.hasMinPrice ? '✓' : '✗'}}
-
-
- {{$ctrl.showTagInfo(chipTag)}}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-|
- |
- - Item ID - | -- Description - | -- Grouping price - | -- Packing price - | -- Min price - | -- Started - | -- Ended - | -- Warehouse - | -- |
|---|---|---|---|---|---|---|---|---|---|
|
- |
-
- {{id}}
-
- {{name}}
-
- |
-
-
-
- {{itemFk.selection.name}}
-
-
- {{price.subName}}- |
-
- |
-
- |
-
- |
-
- |
-
- |
-
- |
-
- |
-
-
-
-
-
-
-
-
-
-
-| - | - Identifier - | -- Grouping - | -- Packing - | -- Description - | -- Stems - | -- Size - | -- Type - | -- Category - | -- Intrastat - | -- Origin - | -- Buyer - | -- Weight/Piece - | -- Multiplier - | -- Active - | -- Producer - | -- Landed - | -- |
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
|
- |
- - - {{::item.id}} - - | -{{::item.grouping | dashIfEmpty}} | -{{::item.packing | dashIfEmpty}} | -
-
-
- {{::item.subName}}- |
- {{::item.stems}} | -{{::item.size}} | -- {{::item.typeName}} - | -- {{::item.category}} - | -- {{::item.intrastat}} - | -{{::item.origin}} | -- - {{::item.userName}} - - | -{{::item.weightByPiece}} | -{{::item.stemMultiplier}} | -
- |
- {{::item.producer | dashIfEmpty}} | -{{::item.landed | date:'dd/MM/yyyy'}} | -
- |
-
-
-
-
-
-
- Total
-
-
-
-
- |
- |
- - Created - | -- Item - | -- Concept - | -- Parking - | -- Shelving - | -- Etiqueta - | -- Packing - | -
|---|---|---|---|---|---|---|---|
|
- |
- {{::itemShelvingPlacementSupplyStock.created | date: 'dd/MM/yyyy'}} | -- {{::itemShelvingPlacementSupplyStock.itemFk}} - | -- - {{itemShelvingPlacementSupplyStock.longName}} - - | -- {{::itemShelvingPlacementSupplyStock.parking}} - | -- {{::itemShelvingPlacementSupplyStock.shelving}} - | -- {{(itemShelvingPlacementSupplyStock.stock / itemShelvingPlacementSupplyStock.packing).toFixed(2)}} - | -- {{::itemShelvingPlacementSupplyStock.packing}} - | -
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/modules/item/front/item-type/search-panel/index.js b/modules/item/front/item-type/search-panel/index.js
deleted file mode 100644
index 17a439c39..000000000
--- a/modules/item/front/item-type/search-panel/index.js
+++ /dev/null
@@ -1,7 +0,0 @@
-import ngModule from '../../module';
-import SearchPanel from 'core/components/searchbar/search-panel';
-
-ngModule.component('vnItemTypeSearchPanel', {
- template: require('./index.html'),
- controller: SearchPanel
-});
diff --git a/modules/item/front/item-type/summary/index.html b/modules/item/front/item-type/summary/index.html
deleted file mode 100644
index d003c8f38..000000000
--- a/modules/item/front/item-type/summary/index.html
+++ /dev/null
@@ -1,50 +0,0 @@
-- {{summary.id}} - {{summary.name}} - {{summary.worker.firstName}} {{summary.worker.lastName}} -
-Basic data
-
-
-
-
-
diff --git a/modules/item/front/request-search-panel/index.js b/modules/item/front/request-search-panel/index.js
deleted file mode 100644
index 556bdd874..000000000
--- a/modules/item/front/request-search-panel/index.js
+++ /dev/null
@@ -1,48 +0,0 @@
-import ngModule from '../module';
-import SearchPanel from 'core/components/searchbar/search-panel';
-
-class Controller extends SearchPanel {
- constructor($element, $) {
- super($element, $);
-
- this.states = [
- {code: 'pending', name: this.$t('Pending')},
- {code: 'accepted', name: this.$t('Accepted')},
- {code: 'denied', name: this.$t('Denied')}
- ];
- }
-
- get from() {
- return this._from;
- }
-
- set from(value) {
- this._from = value;
- this.filter.scopeDays = null;
- }
-
- get to() {
- return this._to;
- }
-
- set to(value) {
- this._to = value;
- this.filter.scopeDays = null;
- }
-
- get scopeDays() {
- return this._scopeDays;
- }
-
- set scopeDays(value) {
- this._scopeDays = value;
-
- this.filter.from = null;
- this.filter.to = null;
- }
-}
-
-ngModule.vnComponent('vnRequestSearchPanel', {
- template: require('./index.html'),
- controller: Controller
-});
diff --git a/modules/item/front/request-search-panel/index.spec.js b/modules/item/front/request-search-panel/index.spec.js
deleted file mode 100644
index 56c76eabf..000000000
--- a/modules/item/front/request-search-panel/index.spec.js
+++ /dev/null
@@ -1,48 +0,0 @@
-import './index';
-
-describe(' Component vnRequestSearchPanel', () => {
- let controller;
-
- beforeEach(ngModule('item'));
-
- beforeEach(inject($componentController => {
- controller = $componentController('vnRequestSearchPanel', {$element: null});
- controller.$t = () => {};
- controller.filter = {};
- }));
-
- describe('from() setter', () => {
- it('should clear the scope days when setting the from property', () => {
- controller.filter.scopeDays = 1;
-
- controller.from = Date.vnNew();
-
- expect(controller.filter.scopeDays).toBeNull();
- expect(controller.from).toBeDefined();
- });
- });
-
- describe('to() setter', () => {
- it('should clear the scope days when setting the to property', () => {
- controller.filter.scopeDays = 1;
-
- controller.to = Date.vnNew();
-
- expect(controller.filter.scopeDays).toBeNull();
- expect(controller.to).toBeDefined();
- });
- });
-
- describe('scopeDays() setter', () => {
- it('should clear the date range when setting the scopeDays property', () => {
- controller.filter.from = Date.vnNew();
- controller.filter.to = Date.vnNew();
-
- controller.scopeDays = 1;
-
- expect(controller.filter.from).toBeNull();
- expect(controller.filter.to).toBeNull();
- expect(controller.scopeDays).toBeDefined();
- });
- });
-});
diff --git a/modules/item/front/request-search-panel/locale/es.yml b/modules/item/front/request-search-panel/locale/es.yml
deleted file mode 100644
index 8d5276194..000000000
--- a/modules/item/front/request-search-panel/locale/es.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-Ink: Tinta
-Origin: Origen
-Producer: Productor
-For me: Para mi
\ No newline at end of file
diff --git a/modules/item/front/request/index.html b/modules/item/front/request/index.html
deleted file mode 100644
index 03c8db8ec..000000000
--- a/modules/item/front/request/index.html
+++ /dev/null
@@ -1,172 +0,0 @@
-
-
-
diff --git a/modules/item/front/search-panel/index.js b/modules/item/front/search-panel/index.js
deleted file mode 100644
index 2448728be..000000000
--- a/modules/item/front/search-panel/index.js
+++ /dev/null
@@ -1,67 +0,0 @@
-import ngModule from '../module';
-import SearchPanel from 'core/components/searchbar/search-panel';
-
-class Controller extends SearchPanel {
- constructor($element, $) {
- super($element, $);
- let model = 'Item';
- let moreFields = ['id', 'description', 'name', 'isActive'];
-
- let properties;
- let validations = window.validations;
-
- if (validations && validations[model])
- properties = validations[model].properties;
- else
- properties = {};
-
- this.moreFields = [];
- for (let field of moreFields) {
- let prop = properties[field];
- this.moreFields.push({
- name: field,
- label: prop ? prop.description : field,
- type: prop ? prop.type : null
- });
- }
- }
-
- get filter() {
- let filter = this.$.filter;
-
- for (let fieldFilter of this.fieldFilters)
- filter[fieldFilter.name] = fieldFilter.value;
-
- return filter;
- }
-
- set filter(value) {
- if (!value)
- value = {};
- if (!value.tags)
- value.tags = [{}];
-
- this.fieldFilters = [];
- for (let field of this.moreFields) {
- if (value[field.name] != undefined) {
- this.fieldFilters.push({
- name: field.name,
- value: value[field.name],
- info: field
- });
- }
- }
-
- this.$.filter = value;
- }
-
- removeField(index, field) {
- this.fieldFilters.splice(index, 1);
- delete this.$.filter[field];
- }
-}
-
-ngModule.vnComponent('vnItemSearchPanel', {
- template: require('./index.html'),
- controller: Controller
-});
diff --git a/modules/item/front/search-panel/index.spec.js b/modules/item/front/search-panel/index.spec.js
deleted file mode 100644
index 39b5b7aa5..000000000
--- a/modules/item/front/search-panel/index.spec.js
+++ /dev/null
@@ -1,60 +0,0 @@
-import './index.js';
-
-describe('Item', () => {
- describe('Component vnItemSearchPanel', () => {
- let $element;
- let controller;
-
- beforeEach(ngModule('item'));
-
- beforeEach(inject($componentController => {
- $element = angular.element(``);
- controller = $componentController('vnItemSearchPanel', {$element});
- }));
-
- describe('filter() setter', () => {
- it(`should set the tags property to the scope filter with an empty array`, () => {
- const expectedFilter = {
- tags: [{}]
- };
- controller.filter = null;
-
- expect(controller.filter).toEqual(expectedFilter);
- });
-
- it(`should set the tags property to the scope filter with an array of tags`, () => {
- const expectedFilter = {
- description: 'My item',
- tags: [{}]
- };
- const expectedFieldFilter = [{
- info: {
- label: 'description',
- name: 'description',
- type: null
- },
- name: 'description',
- value: 'My item'
- }];
- controller.filter = {
- description: 'My item'
- };
-
- expect(controller.filter).toEqual(expectedFilter);
- expect(controller.fieldFilters).toEqual(expectedFieldFilter);
- });
- });
-
- describe('removeField()', () => {
- it(`should remove the description property from the fieldFilters and from the scope filter`, () => {
- const expectedFilter = {tags: [{}]};
- controller.filter = {description: 'My item'};
-
- controller.removeField(0, 'description');
-
- expect(controller.filter).toEqual(expectedFilter);
- expect(controller.fieldFilters).toEqual([]);
- });
- });
- });
-});
diff --git a/modules/item/front/search-panel/locale/es.yml b/modules/item/front/search-panel/locale/es.yml
deleted file mode 100644
index 67a5200d7..000000000
--- a/modules/item/front/search-panel/locale/es.yml
+++ /dev/null
@@ -1,8 +0,0 @@
-Ink: Tinta
-Origin: Origen
-Producer: Productor
-With visible: Con visible
-Field: Campo
-More fields: Más campos
-Add field: Añadir campo
-Remove field: Quitar campo
\ No newline at end of file
diff --git a/modules/item/front/summary/index.html b/modules/item/front/summary/index.html
deleted file mode 100644
index 0e4cfc955..000000000
--- a/modules/item/front/summary/index.html
+++ /dev/null
@@ -1,227 +0,0 @@
-
-
-
- Visible
-{{$ctrl.summary.visible}}
-Available
-{{$ctrl.summary.available}}
-
-
- - Basic data - -
-- Basic data -
-- - Other data - -
-- Other data -
-- - Tags - -
-- Tags -
-- - Description - -
-- Description -
-- {{$ctrl.summary.item.description}} -
-- - Tax - -
-- Tax -
-- - Botanical - -
-- Botanical -
-- - Barcode - -
-- Barcode -
-- {{barcode.code}} -
-| {{$t('code')}} | {{$t('boxes')}} | -+ | {{$t('packing')}} | -{{$t('concept')}} | -{{$t('reference')}} | -{{$t('tags')}} | -{{$t('quantity')}} | -- | {{$t('price')}} | -- | {{$t('amount')}} | +{{$t('concept')}} | +{{$t('reference')}} | +{{$t('tags')}} | +{{$t('quantity')}} | ++ | {{$t('price')}} | ++ | {{$t('amount')}} | ||
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
| {{buy.itemFk}} | {{buy.stickers}} | -x | -{{buy.packing}} | -{{buy.name}} | -{{buy.comment}} | -- {{buy.tag5}} → {{buy.value5}} - {{buy.tag6}} → {{buy.value6}} - {{buy.tag7}} → {{buy.value7}} + | x | +{{buy.packing}} | +{{buy.name}} | +referencia de prueba | +
+
+
+ {{buy.tag5}}→ {{buy.value5}}
+ {{buy.tag6}}→ {{buy.value6}}
+
+
{{buy.tag7}}→ {{buy.value7}}
+ {{buy.tag8}}→ {{buy.value8}}
+ |
- {{buy.quantity | number($i18n.locale)}} | -x | -{{buy.buyingValue | currency('EUR', $i18n.locale)}} | -= | -+ | {{buy.quantity | number($i18n.locale)}} | +x | +{{buy.buyingValue | currency('EUR', $i18n.locale)}} | += | +{{buy.buyingValue * buy.quantity | currency('EUR', $i18n.locale)}} |
| {{getTotalBy('stickers')}} | diff --git a/print/templates/reports/entry-order/locale/es.yml b/print/templates/reports/entry-order/locale/es.yml index 5a6716ba1..9ec357802 100644 --- a/print/templates/reports/entry-order/locale/es.yml +++ b/print/templates/reports/entry-order/locale/es.yml @@ -16,4 +16,5 @@ entry: Entrada {0} supplierData: Datos del proveedor notes: Notas reference: Referencia -tags: Tags \ No newline at end of file +tags: Etiquetas +code: Código \ No newline at end of file diff --git a/print/templates/reports/entry-order/sql/buys.sql b/print/templates/reports/entry-order/sql/buys.sql index 92c055483..545849908 100644 --- a/print/templates/reports/entry-order/sql/buys.sql +++ b/print/templates/reports/entry-order/sql/buys.sql @@ -10,7 +10,9 @@ SELECT b.itemFk, i.tag6, i.value6, i.tag7, - i.value7 + i.value7, + i.tag8, + i.value8 FROM buy b JOIN item i ON i.id = b.itemFk LEFT JOIN item i2 ON i2.id = b.itemOriginalFk |