diff --git a/client/item/src/card/item-card.js b/client/item/src/card/item-card.js index aeb921651..903631d42 100644 --- a/client/item/src/card/item-card.js +++ b/client/item/src/card/item-card.js @@ -16,7 +16,6 @@ class ItemCard { {relation: "producer"}, {relation: "intrastat"}, {relation: "expence"}, - {relation: "taxClass"}, {relation: "itemTag", scope: {order: "priority ASC", include: {relation: "tag"}}} ] }; diff --git a/client/item/src/card/item-card.spec.js b/client/item/src/card/item-card.spec.js index 5447d007e..72e09a306 100644 --- a/client/item/src/card/item-card.spec.js +++ b/client/item/src/card/item-card.spec.js @@ -21,8 +21,8 @@ describe('Item', () => { describe('$onInit()', () => { it('should request to patch the propagation of tax status', () => { controller.client = {id: 123, isEqualizated: false}; - $httpBackend.whenGET('/item/api/Items/undefined?filter={"include":[{"relation":"itemType"},{"relation":"origin"},{"relation":"ink"},{"relation":"producer"},{"relation":"intrastat"},{"relation":"expence"},{"relation":"taxClass"},{"relation":"itemTag","scope":{"order":"priority ASC","include":{"relation":"tag"}}}]}').respond({data: 'item'}); - $httpBackend.expectGET('/item/api/Items/undefined?filter={"include":[{"relation":"itemType"},{"relation":"origin"},{"relation":"ink"},{"relation":"producer"},{"relation":"intrastat"},{"relation":"expence"},{"relation":"taxClass"},{"relation":"itemTag","scope":{"order":"priority ASC","include":{"relation":"tag"}}}]}'); + $httpBackend.whenGET('/item/api/Items/undefined?filter={"include":[{"relation":"itemType"},{"relation":"origin"},{"relation":"ink"},{"relation":"producer"},{"relation":"intrastat"},{"relation":"expence"},{"relation":"itemTag","scope":{"order":"priority ASC","include":{"relation":"tag"}}}]}').respond({data: 'item'}); + $httpBackend.expectGET('/item/api/Items/undefined?filter={"include":[{"relation":"itemType"},{"relation":"origin"},{"relation":"ink"},{"relation":"producer"},{"relation":"intrastat"},{"relation":"expence"},{"relation":"itemTag","scope":{"order":"priority ASC","include":{"relation":"tag"}}}]}'); controller.$onInit(); $httpBackend.flush(); diff --git a/client/item/src/data/item-data.html b/client/item/src/data/item-data.html index 16deded6c..35066b200 100644 --- a/client/item/src/data/item-data.html +++ b/client/item/src/data/item-data.html @@ -60,19 +60,6 @@ initial-data="$ctrl.item.expence" > - - {{$parent.$parent.item.description}} - - diff --git a/services/item/common/models/item.json b/services/item/common/models/item.json index 6944a5eea..5598f371d 100644 --- a/services/item/common/models/item.json +++ b/services/item/common/models/item.json @@ -75,11 +75,6 @@ "model": "Expence", "foreignKey": "expenceFk" }, - "taxClass": { - "type": "belongsTo", - "model": "TaxClass", - "foreignKey": "taxClassFk" - }, "itemTag": { "type": "hasMany", "model": "ItemTag",