@colijnit/transaction 258.1.37 → 258.1.39

package/esm2015/lib/transaction-version.js

@@ -3,8 +3,8 @@ export class Version {
     constructor() {
         this.name = "@colijnit/transaction";
         this.description = "Colijn IT transaction package";
-        this.symVer = "258.1.37";
-        this.publishDate = "23-6-2025 11:42:41";
+        this.symVer = "258.1.39";
+        this.publishDate = "24-6-2025 18:25:54";
     }
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidHJhbnNhY3Rpb24tdmVyc2lvbi5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uL3Byb2plY3RzL3RyYW5zYWN0aW9uL3NyYy9saWIvdHJhbnNhY3Rpb24tdmVyc2lvbi50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSx1REFBdUQ7QUFDdkQsTUFBTSxPQUFPLE9BQU87SUFBcEI7UUFDUyxTQUFJLEdBQUcsdUJBQXVCLENBQUM7UUFDL0IsZ0JBQVcsR0FBRywrQkFBK0IsQ0FBQztRQUM5QyxXQUFNLEdBQUcsVUFBVSxDQUFDO1FBQ3BCLGdCQUFXLEdBQUcsb0JBQW9CLENBQUM7SUFDNUMsQ0FBQztDQUFBIiwic291cmNlc0NvbnRlbnQiOlsiLy8gdGhpcyBmaWxlIGlzIGR5bmFtaWNhbGx5IGNyZWF0ZWQsIGRvIG5vdCBjaGFuZ2UgdGhpc1xuZXhwb3J0IGNsYXNzIFZlcnNpb24ge1xuICBwdWJsaWMgbmFtZSA9IFwiQGNvbGlqbml0L3RyYW5zYWN0aW9uXCI7XG4gIHB1YmxpYyBkZXNjcmlwdGlvbiA9IFwiQ29saWpuIElUIHRyYW5zYWN0aW9uIHBhY2thZ2VcIjtcbiAgcHVibGljIHN5bVZlciA9IFwiMjU4LjEuMzdcIjtcbiAgcHVibGljIHB1Ymxpc2hEYXRlID0gXCIyMy02LTIwMjUgMTE6NDI6NDFcIjtcbn0iXX0=
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidHJhbnNhY3Rpb24tdmVyc2lvbi5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uL3Byb2plY3RzL3RyYW5zYWN0aW9uL3NyYy9saWIvdHJhbnNhY3Rpb24tdmVyc2lvbi50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSx1REFBdUQ7QUFDdkQsTUFBTSxPQUFPLE9BQU87SUFBcEI7UUFDUyxTQUFJLEdBQUcsdUJBQXVCLENBQUM7UUFDL0IsZ0JBQVcsR0FBRywrQkFBK0IsQ0FBQztRQUM5QyxXQUFNLEdBQUcsVUFBVSxDQUFDO1FBQ3BCLGdCQUFXLEdBQUcsb0JBQW9CLENBQUM7SUFDNUMsQ0FBQztDQUFBIiwic291cmNlc0NvbnRlbnQiOlsiLy8gdGhpcyBmaWxlIGlzIGR5bmFtaWNhbGx5IGNyZWF0ZWQsIGRvIG5vdCBjaGFuZ2UgdGhpc1xuZXhwb3J0IGNsYXNzIFZlcnNpb24ge1xuICBwdWJsaWMgbmFtZSA9IFwiQGNvbGlqbml0L3RyYW5zYWN0aW9uXCI7XG4gIHB1YmxpYyBkZXNjcmlwdGlvbiA9IFwiQ29saWpuIElUIHRyYW5zYWN0aW9uIHBhY2thZ2VcIjtcbiAgcHVibGljIHN5bVZlciA9IFwiMjU4LjEuMzlcIjtcbiAgcHVibGljIHB1Ymxpc2hEYXRlID0gXCIyNC02LTIwMjUgMTg6MjU6NTRcIjtcbn0iXX0=

package/fesm2015/colijnit-transaction.js

@@ -294,8 +294,8 @@ class Version {
     constructor() {
         this.name = "@colijnit/transaction";
         this.description = "Colijn IT transaction package";
-        this.symVer = "258.1.37";
-        this.publishDate = "23-6-2025 11:42:41";
+        this.symVer = "258.1.39";
+        this.publishDate = "24-6-2025 18:25:54";
     }
 }
 
@@ -1297,6 +1297,7 @@ class TransactionEventService {
         this.selectedTransportDay = new Subject();
         this.resetTransportDayFilteredOrders = new Subject();
         this.selectAllPurchaseOrderLinesForReceiveGoods = new Subject();
+        this.setColliStickerAmount = new Subject();
         this.updatingSalesOrderGeneratePurchaseOrders = new Subject();
         this.updatingSalesOrderConfirmation = new Subject();
         this.updatingSalesOrderGoodsToBePicked = new Subject();
@@ -9087,6 +9088,7 @@ var TransactionCfgName;
     /* Received rubric */
     TransactionCfgName["LineQuantityToReceive"] = "lineQuantityToReceive";
     TransactionCfgName["StickerAmount"] = "stickerAmount";
+    TransactionCfgName["CollieAmount"] = "collieAmount";
     TransactionCfgName["LineWarehouseLocationReceived"] = "lineWarehouseLocationReceived";
     /* Invoice_check rubric */
     /* Service Overview Tab*/
@@ -14010,7 +14012,8 @@ class TransactionService extends PendingReasonService {
                 detail.warehouseNr = line.warehouseNumber;
                 detail.locationNr = line.locationNr;
                 detail.batchNr = line.batchNr;
-                detail.numberOfStickers = line.stickerAmount;
+                detail.numberOfColli = line.chosenPackageAmount;
+                //detail.numberOfStickers = line.stickerAmount;
                 detail.printerName = line.printerName;
                 detail.reportId = line.reportId;
                 receivedGoodsRequest.purchaseOrderLineReceiptDetailsDTOS.push(detail);
@@ -14042,7 +14045,8 @@ class TransactionService extends PendingReasonService {
                     detail.warehouseNr = line.warehouseNumber;
                     detail.locationNr = line.locationNr;
                     detail.batchNr = line.batchNr;
-                    detail.numberOfStickers = line.stickerAmount;
+                    detail.numberOfColli = line.chosenPackageAmount;
+                    //detail.numberOfStickers = line.stickerAmount;
                     detail.printerName = line.printerName;
                     detail.reportId = line.reportId;
                     receivedGoodsRequest.purchaseOrderLineReceiptDetailsDTOS.push(detail);
@@ -20553,6 +20557,9 @@ class TransactionQuickAccessReceivedGoodsComponent extends TransactionQuickAcces
     handleSelectAllLines(value) {
         this.transactionEventService.selectAllPurchaseOrderLinesForReceiveGoods.next(value);
     }
+    handleNoColliStickers(value) {
+        this.transactionEventService.setColliStickerAmount.next(value);
+    }
     handleGlobalLocationChange(location) {
         this.globalWarehouseLocation = location;
         this.transactionLines
@@ -20641,46 +20648,45 @@ TransactionQuickAccessReceivedGoodsComponent.decorators = [
                 selector: "co-transaction-quick-access-received-goods",
                 template: `
     <div class="quick-access-wrapper" *ngIf="!hideQuickAccessContent">
-      <div class="sub-section">
-        <div class="sub-section-input">
+      <div class="sub-section-input">
+        <div class="sub-section">
           <co-input-date
             [placeholder]="'RECEIVED_DATE' | localize"
             [(model)]="commitDate"
           ></co-input-date>
+          <co-input-text
+            [placeholder]="'PACKING_SLIP' | localize"
+            [(model)]="packingSlipNr"
+          ></co-input-text>
+          <!--
+                <co-transaction-labeled-warehouse-location-button *ngIf="internalParamMLocat && showWarehouseLocationButton"
+                  [locationNr]="globalWarehouseLocation"
+                  [warehouseNumber]="warehouseNumber"
+                  (locationNrChange)="handleGlobalLocationChange($event)"
+                ></co-transaction-labeled-warehouse-location-button>
+          -->
+          <co-quick-send-button
+            [showSendMethodIcon]="false"
+            [icon]="icons.CheckDuotone"
+            [showLoader]="showProcessingLoader"
+            [title]="'PROCESS'"
+            (sendIconClicked)="handleCommitEvent()"
+            (openSendMethodDialog)="showSendMethodDialog = true"
+          ></co-quick-send-button>
+        </div>
+        <div class="sub-section">
           <co-input-checkbox
             class="checkbox-wrapper"
             [label]="'SELECT_ALL' | localize"
             [(model)]="localCheckboxState"
             (modelChange)="handleSelectAllLines($event)"
           ></co-input-checkbox>
-        </div>
-        <div class="sub-section-input">
-          <co-input-text
-            [placeholder]="'PACKING_SLIP' | localize"
-            [(model)]="packingSlipNr"
-          ></co-input-text>
           <co-input-checkbox
             class="checkbox-wrapper"
             [label]="'NO_PACKAGE_STICKERS' | localize"
             [(model)]="colliCheckboxState"
-            (modelChange)="handleSelectAllLines($event)"
+            (modelChange)="handleNoColliStickers($event)"
           ></co-input-checkbox>
-        </div>
-  <!--
-        <co-transaction-labeled-warehouse-location-button *ngIf="internalParamMLocat && showWarehouseLocationButton"
-          [locationNr]="globalWarehouseLocation"
-          [warehouseNumber]="warehouseNumber"
-          (locationNrChange)="handleGlobalLocationChange($event)"
-        ></co-transaction-labeled-warehouse-location-button>
-  -->
-        <co-quick-send-button
-          [showSendMethodIcon]="false"
-          [icon]="icons.CheckDuotone"
-          [showLoader]="showProcessingLoader"
-          [title]="'PROCESS'"
-          (sendIconClicked)="handleCommitEvent()"
-          (openSendMethodDialog)="showSendMethodDialog = true"
-        ></co-quick-send-button>
       </div>
     </div>
     <co-send-method-dialog *ngIf="showSendMethodDialog"
@@ -22023,6 +22029,14 @@ class TransactionReceiveGoodsLineBaseComponent extends TransactionLineBaseCompon
         this._subscriptions.push(this.transactionEventService.selectAllPurchaseOrderLinesForReceiveGoods.subscribe((value) => {
             this.selected = value && this.showCheckboxForLine;
             this.detectChanges();
+        }), this.transactionEventService.setColliStickerAmount.subscribe((value) => {
+            if (value) {
+                this.transactionLine.stickerAmount = 0;
+            }
+            else {
+                this.calcStickerAmount();
+            }
+            this.detectChanges();
         }), this.transactionEventService.transactionLineChanged.subscribe((transLine) => {
             if (transLine.lineNr === this.transactionLine.lineNr) {
                 this._handleTransactionLineSet(transLine);
@@ -22037,7 +22051,22 @@ class TransactionReceiveGoodsLineBaseComponent extends TransactionLineBaseCompon
         if (this.transactionLine.articleLineStatus) {
             this.transactionLine.articleLineStatus.quantityToReceive = amount;
         }
-        this.transactionLine.stickerAmount = amount * (this.transactionLine.productItemsAmount ? this.transactionLine.productItemsAmount : 1);
+        this.calcStickerAmount();
+    }
+    calcStickerAmount() {
+        if (this.transactionLine) {
+            let collie = this.transactionLine.chosenPackageAmount ? this.transactionLine.chosenPackageAmount : 1;
+            let receive = (this.transactionLine.articleLineStatus && this.transactionLine.articleLineStatus.quantityToReceive) ? this.transactionLine.articleLineStatus.quantityToReceive : 1;
+            if (this.transactionLine.purchasePackageCode === 'B' || this.transactionLine.purchasePackageCode === 'E') {
+                this.transactionLine.stickerAmount = Math.ceil(collie * receive);
+            }
+            else if (this.transactionLine.purchasePackageCode === 'R') {
+                this.transactionLine.stickerAmount = Math.ceil(collie);
+            }
+            else {
+                this.transactionLine.stickerAmount = 0;
+            }
+        }
     }
     transactionLineSet() {
         super.transactionLineSet();
@@ -22048,7 +22077,8 @@ class TransactionReceiveGoodsLineBaseComponent extends TransactionLineBaseCompon
         this.warehouseLocationButtonDisabled = transLine.articleLineStatus.quantityReceived === transLine.amount ||
             !transLine.isLocationRequired || transLine.isBatchNrRequired || transLine.isSerialNrRequired || this.transactionService.internalParameterReceiveGoodsWithDataTerminal;
         this.showCheckboxForLine = transLine.articleLineStatus.quantityReceived !== transLine.amount || transLine.articleLineStatus.quantityToReceive > 0;
-        this.transactionLine.stickerAmount = transLine.articleLineStatus.quantityToReceive * (transLine.productItemsAmount ? transLine.productItemsAmount : 1);
+        this.transactionLine.chosenPackageAmount = transLine.packagesAmountForTransport;
+        this.calcStickerAmount();
         this.detectChanges();
     }
 }
@@ -22059,6 +22089,7 @@ TransactionReceiveGoodsLineBaseComponent.decorators = [
 class TransactionReceiveGoodsLineComponent extends TransactionReceiveGoodsLineBaseComponent {
     constructor() {
         super(...arguments);
+        this.cfgNames = TransactionCfgName;
         this.statusBarConfigNames = {
             statusBarIB: this.cfgNames.StatusBarIB,
             statusBarNT: this.cfgNames.StatusBarNT,
@@ -22070,6 +22101,17 @@ class TransactionReceiveGoodsLineComponent extends TransactionReceiveGoodsLineBa
     showClass() {
         return true;
     }
+    changeNrPackagesNotAllowed() {
+        if (!this.transactionLine) {
+            return true;
+        }
+        else if (this.transactionLine.purchasePackageCode === 'E' || this.transactionLine.purchasePackageCode === 'G') {
+            return true;
+        }
+        else {
+            return false;
+        }
+    }
 }
 TransactionReceiveGoodsLineComponent.decorators = [
     { type: Component, args: [{
@@ -22136,11 +22178,20 @@ TransactionReceiveGoodsLineComponent.decorators = [
                               ></co-input-text>
                           </div>
                       </div>
-                      <co-transaction-print-package-sticker
-                        class="transaction-field-wrapper medium"
-                        [screenConfigurationObject]="cfgNames.StickerAmount"
-                        [inputLabel]="true"
-                      ></co-transaction-print-package-sticker>
+                      <div class="transaction-field-wrapper">
+                         <div class="inside-field">
+                            <co-transaction-line-label [insideLabel]="'NUMBER_PACKAGES'"></co-transaction-line-label>
+                            <co-input-number-picker class="amount-number-picker"
+                                                    [(model)]="transactionLine.chosenPackageAmount"
+                                                    [screenConfigurationObject]="cfgNames.CollieAmount"
+                                                    [decimals]="decimals"
+                                                    [min]="1"
+                                                    [forceReadonly] = "readonly || changeNrPackagesNotAllowed() || lineQuantityReceived === transactionLine.amount"
+                                                    (modelChange)="calcStickerAmount()">
+                            </co-input-number-picker>
+                           <!-- [screenConfigurationObject]="cfgNames.LineQuantityToReceive"-->
+                         </div>
+                      </div>
                       <div class="transaction-field-wrapper">
                           <div class="inside-field">
                               <co-transaction-line-label [insideLabel]="'QUANTITY_TO_RECEIVE'"></co-transaction-line-label>
@@ -22150,7 +22201,6 @@ TransactionReceiveGoodsLineComponent.decorators = [
                                                       [decimals]="decimals"
                                                       [min]="1"
                                                       [max]="transactionLine.amount - lineQuantityReceived"
-                                                      [leftIconData]="iconCacheService.getIcon(icons.CartFlatbedBoxesRegular)"
                                                       [readonly]="readonly || lineQuantityReceived === transactionLine.amount"
                                                       (modelChange)="changeLineAmount($event)">
                               </co-input-number-picker>
@@ -22159,8 +22209,10 @@ TransactionReceiveGoodsLineComponent.decorators = [
                       <div class="transaction-field-wrapper">
                           <div class="inside-field">
                               <co-transaction-print-package-sticker
+                                  [forceReadonly]="true"
                                   [screenConfigurationObject]="cfgNames.StickerAmount"
                                   [inputLabel]="true"
+                                  [stickerAmount]="transactionLine.stickerAmount"
                               ></co-transaction-print-package-sticker>
                           </div>
                       </div>
@@ -35496,8 +35548,8 @@ class TransactionPrintPackageStickerComponent extends TransactionQuickAccessSend
         super(...arguments);
         this.icons = Icon;
         this.inputLabel = false;
-        // todo: check this component
-        this.tempModel = 0;
+        this.forceReadonly = false;
+        this.stickerAmount = 0;
         this.reportDocumentEmailRequest = new ReportingDocumentEmailSignDocBaseRequest();
         this.reportDocumentPrintRequest = new ReportingDocumentPrintSignDocBaseRequest();
         this.reportDocumentPdfRequest = new ReportingDocumentPdfBaseRequest();
@@ -35506,9 +35558,9 @@ class TransactionPrintPackageStickerComponent extends TransactionQuickAccessSend
         return true;
     }
     handleShowDialog() {
-        // if (this.lineQuantityToReceive) {
-        this.showSendMethodDialog = true;
-        // }
+        if (this.stickerAmount > 0) {
+            this.showSendMethodDialog = true;
+        }
     }
     emailDocument(request) {
         return;
@@ -35541,9 +35593,9 @@ TransactionPrintPackageStickerComponent.decorators = [
       <co-transaction-line-label *ngIf="inputLabel" [insideLabel]="'STICKER_AMOUNT'"></co-transaction-line-label>
       <co-input-number-picker
         [hidden]="hidden"
-        [(model)]="tempModel"
-        [disabled]="readonly"
-        [readonly]="readonly"
+        [model]="stickerAmount"
+        [disabled]="readonly || forceReadonly"
+        [readonly]="readonly || forceReadonly"
         [min]="0"
         [leftIconData]="iconCacheService.getIcon(icons.SharpRegularBarcodeReadTag)"
         (iconClick)="handleShowDialog()">
@@ -35575,6 +35627,8 @@ TransactionPrintPackageStickerComponent.decorators = [
 ];
 TransactionPrintPackageStickerComponent.propDecorators = {
     inputLabel: [{ type: Input }],
+    forceReadonly: [{ type: Input }],
+    stickerAmount: [{ type: Input }],
     showClass: [{ type: HostBinding, args: ["class.co-transaction-print-package-sticker",] }]
 };
 
@@ -37395,6 +37449,7 @@ class TransactionLinePurchaseReceiveGoodsComponent extends TransactionLineBaseCo
         this.goodsReceiptHistory = [];
         this.returnStockMode = false;
         this.availableStockCollection = [];
+        this.warehouseLocationButtonDisabled = false;
         this._subs = [];
     }
     showClass() {
@@ -37489,6 +37544,32 @@ class TransactionLinePurchaseReceiveGoodsComponent extends TransactionLineBaseCo
         this.receiptDetails.batchNr = availableStock.batchNumber;
         this.receiptDetails.lineNr = this.transactionLine.lineNr;
     }
+    calcStickerAmount() {
+        if (this.transactionLine) {
+            let collie = this.transactionLine.chosenPackageAmount ? this.transactionLine.chosenPackageAmount : 1;
+            let receive = this.transactionLine.quantityToReceive ? this.transactionLine.quantityToReceive : 1;
+            if (this.transactionLine.purchasePackageCode === 'B' || this.transactionLine.purchasePackageCode === 'E') {
+                this.transactionLine.stickerAmount = Math.ceil(collie * receive);
+            }
+            else if (this.transactionLine.purchasePackageCode === 'R') {
+                this.transactionLine.stickerAmount = Math.ceil(collie);
+            }
+            else {
+                this.transactionLine.stickerAmount = 0;
+            }
+        }
+    }
+    changeNrPackagesNotAllowed() {
+        if (!this.transactionLine) {
+            return true;
+        }
+        else if (this.transactionLine.purchasePackageCode === 'E' || this.transactionLine.purchasePackageCode === 'G') {
+            return true;
+        }
+        else {
+            return false;
+        }
+    }
     transactionLineSet() {
         super.transactionLineSet();
         this._handleTransactionLineSet(this.transactionLine);
@@ -37501,6 +37582,8 @@ class TransactionLinePurchaseReceiveGoodsComponent extends TransactionLineBaseCo
         this.returnStockMode = this.transactionLine.amount < 0;
         this.receiptDetails.batchNr = this.transactionLine.batchNr;
         this.getGoodsReceiptHistory();
+        this.warehouseLocationButtonDisabled = transLine.articleLineStatus.quantityReceived === transLine.amount ||
+            !transLine.isLocationRequired || transLine.isBatchNrRequired || transLine.isSerialNrRequired || this.transactionService.internalParameterReceiveGoodsWithDataTerminal;
     }
     _getAvailableStock() {
         return __awaiter(this, void 0, void 0, function* () {
@@ -37524,15 +37607,37 @@ TransactionLinePurchaseReceiveGoodsComponent.decorators = [
             </div>
         </div-->
         <div class="side-panel-input-row">
-          <co-input-number-picker class="side-panel-input"
-                                  [max]="returnStockMode ? returnMaxToReceive : lineQuantityToReceive"
+          <co-input-number-picker class="side-panel-input"[label]="'QUANTITY_TO_RECEIVE' | localize" [showPermanentLabel]="true"
+                                  [max]="returnStockMode ? returnMaxToReceive : lineQuantityToReceive"  [screenConfigurationObject]="cfgNames.LineQuantityToReceive"
                                   [(model)]="receiptDetails.serialNr ? 1 : receiptDetails.quantityToReceive"
                                   [decimals]="2"
                                   [min]="0"
                                   [readonly]="!!receiptDetails.serialNr || receiptDetails.quantityToReceive === 0 || !receiptDetails.quantityToReceive || readonly"
                                   [disabled]="!!receiptDetails.serialNr || receiptDetails.quantityToReceive === 0 || !receiptDetails.quantityToReceive"
                                   [required]="true"
+                                  (modelChange)="calcStickerAmount()"
+          ></co-input-number-picker>
+          <co-input-number-picker class="side-panel-input"  [label]="'NUMBER_PACKAGES' | localize" [showPermanentLabel]="true"
+                                  [max]="returnStockMode ? returnMaxToReceive : lineQuantityToReceive"   [screenConfigurationObject]="cfgNames.CollieAmount"
+                                  [(model)]="transactionLine.chosenPackageAmount"
+                                  [decimals]="2"
+                                  [min]="0"
+                                  [forceReadonly]="!!receiptDetails.serialNr || receiptDetails.quantityToReceive === 0 || !receiptDetails.quantityToReceive || readonly || changeNrPackagesNotAllowed()"
+                                  [disabled]="!!receiptDetails.serialNr || receiptDetails.quantityToReceive === 0 || !receiptDetails.quantityToReceive || readonly || changeNrPackagesNotAllowed()"
+                                  [required]="true"
+                                  (modelChange)="calcStickerAmount()"
+          ></co-input-number-picker>
+          <co-input-number-picker class="side-panel-input" [label]="'STICKER_AMOUNT' | localize" [showPermanentLabel]="true"
+                                  [max]="returnStockMode ? returnMaxToReceive : lineQuantityToReceive"  [screenConfigurationObject]="cfgNames.StickerAmount"
+                                  [(model)]="transactionLine.stickerAmount"
+                                  [decimals]="2"
+                                  [min]="0"
+                                  [readonly]="true"
+                                  [disabled]="true"
+                                  [required]="true"
           ></co-input-number-picker>
+        </div>
+        <div class="side-panel-input-row">
           <co-input-date class="side-panel-input"
                          [placeholder]="'RECEIVED_DATE' | localize"
                          [(model)]="request.receivedDate"
@@ -37547,6 +37652,17 @@ TransactionLinePurchaseReceiveGoodsComponent.decorators = [
           ></co-input-text>
         </div>
         <div class="side-panel-input-row">
+          <co-transaction-line-warehouse-button class="warehouse-buttons"
+            [screenConfigurationObject]="cfgNames.LineWarehouse"
+            [inputLabel]="true" [screenConfigurationObject]="cfgNames.LineWarehouse"
+
+          ></co-transaction-line-warehouse-button>
+          <co-transaction-line-warehouse-location-button class="warehouse-buttons"
+            [screenConfigurationObject]="cfgNames.LineWarehouseLocationReceived"
+            [readonly]="warehouseLocationButtonDisabled"
+            [inputLabel]="true" [screenConfigurationObject]="cfgNames.LineWarehouseLocationReceived"
+          ></co-transaction-line-warehouse-location-button>
+        </div>
 <!-- dit ding werkt helemaal niet
           <co-transaction-labeled-warehouse-location-button class="side-panel-input" *ngIf="transactionLine.isLocationRequired"
                          [readonly]="returnStockMode || receiptDetails.quantityToReceive === 0"
@@ -37555,6 +37671,7 @@ TransactionLinePurchaseReceiveGoodsComponent.decorators = [
                          (locationNrChange)="receiptDetails.locationNr = $event"
           ></co-transaction-labeled-warehouse-location-button>
 -->
+        <div class="side-panel-input-row">
           <co-input-text class="side-panel-input" [(model)]="receiptDetails.batchNr" *ngIf="transactionLine.isBatchNrRequired"
                          [hideArrowButtons]="true"
                          [readonly]="readonly || returnStockMode"
@@ -37575,6 +37692,7 @@ TransactionLinePurchaseReceiveGoodsComponent.decorators = [
         <co-button
           [iconData]="iconCacheService.getIcon(icons.CheckDuotone)"
           (click)="handleSaveDetailsEdit()"
+          [disabled]="!!receiptDetails.serialNr || receiptDetails.quantityToReceive === 0 || !receiptDetails.quantityToReceive || readonly"
         ></co-button>
         <co-button class="cancel-button"
                    [iconData]="iconCacheService.getIcon(icons.Crossskinny)"
@@ -37740,7 +37858,11 @@ TransactionLinePurchaseReceiveGoodsModule.decorators = [
                     TransactionReceivingGoodsHistoryModule,
                     TransactionAvailableStockGridModule,
                     ButtonModule,
-                    TransactionLabeledWarehouseLocationButtonModule
+                    TransactionLabeledWarehouseLocationButtonModule,
+                    TransactionLineLabelModule,
+                    ScreenConfigurationModule,
+                    TransactionLineWarehouseButtonModule,
+                    TransactionPrintPackageStickerModule
                 ],
                 declarations: [
                     TransactionLinePurchaseReceiveGoodsComponent
@@ -53001,7 +53123,7 @@ class TransactionHeaderPopupPaymentComponent extends TransactionHeaderPopupBaseC
         return this.transactionLines.some(line => line.directSell && line.dropShipment);
     }
     showInvoiceSelection() {
-        return this.orderPaymentAnalysis.filter(payment => payment.transactionKind === this.transKind.SalesInvoice && payment.outstandingAmount > 0).length > 1;
+        return this.orderPaymentAnalysis.filter(payment => payment.transactionKind === this.transKind.SalesInvoice && payment.outstandingAmount !== 0).length > 1;
     }
     handleSelectInvoiceLines(paymentInfo) {
         this.orderPaymentAnalysis.forEach(invoice => invoice.isSelected = false);
@@ -53227,7 +53349,7 @@ TransactionHeaderPopupPaymentComponent.decorators = [
                       <tr *ngFor="let paymentInfo of orderPaymentAnalysis">
                           <td class="left" *ngIf="showInvoiceSelection()">
                               <co-input-radio-button
-                                      *ngIf="paymentInfo.transactionKind === transKind.SalesInvoice && paymentInfo.outstandingAmount > 0"
+                                      *ngIf="paymentInfo.transactionKind === transKind.SalesInvoice && paymentInfo.outstandingAmount !== 0"
                                       class="default-width"
                                       [(model)]="paymentInfo.isSelected"
                                       (modelChange)="handleSelectInvoiceLines(paymentInfo)">