@colijnit/sharedcomponents 1.0.50 → 1.0.51

package/fesm2015/colijnit-sharedcomponents.js

@@ -25,7 +25,7 @@ import { BusinessObjectFactory } from '@colijnit/ioneconnector/build/service/bus
 import { TagTreeItem } from '@colijnit/mainapi/build/model/tag-tree-item.bo';
 import { PrintStockStickers } from '@colijnit/sharedapi/build/model/print-stock-stickers';
 import { ArticleStock as ArticleStock$1 } from '@colijnit/articleapi/build/model/article-stock';
-import { IconModule, InputCheckboxModule, CoDialogModule, ButtonModule, ListOfValuesModule, OverlayService, ClickoutsideModule, OverlayModule, InputRadioButtonModule, SimpleGridModule, ImageModule, InputTextModule, InputNumberPickerModule, CoDialogWizardModule, InputTextareaModule, ResponsiveTextModule, InputDatePickerModule, InputSearchModule } from '@colijnit/corecomponents_v12';
+import { IconModule, InputCheckboxModule, CoDialogModule, ButtonModule, ListOfValuesModule, OverlayService, ClickoutsideModule, OverlayModule, InputRadioButtonModule, SimpleGridModule, ImageModule, InputTextModule, InputNumberPickerModule, CoDialogWizardModule, InputTextareaModule, PopupModule, ResponsiveTextModule, InputDatePickerModule, InputSearchModule } from '@colijnit/corecomponents_v12';
 import * as i1 from '@angular/platform-browser';
 import { DomSanitizer } from '@angular/platform-browser';
 import { ArticleStockManagement } from '@colijnit/articleapi/build/model/article-stock-management';
@@ -983,6 +983,7 @@ SharedConnectorService.ctorParameters = () => [
 class StockService {
     constructor(_sharedService) {
         this._sharedService = _sharedService;
+        this.warehouseSelected = new EventEmitter();
     }
     // public async getPrintStockStickers(data: PrintStockStickers): Promise<void> {
     //   await this._sharedService.getPrintStockStickers(data);
@@ -1266,13 +1267,9 @@ StockInformationComponent.decorators = [
               <co-image class="stock-image" [source]="article.imageData"></co-image>
             </div>
           </div>
-          <div class="stock-good-info">
-            <div>
-              <span [textContent]="article.description"></span>
-            </div>
-            <div>
-              <span [textContent]="article.articleNumber"></span>
-            </div>
+          <div class="stock-status">
+              <label class="stock-label" [textContent]="'DESCRIPTION' | localize"></label>
+              <span class="stock-span" [textContent]="article.description"></span>
           </div>
         </div>
         <div class="stock-status">
@@ -1289,7 +1286,7 @@ StockInformationComponent.decorators = [
           <span class="stock-span" [textContent]="allAvailableStockInformation"></span>
         </div>
         <div class="stock-status">
-          <label class="stock-label" [textContent]="'AMOUNT_LATER_AVAILABLE' | localize"></label>
+          <label class="stock-label" [textContent]="'ECONOMICAL_STOCK' | localize"></label>
           <span class="stock-span" [textContent]=""></span>
         </div>
       </div>
@@ -1871,8 +1868,9 @@ StockInformationGridComponent.propDecorators = {
 };
 
 class StockTransferComponent {
-    constructor(_stockService) {
+    constructor(_stockService, iconCacheService) {
         this._stockService = _stockService;
+        this.iconCacheService = iconCacheService;
         this.handleClick = new EventEmitter();
         this.handleStickerClicked = new EventEmitter();
         this.allWarehousesDropdownFields = { text: "warehouseDescription", value: "warehouseNo" };
@@ -1880,6 +1878,7 @@ class StockTransferComponent {
         this.showSendMethodDialog = false;
         this.stockState = [];
         this.stockStateDropdownField = { text: "stateDescription", value: "stockStateId" };
+        this.icons = Icon;
     }
     ngAfterViewInit() {
         this.getStockManagementWarehouses();
@@ -1897,8 +1896,15 @@ class StockTransferComponent {
         this.handleClick.emit();
     }
     handleSelectedWarehouse(event) {
+        this.articleToTransfer.targetWarehouse = event.warehouseNo;
         this.selectedWarehouse = event;
-        this.getStockManagementLocations(this.selectedWarehouse);
+        this.getStockManagementLocations(this.selectedWarehouse.warehouseNo);
+    }
+    handleSelectedLocation(event) {
+        this.articleToTransfer.targetLocation = event.locationNo;
+    }
+    handleSelectedStockState(event) {
+        this.articleToTransfer.stockStateId = event.stockStateId;
     }
     handleStickerClick() {
         return __awaiter(this, void 0, void 0, function* () {
@@ -1927,52 +1933,54 @@ StockTransferComponent.decorators = [
                 selector: "co-stock-transfer",
                 template: `
       <div class="stock-transfer">
+        <span [textContent]="'TRANSFER_STOCK' | localize"></span>
         <div class="stock-transfer-columns">
           <div *ngIf="articleToTransfer" class="stock-transfer-left-column">
-            <co-input-text disabled
-                           [label]="'Standaard magazijn' | localize"
+            <co-input-text [readonly]="true"
                            [(model)]="articleToTransfer.warehouseDescription"
-                           [textContent]="articleToTransfer.warehouseDescription"
-                           [placeholder]="'Standaard magazijn' | localize"
+                           [placeholder]="'STANDARD_WAREHOUSE' | localize"
             >
             </co-input-text>
-            <co-input-text disabled
+            <co-input-text [readonly]="true"
                            [(model)]="articleToTransfer.locationNo"
-                           [textContent]="articleToTransfer.locationNo"
-                           [placeholder]="'Standaard locatie' | localize">
+                           [placeholder]="'STANDARD_LOCATION' | localize">
+            </co-input-text>
+            <co-input-text [readonly]="true"
+                           [(model)]="articleToTransfer.batchItem"
+                           [placeholder]="'BATCH_NO' | localize">
+            </co-input-text>
+            <co-input-text [readonly]="true"
+                           [(model)]="articleToTransfer.serialNo"
+                           [placeholder]="'SERIE_NO' | localize">
             </co-input-text>
-<!--            <co-input-text disabled-->
-<!--                           [(model)]="stockSticker.batch"-->
-<!--                           [placeholder]="'Batch'">-->
-<!--            </co-input-text>-->
-<!--            <co-input-text disabled-->
-<!--                           [(model)]="stockSticker.serial"-->
-<!--                           [placeholder]="'Serie'">-->
-<!--            </co-input-text>-->
             <co-input-text
               [(model)]="articleToTransfer.amountTransfer"
               [placeholder]="'Aantal' | localize">
             </co-input-text>
           </div>
 
+          <div class="icon-wrapper">
+            <co-icon [iconData]="iconCacheService.getIcon(icons.ArrowFatRight)"></co-icon>
+          </div>
+
           <div class="stock-transfer-right-column">
 
             <co-list-of-values [collection]="warehouses"
                                [displayField]="'warehouseDescription'"
                                (modelChange)="handleSelectedWarehouse($event)"
                                [label]="'Magazijn' | localize"
-                               [(model)]="articleToTransfer.targetWarehouse">
+                               >
             </co-list-of-values>
             <co-list-of-values [collection]="locations"
                                [displayField]="'description'"
-                               [(model)]="articleToTransfer.targetLocation"
+                               (modelChange)="handleSelectedLocation($event)"
                                [label]="'Locatie' | localize"
             >
             </co-list-of-values>
             <co-list-of-values [collection]="stockState"
-                               [displayField]="'text'"
+                               [displayField]="'stateDescription'"
                                [label]="'Voorraadstatus' | localize"
-                               [(model)]="articleToTransfer.stockStateId"
+                               (modelChange)="handleSelectedStockState($event)"
             >
             </co-list-of-values>
 
@@ -1992,7 +2000,8 @@ StockTransferComponent.decorators = [
             },] }
 ];
 StockTransferComponent.ctorParameters = () => [
-    { type: StockService }
+    { type: StockService },
+    { type: IconCacheService }
 ];
 StockTransferComponent.propDecorators = {
     stockSticker: [{ type: Input }],
@@ -2812,9 +2821,10 @@ StockChangeAmountComponent.propDecorators = {
 class StockTabComponent {
     constructor() {
         this.locationClicked = new EventEmitter();
+        this.warehouseToShow = new StockManagementWarehouses();
     }
     onLocationClick(data) {
-        this.warehouseToShow.warehouseNo = parseInt(data.warehouseNo);
+        this.warehouseToShow.warehouseNo = +data.warehouseNo;
         this.locationClicked.emit(this.warehouseToShow);
     }
 }
@@ -2822,7 +2832,7 @@ StockTabComponent.decorators = [
     { type: Component, args: [{
                 selector: "co-stock-tab",
                 template: `
-    <co-simple-grid [data]="articleStockInformation"
+    <co-simple-grid [data]="articleStockInformation"a
                     class="simple-grid"
                     [rowsPerPage]="20"
     >
@@ -2935,13 +2945,13 @@ class StockTabsComponent {
             { title: this._localizeService.get('ORDER'), active: false, clickHandler: () => this.getOrderStockHistory() },
             { title: this._localizeService.get('ALLOCATION'), active: false, clickHandler: () => this.getAllocationStockHistory() },
         ];
-        console.log(this.tabs[0]);
-        console.log(this.historyTabs[5]);
+        this.historyTabs[0].clickHandler();
     }
     handleLocationClicked(data) {
-        this.selectedLocation = data.warehouseNo;
         this.tabs[0].active = false;
         this.tabs[2].active = true;
+        this.selectedWarehouse = this.wareHouseForCode(data.warehouseNo);
+        this.handleWarehouseSelected(this.selectedWarehouse);
     }
     getStockHistory() {
         return __awaiter(this, void 0, void 0, function* () {
@@ -3020,6 +3030,7 @@ class StockTabsComponent {
     }
     handleWarehouseSelected(event) {
         this.selectedWarehouse = event;
+        this._stockService.warehouseSelected.emit(event);
         if (this.tabs[1].active) {
             this.getStockPrognose(this.selectedWarehouse.warehouseNo);
         }
@@ -3031,6 +3042,9 @@ class StockTabsComponent {
             });
         }
     }
+    wareHouseForCode(code) {
+        return this.warehouses.find(warehouse => warehouse.warehouseNo === code);
+    }
 }
 StockTabsComponent.decorators = [
     { type: Component, args: [{
@@ -3040,6 +3054,7 @@ StockTabsComponent.decorators = [
                 [wareHouseSearchLabel]="'SEARCH' | localize"
                 [tabs]="tabs"
                 [dataWareHouseCode]="warehouses"
+                [selectedWarehouse]="selectedWarehouse"
                 [secondaryTabs]="historyTabs"
                 [ActivateSecondaryTabs]="tabs[5].active"
                 [showWarehouseSelection]="tabs[1].active || tabs[2].active"
@@ -3059,10 +3074,12 @@ StockTabsComponent.decorators = [
                        [articleStockInfo]="articleDetails"
                        [articleStockInformation]="stockInformation"
                        [article]="article"
-                       [clickedLocation]="selectedLocation"
+                       [selectedWarehouse]="selectedWarehouse"
                        [dataWareHouseCode]="warehouses"
                        (transferIconClicked)="transferIconClicked.emit($event)"
                        (sendMethodDialogClicked)="sendMethodDialogClicked.emit($event)"
+                       (locationAddedOrUpdated)="articleDetails = $event"
+
     ></co-stock-location>
 
     <co-order-tab *ngIf="tabs[3].active"
@@ -3081,7 +3098,7 @@ StockTabsComponent.decorators = [
     ></co-stock-history>
 
     <co-order-supply-stock-history *ngIf="historyTabs[1].active && tabs[5].active"
-                            [orderSupplyStockHistory]="orderSupplyStockHistory"
+                                   [orderSupplyStockHistory]="orderSupplyStockHistory"
     ></co-order-supply-stock-history>
 
     <co-order-stock-commission-history *ngIf="historyTabs[2].active && tabs[5].active"
@@ -3193,36 +3210,37 @@ class StockLocationComponent {
         this.icons = Icon;
         this.transferIconClicked = new EventEmitter();
         this.sendMethodDialogClicked = new EventEmitter();
-        this.dataWareHouseFields = { text: "warehouseDescription", value: "warehouseNo" };
-        this.dataLocationFields = { text: "locationNo", value: "locationNo" };
+        this.locationAddedOrUpdated = new EventEmitter();
+        this.showConfirmationDialog = false;
         this.articleDetailsInformation = new ArticleStockManagement();
+        this.stockStatus = [];
         this.selectedArticleDetailsData = new ArticleDetailsBo();
+        this._subs = [];
     }
     ngOnInit() {
-        if (this.clickedLocation) {
-            this.selectedWarehouse = this.clickedLocation;
-            this.onSelectWarehouse(this.selectedWarehouse);
-        }
-    }
-    onSelectWarehouse(event) {
-        this.articleDetailsInformation.warehouseNumber = event;
-        this.articleDetailsInformation.goodId = this.article.goodId;
-        if (this.selectedWarehouse || this.selectedWarehouse === 0) {
-            this._stockService.getArticleDetails(this.articleDetailsInformation).then((details) => {
-                this.articleDetails = details;
-            });
-        }
+        return __awaiter(this, void 0, void 0, function* () {
+            this.stockStatus = yield this._stockService.getStockState();
+            this._subs.push(this._stockService.warehouseSelected.subscribe((selectedWarehouse) => __awaiter(this, void 0, void 0, function* () {
+                this.stockLocations = yield this._stockService.getStockManagementLocations(selectedWarehouse.warehouseNo);
+            })));
+        });
     }
     lockSelectedRow(row) {
-        this._stockService.lockArticleDetails(row);
+        return __awaiter(this, void 0, void 0, function* () {
+            this.stockLocations = yield this._stockService.getStockManagementLocations(this.selectedWarehouse.warehouseNo);
+            this.selectedLocationNo = row.locationNo;
+            this._stockService.lockArticleDetails(row);
+            this.selectedArticleDetailsData = row;
+        });
     }
     onLocationDropdownClick() {
-        this._stockService.getStockManagementLocations(this.selectedWarehouse).then((locations) => {
+        this._stockService.getStockManagementLocations(this.selectedWarehouse.warehouseNo).then((locations) => {
             this.stockLocations = locations;
         });
     }
-    locationChanged(event) {
-        this.selectedLocation = event;
+    locationChanged(row, event) {
+        this.selectedLocationNo = event.locationNo;
+        row.locationNo = event.locationNo;
     }
     amountInStockChanged(data) {
         this.selectedArticleDetailsData.amountInStock = data;
@@ -3234,108 +3252,159 @@ class StockLocationComponent {
         this.transferIconClicked.emit(event);
     }
     onOkClickSendLocations() {
+        return __awaiter(this, void 0, void 0, function* () {
+            this.showConfirmationDialog = true;
+        });
+    }
+    handleOkClick() {
+        var _a, _b;
         return __awaiter(this, void 0, void 0, function* () {
             this.selectedArticleDetailsData.selected = true;
             this.selectedArticleDetailsData.goodId = this.article.goodId;
             this.selectedArticleDetailsData.entryDate = new Date();
-            this.selectedArticleDetailsData.warehouseNo = this.selectedWarehouse;
-            this.selectedArticleDetailsData.locationNo = this.selectedLocation;
+            this.selectedArticleDetailsData.warehouseNo = this.selectedWarehouse.warehouseNo;
+            this.selectedArticleDetailsData.locationNo = (_a = this.selectedLocationNo) === null || _a === void 0 ? void 0 : _a.toString();
             yield this._stockService.updateArticleDetails(this.selectedArticleDetailsData);
+            this.articleDetailsInformation.goodId = (_b = this.selectedArticleDetailsData.goodId) === null || _b === void 0 ? void 0 : _b.toString();
+            this.articleDetailsInformation.warehouseNumber = this.selectedArticleDetailsData.warehouseNo;
             yield this._stockService.getArticleDetails(this.articleDetailsInformation).then((details) => {
-                this.articleDetails = details;
+                this.showConfirmationDialog = false;
+                this._changeDetector.detectChanges();
+                this.locationAddedOrUpdated.emit(details);
             });
         });
     }
+    handleStockStatusChange(status) {
+        this.selectedArticleDetailsData.stockStateId = status.stockStateId;
+    }
+    handleStockStatusRemarkChange(remark) {
+        this.selectedArticleDetailsData.stockStateRemark = remark;
+    }
+    disabled() {
+        var _a, _b, _c;
+        return (!((_a = this.selectedArticleDetailsData) === null || _a === void 0 ? void 0 : _a.stockStateId) && ((_c = (_b = this.selectedArticleDetailsData) === null || _b === void 0 ? void 0 : _b.stockStateRemark) === null || _c === void 0 ? void 0 : _c.length) <= 1);
+    }
+    statusForId(id) {
+        return this.stockStatus.find(status => status.stockStateId === id);
+    }
+    locationForNumber(number) {
+        var _a;
+        return (_a = this.stockLocations) === null || _a === void 0 ? void 0 : _a.find(location => location.locationNo === (number === null || number === void 0 ? void 0 : number.toString()));
+    }
 }
 StockLocationComponent.decorators = [
     { type: Component, args: [{
                 selector: "co-stock-location",
                 template: `
-      <div class="stock-grid">
-          <co-simple-grid [data]="articleStockInfo"
-                          class="simple-grid"
-                          [rowsPerPage]="20"
-                          [showAdd]="true"
-                          [inlineEdit]="true"
-                          (dblClickRow)="lockSelectedRow($event)"
-                          [showToolbar]="true"
-                          (keydown.enter)="onOkClickSendLocations()"
-          >
-              <co-simple-grid-column [headerText]="'LOCATION' | localize" [field]="'locationNo'">
-                  <ng-template #editTemplate let-row="row">
-<!--
-                      <co-drop-down-list [(model)]="row.locationNo"
-                                         [collection]="stockLocations"
-                                         [fields]="dataLocationFields"
-                                         [placeholder]="'LOCATION' | localize"
-                                         (click)="onLocationDropdownClick()"
-                                         [required]="true"
-                                         (modelChange)="locationChanged($event)"
-                      ></co-drop-down-list>
--->
-                  </ng-template>
-              </co-simple-grid-column>
-              <co-simple-grid-column *ngIf="articleDetails" [headerText]="'BATCH' | localize" [field]="'batchNo'">
-                  <ng-template #editTemplate let-row="row">
-                      <co-input-text [(model)]="row.batchNo"
-                                     [placeholder]="'BATCH' | localize"
-                      ></co-input-text>
-                  </ng-template>
-              </co-simple-grid-column>
-              <co-simple-grid-column *ngIf="articleDetails" [headerText]="'SERIAL_NO' | localize" [field]="'serialNo'">
-                  <ng-template #editTemplate let-row="row">
-                      <co-input-text [(model)]="row.serialNo"
-                                     [placeholder]="'SERIAL_NO' | localize"
-                      ></co-input-text>
-                  </ng-template>
-              </co-simple-grid-column>
-              <co-simple-grid-column [headerText]="'STOCK' | localize" [field]="'amountInStock'">
-                  <ng-template #editTemplate let-row="row">
-                      <co-input-text [(model)]="row.amountInStock"
-                                     [label]="'STOCK' | localize"
-                                     (modelChange)="amountInStockChanged($event)"
-                      ></co-input-text>
-                  </ng-template>
-              </co-simple-grid-column>
-              <co-simple-grid-column [headerText]="'ALLOCATED' | localize" [field]="'stockAssigned'">
-                  <ng-template #editTemplate let-row="row">
-                      <span [textContent]="row.stockAssigned"></span>
-                  </ng-template>
-              </co-simple-grid-column>
-              <co-simple-grid-column [headerText]="'AVAILABLE_STOCK' | localize" [field]="'amountInStockFree'">
-                  <ng-template #editTemplate let-row="row">
-                      <span [textContent]="row.amountInStockFree"></span>
-                  </ng-template>
-              </co-simple-grid-column>
-              <co-simple-grid-column [headerText]="'VALUTA' | localize" [field]="'currency'">
-                  <ng-template #editTemplate let-row="row">
-                      <span [textContent]="row.currency"></span>
-                  </ng-template>
-              </co-simple-grid-column>
-              <co-simple-grid-column [headerText]="'PURCHASE_PRICE' | localize" [field]="'purchasePrice'">
-                  <ng-template #editTemplate let-row="row">
-                      <span [textContent]="row.purchasePrice"></span>
-                  </ng-template>
-              </co-simple-grid-column>
-              <co-simple-grid-column [headerText]="'SUPPLIER_NUMBER' | localize" [field]="'supplierNo'">
-                  <ng-template #editTemplate let-row="row">
-                      <span [textContent]="row.supplierNo"></span>
-                  </ng-template>
-              </co-simple-grid-column>
-              <co-simple-grid-column [headerText]="'TRANSFER' | localize" [field]="'transfer'">
-                  <ng-template #template let-row="row">
-                      <co-icon class="menu-icon" [iconData]="iconCacheService.getIcon(icons.DeliveryTruck)"
-                               (click)="handleStockTransferClick(row)"></co-icon>
-                  </ng-template>
-              </co-simple-grid-column>
-              <co-simple-grid-column [headerText]="'STICKER' | localize" [field]="'sticker'">
-                  <ng-template #template let-row="row">
-                      <co-icon class="menu-icon" [iconData]="iconCacheService.getIcon(icons.Print)"
-                               (click)="openSendMethodDialog(row)"></co-icon>
-                  </ng-template>
-              </co-simple-grid-column>
-          </co-simple-grid>
-      </div>
+    <div class="stock-grid">
+      <co-dialog *ngIf="showConfirmationDialog" [showCloseIcon]="true" [modal]="true" [headerTemplate]="headerTemplate"
+                 [footerTemplate]="footerTemplate">
+        <ng-template #headerTemplate>
+          <div class="header-wrapper">
+            <span [textContent]="'CONFIRM_STOCK_CHANGE' | localize"></span>
+          </div>
+        </ng-template>
+        <div class="dialog-wrapper">
+          <co-list-of-values [label]="'STATUS' | localize"
+                             [model]="statusForId(selectedArticleDetailsData.stockStateId)"
+                             [collection]="stockStatus"
+                             [displayField]="'stateDescription'"
+                             (modelChange)="handleStockStatusChange($event)"
+          ></co-list-of-values>
+          <co-input-text [placeholder]="'REMARK' | localize"
+                         (modelChange)="handleStockStatusRemarkChange($event)"></co-input-text>
+        </div>
+        <ng-template #footerTemplate>
+          <div class="button-wrapper">
+            <co-button (click)="handleOkClick()" [label]="'OK'| localize" [disabled]="disabled()"></co-button>
+            <co-button class="cancel-button" (click)="showConfirmationDialog = false"
+                       [label]="'CANCEL'| localize "></co-button>
+          </div>
+        </ng-template>
+      </co-dialog>
+      <co-simple-grid [data]="articleStockInfo"
+                      class="simple-grid"
+                      [rowsPerPage]="20"
+                      [showAdd]="true"
+                      [inlineEdit]="true"
+                      (dblClickRow)="lockSelectedRow($event)"
+                      [showToolbar]="true"
+                      (keydown.enter)="onOkClickSendLocations()"
+
+      >
+        <co-simple-grid-column [headerText]="'LOCATION' | localize" [field]="'locationNo'">
+          <ng-template #editTemplate let-row="row">
+            <co-list-of-values [model]="locationForNumber(row['locationNo'])"
+                               [collection]="stockLocations"
+                               [displayField]="'description'"
+                               [label]="'LOCATION' | localize"
+                               (click)="onLocationDropdownClick()"
+                               [required]="true"
+                               (modelChange)="locationChanged(row, $event)"
+            ></co-list-of-values>
+          </ng-template>
+        </co-simple-grid-column>
+        <co-simple-grid-column *ngIf="articleDetails" [headerText]="'BATCH' | localize" [field]="'batchNo'">
+          <ng-template #editTemplate let-row="row">
+            <co-input-text [(model)]="row.batchNo"
+                           [placeholder]="'BATCH' | localize"
+            ></co-input-text>
+          </ng-template>
+        </co-simple-grid-column>
+        <co-simple-grid-column *ngIf="articleDetails" [headerText]="'SERIAL_NO' | localize" [field]="'serialNo'">
+          <ng-template #editTemplate let-row="row">
+            <co-input-text [(model)]="row.serialNo"
+                           [placeholder]="'SERIAL_NO' | localize"
+            ></co-input-text>
+          </ng-template>
+        </co-simple-grid-column>
+        <co-simple-grid-column [headerText]="'STOCK' | localize" [field]="'amountInStock'">
+          <ng-template #editTemplate let-row="row">
+            <co-input-text [(model)]="row.amountInStock"
+                           [label]="'STOCK' | localize"
+                           (modelChange)="amountInStockChanged($event)"
+            ></co-input-text>
+          </ng-template>
+        </co-simple-grid-column>
+        <co-simple-grid-column [headerText]="'ALLOCATED' | localize" [field]="'stockAssigned'">
+          <ng-template #editTemplate let-row="row">
+            <span [textContent]="row.stockAssigned"></span>
+          </ng-template>
+        </co-simple-grid-column>
+        <co-simple-grid-column [headerText]="'AVAILABLE_STOCK' | localize" [field]="'amountInStockFree'">
+          <ng-template #editTemplate let-row="row">
+            <span [textContent]="row.amountInStockFree"></span>
+          </ng-template>
+        </co-simple-grid-column>
+        <co-simple-grid-column [headerText]="'VALUTA' | localize" [field]="'currency'">
+          <ng-template #editTemplate let-row="row">
+            <span [textContent]="row.currency"></span>
+          </ng-template>
+        </co-simple-grid-column>
+        <co-simple-grid-column [headerText]="'PURCHASE_PRICE' | localize" [field]="'purchasePrice'">
+          <ng-template #editTemplate let-row="row">
+            <span [textContent]="row.purchasePrice"></span>
+          </ng-template>
+        </co-simple-grid-column>
+        <co-simple-grid-column [headerText]="'SUPPLIERNR' | localize" [field]="'supplierNo'">
+          <ng-template #editTemplate let-row="row">
+            <span [textContent]="row.supplierNo"></span>
+          </ng-template>
+        </co-simple-grid-column>
+        <co-simple-grid-column [headerText]="'TRANSFER' | localize" [field]="'transfer'">
+          <ng-template #template let-row="row">
+            <co-icon class="menu-icon" [iconData]="iconCacheService.getIcon(icons.DeliveryTruck)"
+                     (click)="handleStockTransferClick(row)"></co-icon>
+          </ng-template>
+        </co-simple-grid-column>
+        <co-simple-grid-column [headerText]="'STICKER' | localize" [field]="'sticker'">
+          <ng-template #template let-row="row">
+            <co-icon class="menu-icon" [iconData]="iconCacheService.getIcon(icons.Print)"
+                     (click)="openSendMethodDialog(row)"></co-icon>
+          </ng-template>
+        </co-simple-grid-column>
+      </co-simple-grid>
+    </div>
   `,
                 encapsulation: ViewEncapsulation.None
             },] }
@@ -3349,10 +3418,11 @@ StockLocationComponent.propDecorators = {
     articleStockInfo: [{ type: Input }],
     articleStockInformation: [{ type: Input }],
     article: [{ type: Input }],
-    clickedLocation: [{ type: Input }],
     dataWareHouseCode: [{ type: Input }],
     transferIconClicked: [{ type: Output }],
-    sendMethodDialogClicked: [{ type: Output }]
+    sendMethodDialogClicked: [{ type: Output }],
+    locationAddedOrUpdated: [{ type: Output }],
+    selectedWarehouse: [{ type: Input }]
 };
 
 class StockHistoryComponent {
@@ -3446,6 +3516,7 @@ TabBarComponent.decorators = [
                                [searchPlaceholder]="wareHouseSearchLabel"
                                [model]="selectedWarehouse"
                                (modelChange)="onSelectWarehouse($event)"
+                               class="custom-height"
             >
             </co-list-of-values>
           </div>
@@ -3480,7 +3551,8 @@ TabBarComponent.propDecorators = {
     dataWareHouseCode: [{ type: Input }],
     article: [{ type: Input }],
     showWarehouseSelection: [{ type: Input }],
-    warehouseSelected: [{ type: Output }]
+    warehouseSelected: [{ type: Output }],
+    selectedWarehouse: [{ type: Input }]
 };
 
 class TabBarModule {
@@ -4001,16 +4073,25 @@ StockPrognoseComponent.decorators = [
                     class="simple-grid"
                     [rowsPerPage]="20"
     >
-      <co-simple-grid-column [headerText]="'AVAILABILITY'" [field]="'available'"></co-simple-grid-column>
-      <co-simple-grid-column [headerText]="'FREE_STOCK'" [field]="'freeStock'"></co-simple-grid-column>
-      <co-simple-grid-column [headerText]="'IN_ORDER'" [field]="'inOrder'"></co-simple-grid-column>
-      <co-simple-grid-column [headerText]="'PURCHASE_ORDER'" [field]="'transNr'"></co-simple-grid-column>
-      <co-simple-grid-column [headerText]="'PURCHASE_ORDER_DATE'" [field]="'transactionDate'"></co-simple-grid-column>
-      <co-simple-grid-column [headerText]="'DELIVERY_DATE'" [field]="'docNr'"></co-simple-grid-column>
-      <co-simple-grid-column [headerText]="'REFERENCE'" [field]="'reference'"></co-simple-grid-column>
-      <co-simple-grid-column [headerText]="'DELIVERY_DATE_CONFIRMED'" [field]="'transConfirmedDate'"></co-simple-grid-column>
-      <co-simple-grid-column [headerText]="'DATE_DELIVERED'" [field]="'transDeliveryDate'"></co-simple-grid-column>
-      <co-simple-grid-column [headerText]="'FUTURE_FREE_STOCK'" [field]="'laterAvailable'"></co-simple-grid-column>
+      <co-simple-grid-column [headerText]="'AVAILABILITY' | localize" [field]="'available'"></co-simple-grid-column>
+      <co-simple-grid-column [headerText]="'FREE_STOCK' | localize" [field]="'freeStock'"></co-simple-grid-column>
+      <co-simple-grid-column [headerText]="'IN_ORDER' | localize" [field]="'inOrder'"></co-simple-grid-column>
+      <co-simple-grid-column [headerText]="'PURCHASE_ORDER' | localize" [field]="'transNr'"></co-simple-grid-column>
+      <co-simple-grid-column [headerText]="'PURCHASE_ORDER_DATE' | localize" [field]="'transactionDate'"></co-simple-grid-column>
+      <co-simple-grid-column [headerText]="'DELIVERY_DATE' | localize">
+        <ng-template #template let-row="row">
+          <span [textContent]="row['arrivalDate'] | date:'dd-MM-yyyy'"></span>
+        </ng-template>
+      </co-simple-grid-column>
+      <co-simple-grid-column [headerText]="'REFERENCE' | localize" [field]="'reference'"></co-simple-grid-column>
+      <co-simple-grid-column [headerText]="'DELIVERY_DATE_CONFIRMED' | localize" [field]="'transConfirmedDate'">
+      </co-simple-grid-column>
+      <co-simple-grid-column [headerText]="'DATE_DELIVERED' | localize">
+        <ng-template #template let-row="row">
+          <span [textContent]="row['transDeliveryDate'] | date:'dd-MM-yyyy'"></span>
+        </ng-template>
+      </co-simple-grid-column>
+      <co-simple-grid-column [headerText]="'FUTURE_FREE_STOCK' | localize" [field]="'laterAvailable'"></co-simple-grid-column>
     </co-simple-grid>
   `,
                 encapsulation: ViewEncapsulation.None
@@ -4085,7 +4166,8 @@ StockModule.decorators = [
                     StatusbarModule,
                     StockStatusbarModule,
                     ListOfValuesModule,
-                    LocalizationModule
+                    LocalizationModule,
+                    PopupModule
                 ],
                 declarations: [
                     StockComponent,