@colijnit/transaction 12.1.66 → 12.1.68

package/bundles/colijnit-transaction.umd.js

@@ -16005,7 +16005,7 @@
     TransactionLineSidePanelComponent.decorators = [
         { type: i0.Component, args: [{
                     selector: "co-transaction-line-side-panel",
-                    template: "\n    <div class=\"transaction-line-side-panel-wrapper\" *ngIf=\"show\" @showHideSidePanel>\n      <icon (click)=\"handleCancelClick()\" [icon]=\"icons.Cancel\" class=\"close-button\"></icon>\n      <div class=\"transaction-line-side-panel-header\">\n        <div class=\"transaction-line-side-panel-header-item\">\n          <span class=\"side-panel-header-label\" [textContent]=\"'ARTICLE_NR'| localize\"></span>\n          <span class=\"side-panel-header-field\" [textContent]=\"transactionLine.articleNumber\"></span>\n        </div>\n        <div class=\"side-panel-header-divider\"></div>\n        <div class=\"transaction-line-side-panel-header-item\">\n          <span class=\"side-panel-header-label\" [textContent]=\"'DESCRIPTION'| localize\"></span>\n          <span class=\"side-panel-header-field\" [textContent]=\"transactionLine.goodDescription\"></span>\n        </div>\n        <div class=\"side-panel-header-divider\"></div>\n        <div class=\"transaction-line-side-panel-header-item\">\n          <span class=\"side-panel-header-label\" [textContent]=\"'AMOUNT'| localize\"></span>\n          <span class=\"side-panel-header-field\" [textContent]=\"transactionLine.amount\"></span>\n        </div>\n        <div class=\"side-panel-header-divider\"></div>\n        <div class=\"transaction-line-side-panel-header-item\">\n        <span class=\"side-panel-header-label\"\n              [textContent]=\"activeCategory === categories.PurchaseOrderReceivedGoods ? ('OPEN' | localize) : ('PRICE' | localize)\"></span>\n          <span class=\"side-panel-header-field\"\n                [textContent]=\"activeCategory === categories.PurchaseOrderReceivedGoods ? quantityToReceive : (transactionLine.price | priceDisplay)\"></span>\n        </div>\n      </div>\n      <div class=\"transaction-line-side-panel-nav-bar\">\n        <co-transaction-button-bar\n          [selectedCategory]=\"activeCategory\"\n          [transactionType]=\"transactionInfo.transactionKind\"\n          (buttonClicked)=\"activeCategory = $event.category\"\n        ></co-transaction-button-bar>\n      </div>\n      <div class=\"transaction-line-side-panel-content\">\n        <ng-container [ngSwitch]=\"transactionInfo.transactionKind\">\n          <ng-container *ngSwitchCase=\"transactionTypes.PurchaseOrder\">\n            <co-transaction-line-side-panel-purchase\n              [transactionLine]=\"transactionLine\"\n              [transactionInfo]=\"transactionInfo\"\n              [category]=\"activeCategory\"\n              (quantityToReceiveChange)=\"quantityToReceive = $event\"\n            ></co-transaction-line-side-panel-purchase>\n          </ng-container>\n          <ng-container *ngSwitchCase=\"transactionTypes.SalesOrder\">\n            <co-transaction-line-side-panel-sales\n              [transactionLine]=\"transactionLine\"\n              [transactionInfo]=\"transactionInfo\"\n              [category]=\"activeCategory\"\n            ></co-transaction-line-side-panel-sales>\n          </ng-container>\n          <ng-container *ngSwitchDefault>\n            <co-transaction-line-side-panel-purchase\n              [transactionLine]=\"transactionLine\"\n              [transactionInfo]=\"transactionInfo\"\n              [category]=\"activeCategory\"\n            ></co-transaction-line-side-panel-purchase>\n          </ng-container>\n        </ng-container>\n      </div>\n    </div>\n  ",
+                    template: "\n    <div class=\"transaction-line-side-panel-wrapper\" *ngIf=\"show\" @showHideSidePanel>\n      <icon (click)=\"handleCancelClick()\" [icon]=\"icons.Cancel\" class=\"close-button\"></icon>\n      <div class=\"transaction-line-side-panel-header\">\n        <div class=\"transaction-line-side-panel-header-item\">\n          <span class=\"side-panel-header-label\" [textContent]=\"'ARTICLE_NR'| localize\"></span>\n          <span class=\"side-panel-header-field\" [textContent]=\"transactionLine.articleNumber\"></span>\n        </div>\n        <div class=\"side-panel-header-divider\"></div>\n        <div class=\"transaction-line-side-panel-header-item\">\n          <span class=\"side-panel-header-label\" [textContent]=\"'DESCRIPTION'| localize\"></span>\n          <span class=\"side-panel-header-field\" [textContent]=\"transactionLine.goodDescription\"></span>\n        </div>\n        <div class=\"side-panel-header-divider\"></div>\n        <div class=\"transaction-line-side-panel-header-item\">\n          <span class=\"side-panel-header-label\" [textContent]=\"'AMOUNT'| localize\"></span>\n          <span class=\"side-panel-header-field\" [textContent]=\"transactionLine.amount\"></span>\n        </div>\n        <div class=\"side-panel-header-divider\"></div>\n        <div class=\"transaction-line-side-panel-header-item hidden\">\n        <span class=\"side-panel-header-label\"\n              [textContent]=\"activeCategory === categories.PurchaseOrderReceivedGoods ? ('OPEN' | localize) : ('PRICE' | localize)\"></span>\n          <span class=\"side-panel-header-field\"\n                [textContent]=\"activeCategory === categories.PurchaseOrderReceivedGoods ? quantityToReceive : (transactionLine.price | priceDisplay)\"></span>\n        </div>\n      </div>\n      <div class=\"transaction-line-side-panel-nav-bar\">\n        <co-transaction-button-bar\n          [selectedCategory]=\"activeCategory\"\n          [transactionType]=\"transactionInfo.transactionKind\"\n          (buttonClicked)=\"activeCategory = $event.category\"\n        ></co-transaction-button-bar>\n      </div>\n      <div class=\"transaction-line-side-panel-content\">\n        <ng-container [ngSwitch]=\"transactionInfo.transactionKind\">\n          <ng-container *ngSwitchCase=\"transactionTypes.PurchaseOrder\">\n            <co-transaction-line-side-panel-purchase\n              [transactionLine]=\"transactionLine\"\n              [transactionInfo]=\"transactionInfo\"\n              [category]=\"activeCategory\"\n              (quantityToReceiveChange)=\"quantityToReceive = $event\"\n            ></co-transaction-line-side-panel-purchase>\n          </ng-container>\n          <ng-container *ngSwitchCase=\"transactionTypes.SalesOrder\">\n            <co-transaction-line-side-panel-sales\n              [transactionLine]=\"transactionLine\"\n              [transactionInfo]=\"transactionInfo\"\n              [category]=\"activeCategory\"\n            ></co-transaction-line-side-panel-sales>\n          </ng-container>\n          <ng-container *ngSwitchDefault>\n            <co-transaction-line-side-panel-purchase\n              [transactionLine]=\"transactionLine\"\n              [transactionInfo]=\"transactionInfo\"\n              [category]=\"activeCategory\"\n            ></co-transaction-line-side-panel-purchase>\n          </ng-container>\n        </ng-container>\n      </div>\n    </div>\n  ",
                     animations: [
                         animations.trigger("showHideSidePanel", [
                             animations.state("void", animations.style({ transform: 'translateX(100%)' })),
@@ -16144,6 +16144,7 @@
         function TransactionHeaderComponent() {
             this.icons = Icon;
             this.relation = new customerFullObject_bo.CustomerFullObject();
+            this.isPurchaseOrder = false;
             this._transaction = new transactionInfoResponse_bo.TransactionInfoResponse();
         }
         Object.defineProperty(TransactionHeaderComponent.prototype, "transaction", {
@@ -16153,6 +16154,7 @@
             set: function (value) {
                 if (value) {
                     this._transaction = value;
+                    this.isPurchaseOrder = this._transaction.transactionInfo.transactionKind === transactionKind_enum.TransactionKind.PurchaseOrder;
                 }
             },
             enumerable: false,
@@ -16166,7 +16168,7 @@
     TransactionHeaderComponent.decorators = [
         { type: i0.Component, args: [{
                     selector: "co-transaction-header",
-                    template: "\n    <div class=\"transaction-header-wrapper\">\n      <co-carousel>\n        <co-transaction-header-relation #carouselItem [relation]=\"relation\"></co-transaction-header-relation>\n        <div class=\"transaction-header-divider\">&nbsp;</div>\n        <co-transaction-header-order #carouselItem [transaction]=\"transaction\"></co-transaction-header-order>\n        <div class=\"transaction-header-divider\">&nbsp;</div>\n        <co-transaction-header-payment #carouselItem [transaction]=\"transaction\"></co-transaction-header-payment>\n        <div class=\"transaction-header-divider\">&nbsp;</div>\n        <co-transaction-header-delivery #carouselItem [transaction]=\"transaction\"></co-transaction-header-delivery>\n      </co-carousel>\n    </div>\n  ",
+                    template: "\n    <div class=\"transaction-header-wrapper\">\n      <co-carousel>\n        <co-transaction-header-relation #carouselItem [relation]=\"relation\"></co-transaction-header-relation>\n        <div class=\"transaction-header-divider\" *ngIf=\"!isPurchaseOrder\">&nbsp;</div>\n        <co-transaction-header-order *ngIf=\"!isPurchaseOrder\" #carouselItem [transaction]=\"transaction\"></co-transaction-header-order>\n        <div class=\"transaction-header-divider\">&nbsp;</div>\n        <co-transaction-header-payment #carouselItem [transaction]=\"transaction\"></co-transaction-header-payment>\n        <div class=\"transaction-header-divider\">&nbsp;</div>\n        <co-transaction-header-delivery #carouselItem [transaction]=\"transaction\"></co-transaction-header-delivery>\n      </co-carousel>\n    </div>\n  ",
                     encapsulation: i0.ViewEncapsulation.None
                 },] }
     ];
@@ -18249,9 +18251,6 @@
         TransactionReceivingGoodsHistoryComponent.prototype.showClass = function () {
             return true;
         };
-        TransactionReceivingGoodsHistoryComponent.prototype.ngAfterViewInit = function () {
-            this.reloadReceivingGoodsHistory.next();
-        };
         TransactionReceivingGoodsHistoryComponent.prototype.handleDeleteSelectedRow = function (row) {
             var _this = this;
             if (row && row.type !== 'correction') {
@@ -18515,6 +18514,7 @@
             this.docBatchApplied = new i0.EventEmitter();
             this.getPurchasePortalLine = new getPurchasePortalLine.GetPurchasePortalLine();
             this.purchasePortalFilter = new purchasePortalFilters_bo.PurchasePortalFilters();
+            this.filteredDocBatchArray = [];
         }
         Object.defineProperty(TransactionConfirmationHistoryComponent.prototype, "isDocBatchSaved", {
             get: function () {
@@ -18546,6 +18546,9 @@
                     this.getPurchasePortalLine.filterObject = this.purchasePortalFilter;
                     this.transactionService.getPurchasePortalLines(this.getPurchasePortalLine).then(function (result) {
                         _this.transactionService.purchasePortalLine = result;
+                        _this.transactionService.purchasePortalLine.forEach(function (element) {
+                            _this.filteredDocBatchArray = element.docBatchArray.filter(function (value) { return value.historical === 'G'; });
+                        });
                     });
                     return [2 /*return*/];
                 });
@@ -18589,7 +18592,7 @@
     TransactionConfirmationHistoryComponent.decorators = [
         { type: i0.Component, args: [{
                     selector: "co-transaction-confirmation-history",
-                    template: "\n    <div class=\"history-grid-wrapper\">\n      <co-simple-grid (selectRow)=\"selectedLineDocBatchArray($event)\"\n                      *ngIf=\"transactionService.purchasePortalLine[0]\"\n                      [data]=\"transactionService.purchasePortalLine[0].docBatchArray\"\n                      [showToolbar]=\"true\"\n                      [rowsPerPage]=\"20\"\n                      [showDelete]=\"true\"\n                      (deleteRow)=\"deleteDocBatch($event)\"\n      >\n        <co-simple-grid-column [headerText]=\"'DELIVERY_DATE' | localize\">\n          <ng-template #template let-row=\"row\">\n            <span [textContent]=\"row.docDate | date:'dd MMM yyyy'\"></span>\n          </ng-template>\n        </co-simple-grid-column>\n        <co-simple-grid-column [headerText]=\"'AMOUNT' | localize\" [field]=\"'docAmount'\"></co-simple-grid-column>\n        <co-simple-grid-column [headerText]=\"'PRICE' | localize\" [field]=\"'confirmedPrice'\"></co-simple-grid-column>\n        <co-simple-grid-column [headerText]=\"'DATE' | localize\">\n          <ng-template #template let-row=\"row\">\n            <span [textContent]=\"row.docDateOrg | date:'dd MMM yyyy'\"></span>\n          </ng-template>\n        </co-simple-grid-column>\n        <co-simple-grid-column [headerText]=\"'REFERENCE' | localize\" [field]=\"'reference'\"></co-simple-grid-column>\n        <co-simple-grid-column [headerText]=\"'DELIVERY_BATCH' | localize\" [field]=\"'deliveryBatch'\"></co-simple-grid-column>\n        <co-simple-grid-column [headerText]=\"'HISTORICAL' | localize\" [field]=\"'historical'\"></co-simple-grid-column>\n      </co-simple-grid>\n    </div>\n  ",
+                    template: "\n    <div class=\"history-grid-wrapper\">\n      <co-simple-grid (selectRow)=\"selectedLineDocBatchArray($event)\"\n                      *ngIf=\"transactionService.purchasePortalLine[0]\"\n                      [data]=\"filteredDocBatchArray\"\n                      [showToolbar]=\"true\"\n                      [rowsPerPage]=\"20\"\n                      [showDelete]=\"true\"\n                      (deleteRow)=\"deleteDocBatch($event)\"\n      >\n        <co-simple-grid-column [headerText]=\"'DELIVERY_DATE' | localize\">\n          <ng-template #template let-row=\"row\">\n            <span [textContent]=\"row.docDate | date:'dd MMM yyyy'\"></span>\n          </ng-template>\n        </co-simple-grid-column>\n        <co-simple-grid-column [headerText]=\"'AMOUNT' | localize\" [field]=\"'docAmount'\"></co-simple-grid-column>\n        <co-simple-grid-column [headerText]=\"'PRICE' | localize\" [field]=\"'confirmedPrice'\"></co-simple-grid-column>\n        <co-simple-grid-column [headerText]=\"'DATE' | localize\">\n          <ng-template #template let-row=\"row\">\n            <span [textContent]=\"row.docDateOrg | date:'dd MMM yyyy'\"></span>\n          </ng-template>\n        </co-simple-grid-column>\n        <co-simple-grid-column [headerText]=\"'REFERENCE' | localize\" [field]=\"'reference'\"></co-simple-grid-column>\n        <co-simple-grid-column [headerText]=\"'DELIVERY_BATCH' | localize\" [field]=\"'deliveryBatch'\"></co-simple-grid-column>\n        <co-simple-grid-column [headerText]=\"'HISTORICAL' | localize\" [field]=\"'historical'\"></co-simple-grid-column>\n      </co-simple-grid>\n    </div>\n  ",
                     encapsulation: i0.ViewEncapsulation.None
                 },] }
     ];
@@ -18643,6 +18646,7 @@
             this.icons = Icon;
             this.showAddOrder = false;
             this.newDocBatchArray = new docDeliveryBatch_bo.DocDeliveryBatch();
+            this.isEditing = false;
             this.docBatchSaved = new i0.EventEmitter();
         }
         TransactionConfirmationDetailsComponent.prototype.showClass = function () {
@@ -18657,12 +18661,14 @@
                     switch (_a.label) {
                         case 0:
                             if (!(this.newDocBatchArray.docAmount && this.newDocBatchArray.confirmedPrice)) return [3 /*break*/, 2];
-                            this.newDocBatchArray.docAmountOrg = 0;
-                            this.newDocBatchArray.docDateOrg = new Date();
                             this.newDocBatchArray.deleteLine = "F";
                             this.newDocBatchArray.historical = "G";
-                            this.transactionService.purchasePortalLine[0].docBatchArray.push(this.newDocBatchArray);
+                            if (!this.newDocBatchArray.docDateOrg) {
+                                this.newDocBatchArray.docDateOrg = this.newDocBatchArray.docDate;
+                                this.transactionService.purchasePortalLine[0].docBatchArray.push(this.newDocBatchArray);
+                            }
                             this.transactionService.purchasePortalLine[0].docKind = "IB";
+                            console.log(this.transactionService.purchasePortalLine[0]);
                             return [4 /*yield*/, this.transactionService.updatePurchasePortalLines(this.transactionService.purchasePortalLine[0])];
                         case 1:
                             _a.sent();
@@ -18675,12 +18681,16 @@
                 });
             });
         };
+        TransactionConfirmationDetailsComponent.prototype.handleCancelClick = function () {
+            this.newDocBatchArray = new docDeliveryBatch_bo.DocDeliveryBatch();
+            this.isEditing = false;
+        };
         return TransactionConfirmationDetailsComponent;
     }());
     TransactionConfirmationDetailsComponent.decorators = [
         { type: i0.Component, args: [{
                     selector: "co-transaction-confirmation-details",
-                    template: "\n    <div class=\"confirmation-details-wrapper\">\n      <co-form>\n        <div class=\"details-header\">\n          <span class=\"header-left-text\" [textContent]=\"'ORDER_CONFIRMATIONS' | localize\"></span>\n          <co-icon class=\"header-left-text\" [iconData]=\"iconCacheService.getIcon(icons.PlusRound)\"\n                   (click)=\"addButtonClicked()\"></co-icon>\n          <div class=\"details-header-right\">\n            <span class=\"header-right-text\" [textContent]=\"'REQUESTED_DELIVERY' | localize\"></span>\n            <span class=\"header-right-text-colon\" [textContent]=\"':   '\"></span>\n            <span class=\"header-right-text\" [textContent]=\"transactionLines.deliveryDate | date:'dd-MM-YYYY'\"></span>\n          </div>\n        </div>\n        <div *ngIf=\"showAddOrder\" class=\"columns-wrapper\">\n          <div class=\"details-column\">\n            <co-input-text  class=\"details-input\"\n                            [(model)]=\"newDocBatchArray.docAmount\"\n                            [placeholder]=\"'AMOUNT' | localize\"\n                            required\n            >\n            </co-input-text>\n            <co-input-date class=\"details-input\"\n                           [(model)]=\"newDocBatchArray.docDate\"\n            >\n            </co-input-date>\n            <co-input-text  class=\"details-input\"\n                            [(model)]=\"newDocBatchArray.confirmedPrice\"\n                            [placeholder]=\"'CONFIRMED_PRICE' | localize\"\n            >\n            </co-input-text>\n          </div>\n\n          <div class=\"divider-wrapper\">\n            <div class=\"divider\"></div>\n          </div>\n\n          <div class=\"details-column\">\n            <co-input-text class=\"details-input\"\n                           [(model)]=\"newDocBatchArray.reference\"\n                           [placeholder]=\"'REFERENCE' | localize\">\n            </co-input-text>\n\n            <co-input-text class=\"details-input\"\n                           [(model)]=\"newDocBatchArray.deliveryBatch\"\n                           [placeholder]=\"'DELIVERY_BATCH' | localize\">\n            </co-input-text>\n          </div>\n        </div>\n      </co-form>\n\n      <div *ngIf=\"showAddOrder\" class=\"save-cancel-wrapper\">\n        <co-default-ok-cancel-buttons (okClick)=\"handleOkClick()\"></co-default-ok-cancel-buttons>\n      </div>\n    </div>\n  ",
+                    template: "\n    <div class=\"confirmation-details-wrapper\">\n      <co-form>\n        <div class=\"details-header\">\n          <span class=\"header-left-text\" [textContent]=\"'ORDER_CONFIRMATIONS' | localize\"></span>\n          <co-icon class=\"header-left-text\" [iconData]=\"iconCacheService.getIcon(icons.PlusRound)\"\n                   (click)=\"addButtonClicked()\"></co-icon>\n          <div class=\"details-header-right\">\n            <span class=\"header-right-text\" [textContent]=\"'REQUESTED_DELIVERY' | localize\"></span>\n            <span class=\"header-right-text-colon\" [textContent]=\"':   '\"></span>\n            <span class=\"header-right-text\" [textContent]=\"transactionLines.deliveryDate | date:'dd-MM-YYYY'\"></span>\n          </div>\n        </div>\n        <div class=\"header-inform-user\" *ngIf=\"isEditing\">\n          <span class=\"\" [textContent]=\"'EDITING_DATA_ROW' | localize\"></span>\n        </div>\n        <div *ngIf=\"showAddOrder\" class=\"columns-wrapper\">\n          <div class=\"details-column\">\n            <co-input-text  class=\"details-input\"\n                            [(model)]=\"newDocBatchArray.docAmount\"\n                            [placeholder]=\"'AMOUNT' | localize\"\n                            required\n            >\n            </co-input-text>\n            <co-input-date class=\"details-input\"\n                           [(model)]=\"newDocBatchArray.docDate\"\n                           required\n            >\n            </co-input-date>\n            <co-input-text  class=\"details-input\"\n                            [(model)]=\"newDocBatchArray.confirmedPrice\"\n                            [placeholder]=\"'CONFIRMED_PRICE' | localize\"\n                            required\n            >\n            </co-input-text>\n          </div>\n\n          <div class=\"divider-wrapper\">\n            <div class=\"divider\"></div>\n          </div>\n\n          <div class=\"details-column\">\n            <co-input-text class=\"details-input\"\n                           [(model)]=\"newDocBatchArray.reference\"\n                           [placeholder]=\"'REFERENCE' | localize\">\n            </co-input-text>\n\n            <co-input-text class=\"details-input\"\n                           [(model)]=\"newDocBatchArray.deliveryBatch\"\n                           [placeholder]=\"'DELIVERY_BATCH' | localize\">\n            </co-input-text>\n          </div>\n        </div>\n      </co-form>\n\n      <div *ngIf=\"showAddOrder\" class=\"save-cancel-wrapper\">\n        <co-default-ok-cancel-buttons (okClick)=\"handleOkClick()\" (cancelClick)=\"handleCancelClick()\"></co-default-ok-cancel-buttons>\n      </div>\n    </div>\n  ",
                     encapsulation: i0.ViewEncapsulation.None,
                     providers: [
                         corecomponents_v12.FormMasterService
@@ -18694,9 +18704,9 @@
     TransactionConfirmationDetailsComponent.propDecorators = {
         transactionLines: [{ type: i0.Input }],
         transactionInfoNr: [{ type: i0.Input }],
-        testLines: [{ type: i0.Input }],
         showClass: [{ type: i0.HostBinding, args: ["class.co-transaction-confirmation-details",] }],
         newDocBatchArray: [{ type: i0.Input }],
+        isEditing: [{ type: i0.Input }],
         docBatchSaved: [{ type: i0.Output }]
     };
 
@@ -18796,6 +18806,7 @@
             this.goodsReceiptStatus = new goodsReceiptStatusWithHistory_bo.GoodsReceiptStatusWithHistory();
             this.selectedLineDocBatchArray = new docDeliveryBatch_bo.DocDeliveryBatch();
             this.isDocBatchSaved = false;
+            this.editingMode = false;
             this._transactionInfo = new transactionInfo_bo.TransactionInfo();
         }
         Object.defineProperty(TransactionLineSidePanelPurchaseComponent.prototype, "transactionInfo", {
@@ -18830,6 +18841,7 @@
         };
         TransactionLineSidePanelPurchaseComponent.prototype.fillInputOnClick = function (data) {
             this.selectedLineDocBatchArray = data;
+            this.editingMode = true;
         };
         TransactionLineSidePanelPurchaseComponent.prototype.docBatchSaved = function (data) {
             this.isDocBatchSaved = data;
@@ -18839,7 +18851,7 @@
     TransactionLineSidePanelPurchaseComponent.decorators = [
         { type: i0.Component, args: [{
                     selector: "co-transaction-line-side-panel-purchase",
-                    template: "\n    <ng-container [ngSwitch]=\"category\">\n      <ng-container *ngSwitchCase=\"categories.PurchaseOrderOrderConfirmation\">\n        <co-transaction-confirmation-details\n          [transactionInfoNr]=\"transactionInfo.transactionNr\"\n          [transactionLines]=\"transactionLine\"\n          [newDocBatchArray]=\"selectedLineDocBatchArray\"\n          (docBatchSaved)=\"docBatchSaved($event)\"\n        ></co-transaction-confirmation-details>\n        <co-transaction-confirmation-history\n          [transactionLines]=\"transactionLine\"\n          [transactionInfoNr]=\"transactionInfo.transactionNr\"\n          [transactionId]=\"transactionInfo.id\"\n          (lineSelected)=\"fillInputOnClick($event)\"\n          [isDocBatchSaved]=\"isDocBatchSaved\"\n          (docBatchApplied)=\"docBatchSaved($event)\"\n        ></co-transaction-confirmation-history>\n      </ng-container>\n\n      <ng-container *ngSwitchCase=\"categories.PurchaseOrderReceivedGoods\">\n        <co-transaction-side-panel-edit-request-details\n          [category]=\"categories.PurchaseOrderReceivedGoods\"\n          [transactionInfo]=\"transactionInfo\"\n          [transactionLine]=\"transactionLine\"\n          [amountLeftToReceive]=\"goodsReceiptStatus.quantityToReceive\"\n          (reloadReceivingGoodsHistory)=\"getGoodsReceiptStatusWithHistory()\"\n        ></co-transaction-side-panel-edit-request-details>\n        <co-transaction-receiving-goods-history\n          *ngIf=\"transactionLine.amount >= 0\"\n          [transactionInfo]=\"transactionInfo\"\n          [transactionLine]=\"transactionLine\"\n          [goodsReceiptHistory]=\"goodsReceiptStatus.goodsReceiptHistory\"\n          (reloadReceivingGoodsHistory)=\"getGoodsReceiptStatusWithHistory()\"\n        ></co-transaction-receiving-goods-history>\n        <co-transaction-available-stock-grid\n          *ngIf=\"transactionLine.amount < 0\"\n          [transactionInfo]=\"transactionInfo\"\n          [transactionLine]=\"transactionLine\"\n        ></co-transaction-available-stock-grid>\n      </ng-container>\n\n      <ng-container *ngSwitchDefault>\n        <co-transaction-line-side-panel-default\n          [transactionInfo]=\"transactionInfo\"\n          [transactionLine]=\"transactionLine\"\n        ></co-transaction-line-side-panel-default>\n      </ng-container>\n    </ng-container>\n  ",
+                    template: "\n    <ng-container [ngSwitch]=\"category\">\n      <ng-container *ngSwitchCase=\"categories.PurchaseOrderOrderConfirmation\">\n        <co-transaction-confirmation-details\n          [transactionInfoNr]=\"transactionInfo.transactionNr\"\n          [transactionLines]=\"transactionLine\"\n          [newDocBatchArray]=\"selectedLineDocBatchArray\"\n          [isEditing]=\"editingMode\"\n          (docBatchSaved)=\"docBatchSaved($event)\"\n        ></co-transaction-confirmation-details>\n        <co-transaction-confirmation-history\n          [transactionLines]=\"transactionLine\"\n          [transactionInfoNr]=\"transactionInfo.transactionNr\"\n          [transactionId]=\"transactionInfo.id\"\n          (lineSelected)=\"fillInputOnClick($event)\"\n          [isDocBatchSaved]=\"isDocBatchSaved\"\n          (docBatchApplied)=\"docBatchSaved($event)\"\n        ></co-transaction-confirmation-history>\n      </ng-container>\n\n      <ng-container *ngSwitchCase=\"categories.PurchaseOrderReceivedGoods\">\n        <co-transaction-side-panel-edit-request-details\n          [category]=\"categories.PurchaseOrderReceivedGoods\"\n          [transactionInfo]=\"transactionInfo\"\n          [transactionLine]=\"transactionLine\"\n          [amountLeftToReceive]=\"goodsReceiptStatus.quantityToReceive\"\n          (reloadReceivingGoodsHistory)=\"getGoodsReceiptStatusWithHistory()\"\n        ></co-transaction-side-panel-edit-request-details>\n        <co-transaction-receiving-goods-history\n          *ngIf=\"transactionLine.amount >= 0\"\n          [transactionInfo]=\"transactionInfo\"\n          [transactionLine]=\"transactionLine\"\n          [goodsReceiptHistory]=\"goodsReceiptStatus.goodsReceiptHistory\"\n          (reloadReceivingGoodsHistory)=\"getGoodsReceiptStatusWithHistory()\"\n        ></co-transaction-receiving-goods-history>\n        <co-transaction-available-stock-grid\n          *ngIf=\"transactionLine.amount < 0\"\n          [transactionInfo]=\"transactionInfo\"\n          [transactionLine]=\"transactionLine\"\n        ></co-transaction-available-stock-grid>\n      </ng-container>\n\n      <ng-container *ngSwitchDefault>\n        <co-transaction-line-side-panel-default\n          [transactionInfo]=\"transactionInfo\"\n          [transactionLine]=\"transactionLine\"\n        ></co-transaction-line-side-panel-default>\n      </ng-container>\n    </ng-container>\n  ",
                     encapsulation: i0.ViewEncapsulation.None
                 },] }
     ];
@@ -19099,37 +19111,37 @@
             this._dialogService = _dialogService;
             this._receiveGoodsService = _receiveGoodsService;
             this.icons = Icon;
+            this.transactionKind = transactionKind_enum.TransactionKind;
+            this.transactionTypeCategory = TransactionTypeCategory;
             this.reloadReceivingGoodsHistory = new i0.EventEmitter();
             this.receiptDetails = new purchaseOrderLineReceiptDetails_bo.PurchaseOrderLineReceiptDetails();
             this.request = new receiveGoodsForPurchaseOrderRequest_bo.ReceiveGoodsForPurchaseOrderRequest();
             this.saveButtonDisabled = false;
-            this.locationDropdownFields = { text: "locationNo", value: "locationNo" };
             this.readonly = false;
             this._subscriptions = [];
-            this.request.purchaseOrderLineReceiptDetailsDTOS = [this.receiptDetails];
-            var timeElapsed = Date.now();
-            this.request.receivedDate = new Date(timeElapsed);
         }
-        Object.defineProperty(ReceiveGoodsRequestComponent.prototype, "amountLeftToReceive", {
+        Object.defineProperty(ReceiveGoodsRequestComponent.prototype, "transactionLine", {
             get: function () {
-                return this._amountLeftToReceive;
+                return this._transactionLine;
             },
             set: function (value) {
-                this._amountLeftToReceive = value;
-                this.receiptDetails.quantityToReceive = value;
+                this._transactionLine = value;
+                this.readonly = this._transactionLine.hasInvoices;
+                this.receiptDetails.warehouseNr = value.warehouseNumber;
+                this.receiptDetails.lineNr = value.lineNr;
             },
             enumerable: false,
             configurable: true
         });
-        Object.defineProperty(ReceiveGoodsRequestComponent.prototype, "transactionLine", {
+        Object.defineProperty(ReceiveGoodsRequestComponent.prototype, "amountLeftToReceive", {
             get: function () {
-                return this._transactionLine;
+                return this._amountLeftToReceive;
             },
             set: function (value) {
-                this._transactionLine = value;
-                this.readonly = this._transactionLine.hasInvoices;
-                this.receiptDetails.warehouseNr = value.warehouseNumber;
-                this.receiptDetails.lineNr = value.lineNr;
+                this._amountLeftToReceive = value;
+                if (!this.returnStockMode()) {
+                    this.receiptDetails.quantityToReceive = value;
+                }
             },
             enumerable: false,
             configurable: true
@@ -19142,10 +19154,16 @@
             this._subscriptions.push(this._receiveGoodsService.returnArticleSelected.subscribe(function (availableStock) {
                 _this._handleReturnStock(availableStock);
             }));
+            this.request.purchaseOrderLineReceiptDetailsDTOS = [this.receiptDetails];
+            var timeElapsed = Date.now();
+            this.request.receivedDate = new Date(timeElapsed);
         };
         ReceiveGoodsRequestComponent.prototype.ngOnDestroy = function () {
             this._subscriptions.forEach(function (subscription) { return subscription.unsubscribe(); });
         };
+        ReceiveGoodsRequestComponent.prototype.ngAfterViewInit = function () {
+            this.reloadReceivingGoodsHistory.next();
+        };
         ReceiveGoodsRequestComponent.prototype.submit = function () {
             return this._formMaster.submitSlaves();
         };
@@ -19175,13 +19193,6 @@
                 this.saveButtonDisabled = false;
             }
         };
-        ReceiveGoodsRequestComponent.prototype.openWarehouseLocationDialog = function () {
-            var _this = this;
-            if (!this.returnStockMode()) {
-                this._dialogService.showWarehouseLocation(this.receiptDetails.warehouseNr, true, true, true, this.transactionLine)
-                    .then(function () { return _this.receiptDetails.locationNr = _this.transactionLine.locationNr; });
-            }
-        };
         ReceiveGoodsRequestComponent.prototype.returnStockMode = function () {
             return this.transactionLine.amount < 0;
         };
@@ -19191,6 +19202,7 @@
             this.receiptDetails.quantityToReceive = this.returnMaxToReceive;
             this.receiptDetails.warehouseNr = availableStock.warehouseNumber;
             this.receiptDetails.locationNr = availableStock.locationNumber;
+            this.selectedLocation = this.receiptDetails.locationNr;
             this.receiptDetails.serialNr = availableStock.serialNumber;
             this.receiptDetails.batchNr = availableStock.batchNumber;
             this.receiptDetails.lineNr = this.transactionLine.lineNr;
@@ -19200,7 +19212,7 @@
     ReceiveGoodsRequestComponent.decorators = [
         { type: i0.Component, args: [{
                     selector: "co-receive-goods-request",
-                    template: "\n    <co-form>\n      <div class=\"details-header\" [textContent]=\"returnStockMode() ? ('RETURN_DETAILS' | localize | uppercase) : ('RECEIPT_DETAILS' | localize | uppercase)\"></div>\n      <div class=\"columns-wrapper\">\n        <div class=\"details-column\">\n          <co-input-text class=\"details-input\"\n                         [max]=\"returnStockMode() ? returnMaxToReceive : amountLeftToReceive\"\n                         [(model)]=\"receiptDetails.serialNr ? 1 : receiptDetails.quantityToReceive\"\n                         [disabled]=\"!!receiptDetails.serialNr || receiptDetails.quantityToReceive === 0\"\n                         [readonly]=\"!!receiptDetails.serialNr || receiptDetails.quantityToReceive === 0 || readonly\"\n                         [required]=\"true\"\n                         [type]=\"'number'\"\n                         [min]=\"1\"\n                         [placeholder]=\"'AMOUNT' | localize\"></co-input-text>\n          <co-input-text class=\"details-input\" [(model)]=\"receiptDetails.warehouseNr\"\n                         [type]=\"'number'\"\n                         [hideArrowButtons]=\"true\"\n                         [readonly]=\"transactionLine.warehouseNumber !== undefined || readonly || returnStockMode()\"\n                         [disabled]=\"transactionLine.warehouseNumber !== undefined || returnStockMode()\"\n                         [required]=\"transactionLine.isWarehouseRequired\"\n                         [placeholder]=\"'WAREHOUSE' | localize\"></co-input-text>\n          <div class=\"location-wrapper\" [class.clickable]=\"!returnStockMode()\" (click)=\"openWarehouseLocationDialog()\">\n            <span *ngIf=\"!receiptDetails.locationNr && transactionLine.isLocationRequired\" class=\"required\" [textContent]=\"'*'\"></span>\n            <co-icon *ngIf=\"receiptDetails.locationNr\" [iconData]=\"iconCacheService.getIcon(icons.ShelvesLight)\"></co-icon>\n            <div [textContent]=\"receiptDetails.locationNr ? receiptDetails.locationNr : ('LOCATION' | localize)\"></div>\n          </div>\n          <co-input-text class=\"details-input\"\n                         *ngIf=\"!returnStockMode()\"\n                         [(model)]=\"request.packingSlipNr\"\n                         [placeholder]=\"'PACKING_SLIP' | localize\"\n                         [required]=\"true\"\n                         [readonly]=\"readonly\"\n          ></co-input-text>\n        </div>\n        <div class=\"divider-wrapper\">\n          <div class=\"divider\"></div>\n        </div>\n        <div class=\"details-column\">\n          <co-input-date class=\"details-input\"\n                         [(model)]=\"request.receivedDate\"\n                         [readonly]=\"readonly\"\n          ></co-input-date>\n          <co-input-text *ngIf=\"transactionLine.isBatchNrRequired\" class=\"details-input\" [(model)]=\"receiptDetails.batchNr\"\n                         [type]=\"'number'\"\n                         [hideArrowButtons]=\"true\"\n                         [readonly]=\"readonly || returnStockMode()\"\n                         [disabled]=\"returnStockMode()\"\n                         [required]=\"transactionLine.isBatchNrRequired\"\n                         [placeholder]=\"'BATCH_NUMBER' | localize\"></co-input-text>\n          <co-input-text *ngIf=\"transactionLine.isSerialNrRequired\" class=\"details-input\" [(model)]=\"receiptDetails.serialNr\"\n                         [type]=\"'number'\"\n                         [hideArrowButtons]=\"true\"\n                         [readonly]=\"readonly || returnStockMode()\"\n                         [disabled]=\"returnStockMode()\"\n                         [required]=\"transactionLine.isSerialNrRequired\"\n                         [placeholder]=\"'SERIAL_NUMBER' | localize\"></co-input-text>\n        </div>\n      </div>\n    </co-form>\n\n    <div class=\"commit-button-wrapper\">\n      <div class=\"commit-button clickable\" *ngIf=\"!readonly\" (click)=\"handleSaveDetailsEdit()\" [class.disabled]=\"saveButtonDisabled || amountLeftToReceive === 0\">\n        <span class=\"commit-text\" [textContent]=\"returnStockMode() ? ('RETURN_STOCK' | localize) : ('RECEIVE' | localize)\"></span>\n      </div>\n    </div>\n  ",
+                    template: "\n    <co-form>\n      <div class=\"header-wrapper\">\n        <div class=\"details-header\" [textContent]=\"returnStockMode() ? ('RETURN_DETAILS' | localize | uppercase) : ('RECEIPT_DETAILS' | localize | uppercase)\"></div>\n        <co-transaction-line-statusbar class=\"status-bar-wrapper\" [transaction]=\"transactionLine\" [transactionKind]=\"transactionKind.SalesOrder\" [transactionTypeCategory]=\"transactionTypeCategory.PurchaseOrderReceivedGoods\"></co-transaction-line-statusbar>\n      </div>\n      <div class=\"columns-wrapper\">\n        <div class=\"details-column\">\n          <div class=\"transaction-line-totals-amount\">\n            <co-input-number-picker class=\"amount-number-picker\"\n                                    [max]=\"returnStockMode() ? returnMaxToReceive : amountLeftToReceive\"\n                                    [(model)]=\"receiptDetails.serialNr ? 1 : receiptDetails.quantityToReceive\"\n                                    [min]=\"1\"\n                                    [readonly]=\"!!receiptDetails.serialNr || receiptDetails.quantityToReceive === 0 || !receiptDetails.quantityToReceive || readonly\"\n                                    [disabled]=\"!!receiptDetails.serialNr || receiptDetails.quantityToReceive === 0 || !receiptDetails.quantityToReceive\"\n                                    [required]=\"true\"\n            ></co-input-number-picker>\n          </div>\n          <co-input-text class=\"details-input\" [(model)]=\"receiptDetails.warehouseNr\"\n                         [type]=\"'number'\"\n                         [hideArrowButtons]=\"true\"\n                         [readonly]=\"transactionLine.warehouseNumber !== undefined || readonly || returnStockMode()\"\n                         [disabled]=\"transactionLine.warehouseNumber !== undefined || returnStockMode()\"\n                         [required]=\"transactionLine.isWarehouseRequired\"\n                         [placeholder]=\"'WAREHOUSE' | localize\"></co-input-text>\n          <div class=\"location-wrapper\">\n            <!--            <span *ngIf=\"!receiptDetails.locationNr && transactionLine.isLocationRequired\" class=\"required\" [textContent]=\"'*'\"></span>-->\n            <co-transaction-line-warehouse-location-button [locationNr]=\"selectedLocation\" [readonly]=\"returnStockMode() || receiptDetails.quantityToReceive === 0\" [line]=\"transactionLine\" (locationSelected)=\"receiptDetails.locationNr = $event\"></co-transaction-line-warehouse-location-button>\n          </div>\n          <co-input-text class=\"details-input\"\n                         *ngIf=\"!returnStockMode()\"\n                         [(model)]=\"request.packingSlipNr\"\n                         [placeholder]=\"'PACKING_SLIP' | localize\"\n                         [required]=\"true\"\n                         [readonly]=\"readonly\"\n          ></co-input-text>\n        </div>\n        <div class=\"divider-wrapper\">\n          <div class=\"divider\"></div>\n        </div>\n        <div class=\"details-column\">\n          <co-input-date class=\"details-input\"\n                         [(model)]=\"request.receivedDate\"\n                         [readonly]=\"readonly\"\n          ></co-input-date>\n          <co-input-text *ngIf=\"transactionLine.isBatchNrRequired\" class=\"details-input\" [(model)]=\"receiptDetails.batchNr\"\n                         [type]=\"'number'\"\n                         [hideArrowButtons]=\"true\"\n                         [readonly]=\"readonly || returnStockMode()\"\n                         [disabled]=\"returnStockMode()\"\n                         [required]=\"transactionLine.isBatchNrRequired\"\n                         [placeholder]=\"'BATCH_NUMBER' | localize\"></co-input-text>\n          <co-input-text *ngIf=\"transactionLine.isSerialNrRequired\" class=\"details-input\" [(model)]=\"receiptDetails.serialNr\"\n                         [type]=\"'number'\"\n                         [hideArrowButtons]=\"true\"\n                         [readonly]=\"readonly || returnStockMode()\"\n                         [disabled]=\"returnStockMode()\"\n                         [required]=\"transactionLine.isSerialNrRequired\"\n                         [placeholder]=\"'SERIAL_NUMBER' | localize\"></co-input-text>\n        </div>\n      </div>\n    </co-form>\n\n    <div class=\"commit-button-wrapper\">\n      <div class=\"commit-button clickable\" *ngIf=\"!readonly\" (click)=\"handleSaveDetailsEdit()\" [class.disabled]=\"saveButtonDisabled || amountLeftToReceive === 0\">\n        <span class=\"commit-text\" [textContent]=\"returnStockMode() ? ('RETURN_STOCK' | localize) : ('RECEIVE' | localize)\"></span>\n      </div>\n    </div>\n  ",
                     providers: [
                         corecomponents_v12.FormMasterService
                     ],
@@ -19216,12 +19228,89 @@
         { type: TransactionReceiveGoodsService }
     ]; };
     ReceiveGoodsRequestComponent.propDecorators = {
-        amountLeftToReceive: [{ type: i0.Input }],
         transactionLine: [{ type: i0.Input }],
+        amountLeftToReceive: [{ type: i0.Input }],
         reloadReceivingGoodsHistory: [{ type: i0.Output }],
         showClass: [{ type: i0.HostBinding, args: ["class.co-transaction-receiving-goods-details",] }]
     };
 
+    var TransactionLineWarehouseLocationButtonComponent = /** @class */ (function () {
+        function TransactionLineWarehouseLocationButtonComponent(iconCacheService, _dialogService) {
+            this.iconCacheService = iconCacheService;
+            this._dialogService = _dialogService;
+            this.icons = Icon;
+            this.readonly = false;
+            this.locationSelected = new i0.EventEmitter();
+        }
+        TransactionLineWarehouseLocationButtonComponent.prototype.showClass = function () {
+            return true;
+        };
+        TransactionLineWarehouseLocationButtonComponent.prototype.openWarehouseLocationDialog = function () {
+            return __awaiter(this, void 0, void 0, function () {
+                var response;
+                return __generator(this, function (_a) {
+                    switch (_a.label) {
+                        case 0:
+                            if (!!this.readonly) return [3 /*break*/, 2];
+                            return [4 /*yield*/, this._dialogService.showWarehouseLocation(this.line.warehouseNumber, false, true, true, this.line)];
+                        case 1:
+                            response = _a.sent();
+                            if (response && response.output) {
+                                this.locationNr = response.output;
+                                if (this.line instanceof transactionLineInfo_bo.TransactionLineInfo) {
+                                    this.locationSelected.next(response.output);
+                                }
+                                else {
+                                    this.line.locationNr = response.output;
+                                }
+                            }
+                            _a.label = 2;
+                        case 2: return [2 /*return*/];
+                    }
+                });
+            });
+        };
+        return TransactionLineWarehouseLocationButtonComponent;
+    }());
+    TransactionLineWarehouseLocationButtonComponent.decorators = [
+        { type: i0.Component, args: [{
+                    selector: "co-transaction-line-warehouse-location-button",
+                    template: "\n    <div class=\"transaction-line-button\" [class.no-pointer]=\"readonly\" (click)=\"openWarehouseLocationDialog()\">\n      <co-icon [iconData]=\"iconCacheService.getIcon(icons.ShelvesLight)\"></co-icon>\n      <span class=\"co-transaction-overflow-ellipsis\" [textContent]=\"locationNr ? locationNr : '-'\"></span>\n    </div>\n    ",
+                    encapsulation: i0.ViewEncapsulation.None
+                },] }
+    ];
+    TransactionLineWarehouseLocationButtonComponent.ctorParameters = function () { return [
+        { type: IconCacheService },
+        { type: DialogService }
+    ]; };
+    TransactionLineWarehouseLocationButtonComponent.propDecorators = {
+        line: [{ type: i0.Input }],
+        locationNr: [{ type: i0.Input }],
+        readonly: [{ type: i0.Input }],
+        locationSelected: [{ type: i0.Output }],
+        showClass: [{ type: i0.HostBinding, args: ["class.co-transaction-line-warehouse-location-button",] }]
+    };
+
+    var TransactionLineWarehouseLocationButtonModule = /** @class */ (function () {
+        function TransactionLineWarehouseLocationButtonModule() {
+        }
+        return TransactionLineWarehouseLocationButtonModule;
+    }());
+    TransactionLineWarehouseLocationButtonModule.decorators = [
+        { type: i0.NgModule, args: [{
+                    imports: [
+                        common.CommonModule,
+                        corecomponents_v12.IconModule
+                    ],
+                    declarations: [
+                        TransactionLineWarehouseLocationButtonComponent
+                    ],
+                    exports: [
+                        TransactionLineWarehouseLocationButtonComponent
+                    ]
+                },] }
+    ];
+
     var TransactionSidePanelEditRequestDetailsModule = /** @class */ (function () {
         function TransactionSidePanelEditRequestDetailsModule() {
         }
@@ -19235,7 +19324,10 @@
                         corecomponents_v12.InputTextModule,
                         PipeModule,
                         corecomponents_v12.IconModule,
-                        corecomponents_v12.InputDatePickerModule
+                        corecomponents_v12.InputDatePickerModule,
+                        TransactionLineWarehouseLocationButtonModule,
+                        corecomponents_v12.InputNumberPickerModule,
+                        TransactionLineStatusbarModule
                     ],
                     declarations: [
                         TransactionSidePanelEditRequestDetailsComponent,
@@ -20861,60 +20953,6 @@
                 },] }
     ];
 
-    var TransactionLineWarehouseLocationButtonComponent = /** @class */ (function () {
-        function TransactionLineWarehouseLocationButtonComponent(iconCacheService, _dialogService) {
-            this.iconCacheService = iconCacheService;
-            this._dialogService = _dialogService;
-            this.icons = Icon;
-            this.readonly = false;
-        }
-        TransactionLineWarehouseLocationButtonComponent.prototype.showClass = function () {
-            return true;
-        };
-        TransactionLineWarehouseLocationButtonComponent.prototype.openWarehouseLocationDialog = function (line) {
-            if (!this.readonly) {
-                this._dialogService.showWarehouseLocation(line.warehouseNumber, true, true, true, line);
-            }
-        };
-        return TransactionLineWarehouseLocationButtonComponent;
-    }());
-    TransactionLineWarehouseLocationButtonComponent.decorators = [
-        { type: i0.Component, args: [{
-                    selector: "co-transaction-line-warehouse-location-button",
-                    template: "\n    <div class=\"transaction-line-button\" [class.no-pointer]=\"readonly\" (click)=\"openWarehouseLocationDialog(line)\">\n      <co-icon [iconData]=\"iconCacheService.getIcon(icons.ShelvesLight)\"></co-icon>\n      <span class=\"co-transaction-overflow-ellipsis\" [textContent]=\"line.locationNr ? line.locationNr : '-'\"></span>\n    </div>\n    ",
-                    encapsulation: i0.ViewEncapsulation.None
-                },] }
-    ];
-    TransactionLineWarehouseLocationButtonComponent.ctorParameters = function () { return [
-        { type: IconCacheService },
-        { type: DialogService }
-    ]; };
-    TransactionLineWarehouseLocationButtonComponent.propDecorators = {
-        line: [{ type: i0.Input }],
-        readonly: [{ type: i0.Input }],
-        showClass: [{ type: i0.HostBinding, args: ["class.co-transaction-line-warehouse-location-button",] }]
-    };
-
-    var TransactionLineWarehouseLocationButtonModule = /** @class */ (function () {
-        function TransactionLineWarehouseLocationButtonModule() {
-        }
-        return TransactionLineWarehouseLocationButtonModule;
-    }());
-    TransactionLineWarehouseLocationButtonModule.decorators = [
-        { type: i0.NgModule, args: [{
-                    imports: [
-                        common.CommonModule,
-                        corecomponents_v12.IconModule
-                    ],
-                    declarations: [
-                        TransactionLineWarehouseLocationButtonComponent
-                    ],
-                    exports: [
-                        TransactionLineWarehouseLocationButtonComponent
-                    ]
-                },] }
-    ];
-
     var TransactionReceivedGoodsGridModule = /** @class */ (function () {
         function TransactionReceivedGoodsGridModule() {
         }
@@ -22744,7 +22782,7 @@
             _this.relationService = relationService;
             _this.purchasePersonsFields = { text: "name", value: "relationId" };
             _this.tagsFields = { text: "description", value: "tagValueId" };
-            _this.branchFields = { text: "description", value: "relationId" };
+            _this.branchFields = { text: "familyName", value: "relationId" };
             _this.onHoldCodeFields = { text: "description", value: "onHoldCode" };
             _this.commissionCodeFields = { text: "description", value: "code" };
             return _this;
@@ -22783,7 +22821,9 @@
         //Branches
         TransactionPurchaseOrderFilterContentOrderComponent.prototype._setBranches = function () {
             var _this = this;
-            this.relationService.getBranches().then(function (branches) {
+            var request = new relationRequest.RelationRequest();
+            request.relationType = relationKind_enum$1.RelationKind.Branch;
+            this.relationService.getRelationListObjects(request).then(function (branches) {
                 _this.branches = new FilterViewmodel(branches, _this.branchFields).filterItems;
             });
         };
@@ -23709,7 +23749,7 @@
             _this.relationService = relationService;
             _this.salesPersonsFields = { text: "name", value: "relationId" };
             _this.tagsFields = { text: "description", value: "tagValueId" };
-            _this.branchFields = { text: "description", value: "relationId" };
+            _this.branchFields = { text: "familyName", value: "relationId" };
             _this.onHoldCodeFields = { text: "description", value: "onHoldCode" };
             _this.commissionCodeFields = { text: "description", value: "code" };
             _this.customerGroupFields = { text: "naam", value: "groepsnummer" };
@@ -23760,7 +23800,9 @@
         //Branches
         TransactionSalesOrderFilterContentOrderComponent.prototype._setBranches = function () {
             var _this = this;
-            this.relationService.getBranches().then(function (branches) {
+            var request = new relationRequest.RelationRequest();
+            request.relationType = relationKind_enum$1.RelationKind.Branch;
+            this.relationService.getRelationListObjects(request).then(function (branches) {
                 _this.branches = new FilterViewmodel(branches, _this.branchFields).filterItems;
             });
         };
@@ -24159,66 +24201,66 @@
     exports["ɵhr"] = TransactionAvailableStockGridModule;
     exports["ɵhs"] = TransactionAvailableStockGridComponent;
     exports["ɵht"] = TransactionSidePanelEditRequestDetailsModule;
-    exports["ɵhu"] = TransactionSidePanelEditRequestDetailsComponent;
-    exports["ɵhv"] = AllocationRequestComponent;
-    exports["ɵhw"] = ReceiveGoodsRequestComponent;
-    exports["ɵhx"] = ArticleService;
-    exports["ɵhy"] = TransactionLineSidePanelPurchaseComponent;
-    exports["ɵhz"] = TransactionLineSidePanelSalesModule;
+    exports["ɵhu"] = TransactionLineWarehouseLocationButtonModule;
+    exports["ɵhv"] = TransactionLineWarehouseLocationButtonComponent;
+    exports["ɵhw"] = TransactionSidePanelEditRequestDetailsComponent;
+    exports["ɵhx"] = AllocationRequestComponent;
+    exports["ɵhy"] = ReceiveGoodsRequestComponent;
+    exports["ɵhz"] = ArticleService;
     exports["ɵi"] = BusinessObjectCacheManagerService;
-    exports["ɵia"] = TransactionAllocateGoodsHistoryModule;
-    exports["ɵib"] = TransactionAllocateGoodsHistoryComponent;
-    exports["ɵic"] = TransactionLineSidePanelSalesComponent;
-    exports["ɵid"] = TransactionLineSidePanelComponent;
-    exports["ɵie"] = DynamicBaseComponent;
-    exports["ɵif"] = TransactionLineActionButtonsModule;
-    exports["ɵig"] = TransactionArticleTextOverviewModule;
-    exports["ɵih"] = TransactionArticleTextOverviewComponent;
-    exports["ɵii"] = TransactionLineActionButtonsComponent;
-    exports["ɵij"] = TransactionBaseGridComponent;
-    exports["ɵik"] = TransactionGridBaseComponent;
-    exports["ɵil"] = DialogTransactionLineCommissionCodeModule;
-    exports["ɵim"] = DialogTransactionLineCommissionCodeComponent;
-    exports["ɵin"] = DialogTransactionLineBaseComponent;
-    exports["ɵio"] = DialogTransactionLineWarehouseModule;
-    exports["ɵip"] = DialogTransactionLineWarehouseComponent;
-    exports["ɵiq"] = DialogTransactionLineWarehouseCcModule;
-    exports["ɵir"] = DialogTransactionLineWarehouseCcComponent;
-    exports["ɵis"] = DialogTransactionLineDeliveryMethodModule;
-    exports["ɵit"] = DialogTransactionLineDeliveryMethodComponent;
-    exports["ɵiu"] = DialogTransactionLineVatModule;
-    exports["ɵiv"] = DialogTransactionLineVatComponent;
-    exports["ɵiw"] = DialogTransactionLineDiscountModule;
-    exports["ɵix"] = DialogTransactionLinePriceListModule;
-    exports["ɵiy"] = DialogTransactionLinePriceListComponent;
-    exports["ɵiz"] = DialogTransactionLineDiscountComponent;
+    exports["ɵia"] = TransactionLineSidePanelPurchaseComponent;
+    exports["ɵib"] = TransactionLineSidePanelSalesModule;
+    exports["ɵic"] = TransactionAllocateGoodsHistoryModule;
+    exports["ɵid"] = TransactionAllocateGoodsHistoryComponent;
+    exports["ɵie"] = TransactionLineSidePanelSalesComponent;
+    exports["ɵif"] = TransactionLineSidePanelComponent;
+    exports["ɵig"] = DynamicBaseComponent;
+    exports["ɵih"] = TransactionLineActionButtonsModule;
+    exports["ɵii"] = TransactionArticleTextOverviewModule;
+    exports["ɵij"] = TransactionArticleTextOverviewComponent;
+    exports["ɵik"] = TransactionLineActionButtonsComponent;
+    exports["ɵil"] = TransactionBaseGridComponent;
+    exports["ɵim"] = TransactionGridBaseComponent;
+    exports["ɵin"] = DialogTransactionLineCommissionCodeModule;
+    exports["ɵio"] = DialogTransactionLineCommissionCodeComponent;
+    exports["ɵip"] = DialogTransactionLineBaseComponent;
+    exports["ɵiq"] = DialogTransactionLineWarehouseModule;
+    exports["ɵir"] = DialogTransactionLineWarehouseComponent;
+    exports["ɵis"] = DialogTransactionLineWarehouseCcModule;
+    exports["ɵit"] = DialogTransactionLineWarehouseCcComponent;
+    exports["ɵiu"] = DialogTransactionLineDeliveryMethodModule;
+    exports["ɵiv"] = DialogTransactionLineDeliveryMethodComponent;
+    exports["ɵiw"] = DialogTransactionLineVatModule;
+    exports["ɵix"] = DialogTransactionLineVatComponent;
+    exports["ɵiy"] = DialogTransactionLineDiscountModule;
+    exports["ɵiz"] = DialogTransactionLinePriceListModule;
     exports["ɵj"] = CacheField;
-    exports["ɵja"] = TransactionLinesGridComponent;
-    exports["ɵjb"] = DiscountModule;
-    exports["ɵjc"] = DiscountComponent;
-    exports["ɵjd"] = TransactionQuickAccessOverviewModule;
-    exports["ɵje"] = DialogCatalogModule;
-    exports["ɵjf"] = DialogCatalogComponent;
-    exports["ɵjg"] = TransactionQuickAccessOverviewComponent;
-    exports["ɵjh"] = TransactionQuickAccessOrderDeliveryModule;
-    exports["ɵji"] = TransactionSendButtonDialogModule;
-    exports["ɵjj"] = TransactionSendButtonDialogComponent;
-    exports["ɵjk"] = TransactionQuickAccessOrderDeliveryComponent;
-    exports["ɵjl"] = TransactionOrderDeliveryService;
-    exports["ɵjm"] = TransactionQuickAccessOrderPurchaseModule;
-    exports["ɵjn"] = TransactionQuickAccessOrderPurchaseComponent;
-    exports["ɵjo"] = TransactionQuickAccessGoodsAllocationModule;
-    exports["ɵjp"] = TransactionQuickAccessGoodsAllocationComponent;
-    exports["ɵjq"] = TransactionAllocateGoodsService;
-    exports["ɵjr"] = TransactionOrderConfirmationGridModule;
-    exports["ɵjs"] = TransactionOrderConfirmationGridComponent;
-    exports["ɵjt"] = TransactionReceivedGoodsGridModule;
-    exports["ɵju"] = DialogTransactionLineWarehouseLocationModule;
-    exports["ɵjv"] = TransactionLineWarehouseLocationModule;
-    exports["ɵjw"] = TransactionLineWarehouseLocationComponent;
-    exports["ɵjx"] = DialogTransactionLineWarehouseLocationComponent;
-    exports["ɵjy"] = TransactionLineWarehouseLocationButtonModule;
-    exports["ɵjz"] = TransactionLineWarehouseLocationButtonComponent;
+    exports["ɵja"] = DialogTransactionLinePriceListComponent;
+    exports["ɵjb"] = DialogTransactionLineDiscountComponent;
+    exports["ɵjc"] = TransactionLinesGridComponent;
+    exports["ɵjd"] = DiscountModule;
+    exports["ɵje"] = DiscountComponent;
+    exports["ɵjf"] = TransactionQuickAccessOverviewModule;
+    exports["ɵjg"] = DialogCatalogModule;
+    exports["ɵjh"] = DialogCatalogComponent;
+    exports["ɵji"] = TransactionQuickAccessOverviewComponent;
+    exports["ɵjj"] = TransactionQuickAccessOrderDeliveryModule;
+    exports["ɵjk"] = TransactionSendButtonDialogModule;
+    exports["ɵjl"] = TransactionSendButtonDialogComponent;
+    exports["ɵjm"] = TransactionQuickAccessOrderDeliveryComponent;
+    exports["ɵjn"] = TransactionOrderDeliveryService;
+    exports["ɵjo"] = TransactionQuickAccessOrderPurchaseModule;
+    exports["ɵjp"] = TransactionQuickAccessOrderPurchaseComponent;
+    exports["ɵjq"] = TransactionQuickAccessGoodsAllocationModule;
+    exports["ɵjr"] = TransactionQuickAccessGoodsAllocationComponent;
+    exports["ɵjs"] = TransactionAllocateGoodsService;
+    exports["ɵjt"] = TransactionOrderConfirmationGridModule;
+    exports["ɵju"] = TransactionOrderConfirmationGridComponent;
+    exports["ɵjv"] = TransactionReceivedGoodsGridModule;
+    exports["ɵjw"] = DialogTransactionLineWarehouseLocationModule;
+    exports["ɵjx"] = TransactionLineWarehouseLocationModule;
+    exports["ɵjy"] = TransactionLineWarehouseLocationComponent;
+    exports["ɵjz"] = DialogTransactionLineWarehouseLocationComponent;
     exports["ɵk"] = SelectMultipleParameterizedCacheService;
     exports["ɵka"] = TransactionReceivedGoodsGridComponent;
     exports["ɵkb"] = ViewModeButtonsModule;