@colijnit/transaction 261.20.44 → 261.20.45

package/fesm2022/colijnit-transaction.mjs

@@ -354,8 +354,8 @@ import { DateField } from '@colijnit/ioneconnector/build/factory/decorators/date
 class Version {
     name = "@colijnit/transaction";
     description = "Colijn IT transaction package";
-    symVer = "261.20.44";
-    publishDate = "29-5-2026, 15:17:14";
+    symVer = "261.20.45";
+    publishDate = "03/06/2026, 08:47:45";
 }
 
 class CheckoutModuleService extends BaseModuleService {
@@ -24549,7 +24549,10 @@ class DeliveryPlanningOverviewTileComponent {
         }
     }
     async handleAvailabilityChecked(planOrder) {
-        this.availabilityChecked.emit({ transportDay: this.transportDay, available: this.transportDay.availableOnDate && await this.deliveryMethodAvailabilityCheck(planOrder) && await this.districtAvailabilityCheck(planOrder) });
+        let available = this.transportDay.availableOnDate;
+        available = await this.districtAvailabilityCheck(planOrder);
+        available = await this.deliveryMethodAvailabilityCheck(planOrder);
+        this.availabilityChecked.emit({ transportDay: this.transportDay, available: available });
     }
     async getOrderLinesPlanned(planOrder) {
         let request = new OrderLinesPlannedRequest();
@@ -25857,15 +25860,16 @@ class DeliveryPlanningOverviewComponent {
         this.resetPlanningTransportEvent.emit();
     }
     async handleDeleteOrder(deleteResult, planningTransportWeek) {
-        const oldWeek = [];
-        planningTransportWeek.forEach(val => oldWeek.push(Object.assign({}, val)));
+        const oldWeek = structuredClone(planningTransportWeek);
+        const oldWeekTransportId = parseInt(oldWeek[oldWeek.length - 1].toString());
         let order = deleteResult.order;
         if (order) {
-            if (deleteResult.order.lines.length > 0) {
+            if (deleteResult.order.lines.length > 0 || deleteResult.order.tasks?.length > 0) {
                 this.deliveryPlanningService.deletingOrder = order;
                 deleteResult.transport.plannedOrders.splice(deleteResult.transport.plannedOrders.indexOf(order), 1);
                 this.updatePlanningTransportEvent.emit({
                     oldWeek: oldWeek,
+                    oldWeekTransportId: oldWeekTransportId,
                     week: planningTransportWeek,
                     action: DeliveryPlanningUpdateActions.DeletePlannedOrder
                 });
@@ -25876,7 +25880,8 @@ class DeliveryPlanningOverviewComponent {
         }
     }
     handleDeleteLine(deleteResult, weekDay, transportWeekRow) {
-        let oldWeek = transportWeekRow;
+        let oldWeek = structuredClone(transportWeekRow);
+        const oldWeekTransportId = parseInt(oldWeek[oldWeek.length - 1].toString());
         let order = weekDay.plannedOrders.find(order => order.transId === deleteResult.order.transId);
         order.lines = order.lines.filter(line => line.originalLineNr !== deleteResult.line.originalLineNr);
         if (order.lines.length === 0) {
@@ -25885,6 +25890,7 @@ class DeliveryPlanningOverviewComponent {
         this.deliveryPlanningService.deletingOrder = order;
         this.updatePlanningTransportEvent.emit({
             oldWeek: oldWeek,
+            oldWeekTransportId: oldWeekTransportId,
             week: transportWeekRow,
             action: DeliveryPlanningUpdateActions.DeletePlannedLines
         });
@@ -25914,8 +25920,8 @@ class DeliveryPlanningOverviewComponent {
         transportDay.ordersLoaded = true;
     }
     async planOrderLines(order, transportDay, week) {
-        const oldWeek = [];
-        week.forEach(val => oldWeek.push(Object.assign({}, val)));
+        let oldWeek = structuredClone(week);
+        const oldWeekTransportId = parseInt(oldWeek[oldWeek.length - 1].toString());
         if (order.lines?.length > 0) {
             order.linesLoaded = true;
             order.tasks = [];
@@ -25952,6 +25958,7 @@ class DeliveryPlanningOverviewComponent {
             }
             this.updatePlanningTransportEvent.emit({
                 oldWeek: oldWeek,
+                oldWeekTransportId: oldWeekTransportId,
                 week: week,
                 action: DeliveryPlanningUpdateActions.PlanLines
             });
@@ -26024,10 +26031,12 @@ class DeliveryPlanningOverviewComponent {
     }
     async handleSettingsSaved() {
         const week = this.planTransportWeekArr.find((week) => week.some((weekDay) => weekDay === this.selectedTransportDay));
+        const oldWeekTransportId = parseInt(week[week.length - 1].toString());
         if (week) {
             await new Promise((resolve) => {
                 this.updatePlanningTransportEvent.emit({
                     oldWeek: week,
+                    oldWeekTransportId: oldWeekTransportId,
                     week: week,
                     action: DeliveryPlanningUpdateActions.DeleteOrderReplan,
                     resolve: () => {
@@ -26108,16 +26117,18 @@ class DeliveryPlanningOverviewComponent {
         return transport && !transport.available;
     }
     handleTimeChangeEvent(transportDay, week, obj) {
-        let oldWeek = week;
+        let oldWeek = structuredClone(week);
+        const oldWeekTransportId = parseInt(oldWeek[oldWeek.length - 1].toString());
         let order = transportDay.plannedOrders.find(planOrder => planOrder.transId === obj.transId);
         order.startTime = new Date(obj['startTime']);
         order.endTime = new Date(obj['endTime']);
-        this.updatePlanningTransportEvent.emit({ oldWeek: oldWeek, week: week, action: this.planningActions.PlanOrder });
+        this.updatePlanningTransportEvent.emit({ oldWeek: oldWeek, oldWeekTransportId: oldWeekTransportId, week: week, action: this.planningActions.PlanOrder });
     }
     async handleMoveEvent(moveData, transport, week, weekArr) {
         let planOrder = await this._transactionCon.getPlanOrder(moveData.scheduledObject['id']);
         let oldWeekWithOrder = [];
         let weekWithOrder = [];
+        const oldWeekTransportId = parseInt(oldWeekWithOrder[oldWeekWithOrder.length - 1].toString());
         //remove from old transport
         weekArr.forEach(((row) => {
             row.forEach((weekDay) => {
@@ -26135,6 +26146,7 @@ class DeliveryPlanningOverviewComponent {
         this.deliveryPlanningService.deletingOrder = planOrder;
         this.updatePlanningTransportEvent.emit({
             oldWeek: oldWeekWithOrder,
+            oldWeekTransportId: oldWeekTransportId,
             week: weekWithOrder,
             action: DeliveryPlanningUpdateActions.DeletePlannedOrder
         });
@@ -26159,13 +26171,15 @@ class DeliveryPlanningOverviewComponent {
     }
     handleMoveOrderUp(planOrder, planningTransportWeek, transportDay) {
         const oldWeek = structuredClone(planningTransportWeek);
+        const oldWeekTransportId = parseInt(oldWeek[oldWeek.length - 1].toString());
         this.deliveryPlanningService.reorderItem(transportDay.plannedOrders, planOrder, 'up');
-        this.updatePlanningTransportEvent.emit({ oldWeek: oldWeek, week: planningTransportWeek, action: DeliveryPlanningUpdateActions.PlanOrder });
+        this.updatePlanningTransportEvent.emit({ oldWeek: oldWeek, oldWeekTransportId: oldWeekTransportId, week: planningTransportWeek, action: DeliveryPlanningUpdateActions.PlanOrder });
     }
     handleMoveOrderDown(planOrder, planningTransportWeek, transportDay) {
         const oldWeek = structuredClone(planningTransportWeek);
+        const oldWeekTransportId = parseInt(oldWeek[oldWeek.length - 1].toString());
         this.deliveryPlanningService.reorderItem(transportDay.plannedOrders, planOrder, 'down');
-        this.updatePlanningTransportEvent.emit({ oldWeek: oldWeek, week: planningTransportWeek, action: DeliveryPlanningUpdateActions.PlanOrder });
+        this.updatePlanningTransportEvent.emit({ oldWeek: oldWeek, oldWeekTransportId: oldWeekTransportId, week: planningTransportWeek, action: DeliveryPlanningUpdateActions.PlanOrder });
     }
     selectTransportDay(transportDay) {
         transportDay.selected = !transportDay.selected;
@@ -26226,6 +26240,7 @@ class DeliveryPlanningOverviewComponent {
             return;
         }
         const oldWeek = structuredClone(planningTransportWeek);
+        const oldWeekTransportId = parseInt(oldWeek[oldWeek.length - 1].toString());
         const orders = transportDay.plannedOrders;
         const fromIndex = orders.findIndex((o) => o.transId === event.transId);
         if (fromIndex === -1) {
@@ -26252,6 +26267,7 @@ class DeliveryPlanningOverviewComponent {
         this.deliveryPlanningService.dragging = false;
         this.updatePlanningTransportEvent.emit({
             oldWeek: oldWeek,
+            oldWeekTransportId: oldWeekTransportId,
             week: planningTransportWeek,
             action: DeliveryPlanningUpdateActions.PlanOrder
         });
@@ -26443,6 +26459,7 @@ class DeliveryPlanningMainComponent {
     _transaction;
     _transactionEventService;
     _changeDetector;
+    _promptService;
     _subs = [];
     planning;
     hasLoaded = false;
@@ -26462,13 +26479,14 @@ class DeliveryPlanningMainComponent {
     showClass() {
         return true;
     }
-    constructor(_deliveryPlanningService, _viewModeService, _transactionConn, _transaction, _transactionEventService, _changeDetector) {
+    constructor(_deliveryPlanningService, _viewModeService, _transactionConn, _transaction, _transactionEventService, _changeDetector, _promptService) {
         this._deliveryPlanningService = _deliveryPlanningService;
         this._viewModeService = _viewModeService;
         this._transactionConn = _transactionConn;
         this._transaction = _transaction;
         this._transactionEventService = _transactionEventService;
         this._changeDetector = _changeDetector;
+        this._promptService = _promptService;
     }
     async ngOnInit() {
         this._viewModeService.onSearchViewResizeClick();
@@ -26490,7 +26508,18 @@ class DeliveryPlanningMainComponent {
     }
     async updatePlanTransportWeek(updateData) {
         let result = this._deliveryPlanningService.convertToPlanTransportWeek(this._deliveryPlanningService.planTransportWeekArr);
-        let week = result.find((week) => week['transportId'] === updateData.week[updateData.week.length - 1]);
+        let week;
+        if (this._deliveryPlanningService.currentPlanningMode === DeliveryPlanningModes.Transaction && this._deliveryPlanningService.viewMode === DeliveryPlanningViewModes.Sidebar) {
+            const weekInArr = result.find((planTransportWeek) => planTransportWeek.transportId === updateData.oldWeekTransportId);
+            if (!weekInArr) {
+                await this._promptService.showError("COULD_NOT_FIND_CORRESPONDING_WEEK");
+                return;
+            }
+            week = weekInArr;
+        }
+        else {
+            week = result.find((week) => week.transportId === updateData.week[updateData.week.length - 1]);
+        }
         if (week) {
             let updateResult = await this._transactionConn.updatePlanTransportWeek(week);
             if (updateResult) {
@@ -26498,8 +26527,8 @@ class DeliveryPlanningMainComponent {
                     this._deliveryPlanningService.deletingOrder.dateResetNeeded = true;
                     await this._transactionConn.restoreDeliverySettings([this._deliveryPlanningService.deletingOrder]);
                 }
-                await this._transaction.commit();
                 if (this._transaction.currentTransaction.transactionInfo.id) {
+                    await this._transaction.commit();
                     await this._transaction.getTransactionById(this._transaction.currentTransaction?.transactionInfo?.id);
                     this._transaction.currentPlanOrder = await this._transaction.getPlanOrder(this._transaction.currentTransaction.transactionInfo.id);
                 }
@@ -26555,7 +26584,7 @@ class DeliveryPlanningMainComponent {
         this._deliveryPlanningService.plannings = await this._transactionConn.getPlanningSources();
         this._deliveryPlanningService.currentPlanning = this._deliveryPlanningService.plannings[0];
     }
-    static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.3.16", ngImport: i0, type: DeliveryPlanningMainComponent, deps: [{ token: DeliveryPlanningService }, { token: SearchViewModeService }, { token: TransactionConnectorService }, { token: TransactionService }, { token: TransactionEventService }, { token: i0.ChangeDetectorRef }], target: i0.ɵɵFactoryTarget.Component });
+    static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.3.16", ngImport: i0, type: DeliveryPlanningMainComponent, deps: [{ token: DeliveryPlanningService }, { token: SearchViewModeService }, { token: TransactionConnectorService }, { token: TransactionService }, { token: TransactionEventService }, { token: i0.ChangeDetectorRef }, { token: i1$1.PromptService }], target: i0.ɵɵFactoryTarget.Component });
     static ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "14.0.0", version: "20.3.16", type: DeliveryPlanningMainComponent, isStandalone: false, selector: "co-delivery-planning-main", outputs: { fullscreenEvent: "fullscreenEvent" }, host: { properties: { "class.co-delivery-planning-main": "this.showClass" } }, ngImport: i0, template: `
       <div class="wrapper row">
 
@@ -26606,7 +26635,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.16", ngImpo
                     encapsulation: ViewEncapsulation.None,
                     standalone: false
                 }]
-        }], ctorParameters: () => [{ type: DeliveryPlanningService }, { type: SearchViewModeService }, { type: TransactionConnectorService }, { type: TransactionService }, { type: TransactionEventService }, { type: i0.ChangeDetectorRef }], propDecorators: { fullscreenEvent: [{
+        }], ctorParameters: () => [{ type: DeliveryPlanningService }, { type: SearchViewModeService }, { type: TransactionConnectorService }, { type: TransactionService }, { type: TransactionEventService }, { type: i0.ChangeDetectorRef }, { type: i1$1.PromptService }], propDecorators: { fullscreenEvent: [{
                 type: Output
             }], showClass: [{
                 type: HostBinding,
@@ -34495,6 +34524,7 @@ class TransactionPaymentService {
     voucher;
     details;
     paymentDate = new Date();
+    showPaymentMethodMessage = false;
     set currentPaymentMethod(value) {
         this._currentPaymentMethod = value;
         this.statusMessage = '';
@@ -34558,6 +34588,10 @@ class TransactionPaymentService {
         if (this.amountToPay === 0) {
             this._handlePayment();
         }
+        if (!this.currentPaymentMethod) {
+            this.showPaymentMethodMessage = true;
+            return;
+        }
         this.statusMessage = '';
         this.cancelUrl = '';
         const request = new DoPaymentRequest();
@@ -34630,6 +34664,7 @@ class TransactionPaymentService {
                 }
             });
         }
+        this.showPaymentMethodMessage = false;
     }
     cancelPayment() {
         if (this.cancelUrl) {
@@ -35412,202 +35447,210 @@ class PaymentComponent extends TransactionPaymentBaseComponent {
     static ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "17.0.0", version: "20.3.16", type: PaymentComponent, isStandalone: false, selector: "co-payment", host: { properties: { "class.co-payment": "this.showClass" } }, providers: [
             TransactionPaymentService
         ], usesInheritance: true, ngImport: i0, template: `
-      <div class="payment-wrapper">
-        <div class="payment-methods-register-wrapper">
-          <div class="payment-cash-register-wrapper" >
-            <div class="payment-cash-register-header">
-              <span class="payment-header-title" [textContent]="'SELECT_CASH_REGISTER' | localize"></span>
-            </div>
-            <div class="payment-methods">
-              @for (cashRegister of cashRegisters; track cashRegister; let index = $index) {
-                <co-payment-tile
-                  [icon]="cashRegister.icon"
-                  [description]="cashRegister.description"
-                  [selected]="cashRegisterIdx === index"
-                  (selectedChange)="cashRegisterSelected(cashRegister, index)"
-                ></co-payment-tile>
-              }
-            </div>
-          </div>
-          <div class="payment-methods-wrapper">
-            <div class="payment-methods-header">
-              <span class="payment-header-title" [textContent]="'SELECT' | localize"></span>
-              <span class="payment-header-title" [textContent]="'PAYMENT_METHOD' | localize:false"></span>
-            </div>
-            <div class="payment-methods co-small-scrollbar">
-              @if (showLoader) {
-                <co-loader class="loader"></co-loader>
-              }
-              @if (!showLoader) {
-                @for (paymentMethod of paymentMethods; track paymentMethod; let index = $index) {
-                  <co-payment-tile
-                    [image]="paymentMethod.image"
-                    [description]="paymentMethod.payment.description"
-                    [selected]="paymentMethodIdx === index"
-                    (selectedChange)="paymentMethodSelected(paymentMethod.payment, index)"
-                  ></co-payment-tile>
-                }
-              }
-            </div>
-          </div>
-        </div>
-        <div class="payment-to-pay-wrapper">
-          <div class="payment-to-pay-total">
-            <div class="payment-to-pay-header">
-              <span class="payment-header-title" [textContent]="'TOTAL_AMOUNT_TO_PAY' | localize"></span>
-              <span class="payment-total-pay" [textContent]="paymentService.amountToPay | coCurrency: true"></span>
+        <div class="payment-wrapper">
+            <div class="payment-methods-register-wrapper">
+                <div class="payment-cash-register-wrapper">
+                    <div class="payment-cash-register-header">
+                        <span class="payment-header-title" [textContent]="'SELECT_CASH_REGISTER' | localize"></span>
+                    </div>
+                    <div class="payment-methods">
+                        @for (cashRegister of cashRegisters; track cashRegister; let index = $index) {
+                            <co-payment-tile
+                                    [icon]="cashRegister.icon"
+                                    [description]="cashRegister.description"
+                                    [selected]="cashRegisterIdx === index"
+                                    (selectedChange)="cashRegisterSelected(cashRegister, index)"
+                            ></co-payment-tile>
+                        }
+                    </div>
+                </div>
+                <div class="payment-methods-wrapper">
+                    <div class="payment-methods-header">
+                        <span class="payment-header-title" [textContent]="'SELECT' | localize"></span>
+                        <span class="payment-header-title" [textContent]="'PAYMENT_METHOD' | localize:false"></span>
+                        <span [textContent]="' (*)'"></span>
+                    </div>
+                    <div class="payment-methods co-small-scrollbar">
+                        @if (showLoader) {
+                            <co-loader class="loader"></co-loader>
+                        }
+                        @if (!showLoader) {
+                            @for (paymentMethod of paymentMethods; track paymentMethod; let index = $index) {
+                                <co-payment-tile
+                                        [image]="paymentMethod.image"
+                                        [description]="paymentMethod.payment.description"
+                                        [selected]="paymentMethodIdx === index"
+                                        (selectedChange)="paymentMethodSelected(paymentMethod.payment, index)"
+                                ></co-payment-tile>
+                            }
+                        }
+                    </div>
+                </div>
             </div>
-            <div class="payment-input-button-wrapper">
-              <div class="payment-input-button">
-                <co-payment-to-pay
-                [amountToPay]="paymentService.amountToPay"></co-payment-to-pay>
-                <div class="payment-to-pay-button">
-                  <co-button
-                    [iconData]="iconCacheService.getIcon(icons.CheckDuotone)"
-                    [disabled]="paymentService.amountToPay === 0"
-                    (click)="handlePayment()">
-                  </co-button>
+            <div class="payment-to-pay-wrapper">
+                <div class="payment-to-pay-total">
+                    <div class="payment-to-pay-header">
+                        <span class="payment-header-title" [textContent]="'TOTAL_AMOUNT_TO_PAY' | localize"></span>
+                        <span class="payment-total-pay" [textContent]="paymentService.amountToPay | coCurrency: true"></span>
+                    </div>
+                    <div class="payment-input-button-wrapper">
+                        <div class="payment-input-button">
+                            <co-payment-to-pay
+                                    [amountToPay]="paymentService.amountToPay"></co-payment-to-pay>
+                            <div class="payment-to-pay-button">
+                                <co-button
+                                        [iconData]="iconCacheService.getIcon(icons.CheckDuotone)"
+                                        [disabled]="paymentService.amountToPay === 0"
+                                        (click)="handlePayment()">
+                                </co-button>
+                            </div>
+                        </div>
+                        @if (paymentService.showPaymentMethodMessage) {
+                            <div class="payment-method-message" [textContent]="'PAYMENT_METHOD_MESSAGE' | localize"></div>
+                        }
+                        @if (showPaymentDate) {
+                            <div class="payment-bookdate">
+                                <co-input-date [(model)]="paymentDate"></co-input-date>
+                            </div>
+                        }
+                        @if (paymentService.statusMessage) {
+                            <div class="payment-error-message"
+                                 [textContent]="paymentService.statusMessage"></div>
+                        }
+                    </div>
                 </div>
-              </div>
-              @if (showPaymentDate) {
-                <div class="payment-bookdate">
-                  <co-input-date [(model)]="paymentDate"></co-input-date>
+
+                <div class="payment-deposit">
+                    <co-deposit-payment
+                            [branch]="branch"
+                            [transactionUuid]="transactionUuid"
+                            (depositPaymentFetched)="onDepositPaymentFetched($event)">
+                    </co-deposit-payment>
                 </div>
-              }
-              @if (paymentService.statusMessage) {
-                <div class="payment-error-message"
-                [textContent]="paymentService.statusMessage"></div>
-              }
+                @if (showKeyPad) {
+                    <co-key-pad class="payment-to-pay-keypad"
+                                [showValue]="false"
+                                [emitModelChangeOnEnter]="false"
+                                [model]="paymentService.amountToPay"
+                                (modelChange)="handleKeyPadModelChange($event)"
+                                (enterClick)="handlePayment()"
+                    ></co-key-pad>
+                }
             </div>
-          </div>
-      
-          <div class="payment-deposit">
-            <co-deposit-payment
-              [branch]="branch"
-              [transactionUuid]="transactionUuid"
-              (depositPaymentFetched)="onDepositPaymentFetched($event)">
-            </co-deposit-payment>
-          </div>
-          @if (showKeyPad) {
-            <co-key-pad class="payment-to-pay-keypad"
-              [showValue]="false"
-              [emitModelChangeOnEnter]="false"
-              [model]="paymentService.amountToPay"
-              (modelChange)="handleKeyPadModelChange($event)"
-              (enterClick)="handlePayment()"
-            ></co-key-pad>
-          }
         </div>
-      </div>
-      @if (paymentService.showPspQrCode) {
-        <co-dialog (closeClick)="paymentService.showPspQrCode = false">
-          <co-payment-qr-code
-            [qrCodeImage]="paymentService.qrCodeImage"
-          ></co-payment-qr-code>
-        </co-dialog>
-      }
-      `, isInline: true, dependencies: [{ kind: "component", type: PaymentTileComponent, selector: "co-payment-tile", inputs: ["selected", "icon", "image", "description", "showRadioButton"], outputs: ["selectedChange"] }, { kind: "component", type: i2.KeyPadComponent, selector: "co-key-pad", inputs: ["model", "showValue", "resetModelOnInit", "emitModelChangeOnEnter"], outputs: ["modelChange", "internalModelChange", "enterClick"] }, { kind: "component", type: i1$1.CoDialogComponent, selector: "co-dialog", inputs: ["customCssClass", "headerTemplate", "footerTemplate", "showCloseIcon", "modal", "borderless"], outputs: ["closeClick"] }, { kind: "component", type: i1$1.ButtonComponent, selector: "co-button", inputs: ["label", "iconData", "iconDataRight", "isToggleButton", "isToggled", "hidden", "disabled"], outputs: ["onClick", "clickedWhileDisabled", "isToggledChange"] }, { kind: "component", type: PaymentQrCodeComponent, selector: "co-payment-qr-code", inputs: ["qrCodeImage", "qrCodeUrl"] }, { kind: "component", type: DepositPaymentComponent, selector: "co-deposit-payment", inputs: ["branch", "transactionKind", "showTitle", "transactionUuid"], outputs: ["depositPaymentFetched"] }, { kind: "component", type: LoaderComponent, selector: "co-loader" }, { kind: "component", type: PaymentToPayComponent, selector: "co-payment-to-pay", inputs: ["showLabel", "amountToPay"] }, { kind: "component", type: i1$1.InputDatePickerComponent, selector: "co-input-date", inputs: ["firstDayOfWeek", "showClearButton"] }, { kind: "pipe", type: LocalizePipe, name: "localize" }, { kind: "pipe", type: CoCurrencyPipe, name: "coCurrency" }], encapsulation: i0.ViewEncapsulation.None });
+        @if (paymentService.showPspQrCode) {
+            <co-dialog (closeClick)="paymentService.showPspQrCode = false">
+                <co-payment-qr-code
+                        [qrCodeImage]="paymentService.qrCodeImage"
+                ></co-payment-qr-code>
+            </co-dialog>
+        }
+    `, isInline: true, dependencies: [{ kind: "component", type: PaymentTileComponent, selector: "co-payment-tile", inputs: ["selected", "icon", "image", "description", "showRadioButton"], outputs: ["selectedChange"] }, { kind: "component", type: i2.KeyPadComponent, selector: "co-key-pad", inputs: ["model", "showValue", "resetModelOnInit", "emitModelChangeOnEnter"], outputs: ["modelChange", "internalModelChange", "enterClick"] }, { kind: "component", type: i1$1.CoDialogComponent, selector: "co-dialog", inputs: ["customCssClass", "headerTemplate", "footerTemplate", "showCloseIcon", "modal", "borderless"], outputs: ["closeClick"] }, { kind: "component", type: i1$1.ButtonComponent, selector: "co-button", inputs: ["label", "iconData", "iconDataRight", "isToggleButton", "isToggled", "hidden", "disabled"], outputs: ["onClick", "clickedWhileDisabled", "isToggledChange"] }, { kind: "component", type: PaymentQrCodeComponent, selector: "co-payment-qr-code", inputs: ["qrCodeImage", "qrCodeUrl"] }, { kind: "component", type: DepositPaymentComponent, selector: "co-deposit-payment", inputs: ["branch", "transactionKind", "showTitle", "transactionUuid"], outputs: ["depositPaymentFetched"] }, { kind: "component", type: LoaderComponent, selector: "co-loader" }, { kind: "component", type: PaymentToPayComponent, selector: "co-payment-to-pay", inputs: ["showLabel", "amountToPay"] }, { kind: "component", type: i1$1.InputDatePickerComponent, selector: "co-input-date", inputs: ["firstDayOfWeek", "showClearButton"] }, { kind: "pipe", type: LocalizePipe, name: "localize" }, { kind: "pipe", type: CoCurrencyPipe, name: "coCurrency" }], encapsulation: i0.ViewEncapsulation.None });
 }
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.16", ngImport: i0, type: PaymentComponent, decorators: [{
             type: Component,
             args: [{
                     selector: "co-payment",
                     template: `
-      <div class="payment-wrapper">
-        <div class="payment-methods-register-wrapper">
-          <div class="payment-cash-register-wrapper" >
-            <div class="payment-cash-register-header">
-              <span class="payment-header-title" [textContent]="'SELECT_CASH_REGISTER' | localize"></span>
-            </div>
-            <div class="payment-methods">
-              @for (cashRegister of cashRegisters; track cashRegister; let index = $index) {
-                <co-payment-tile
-                  [icon]="cashRegister.icon"
-                  [description]="cashRegister.description"
-                  [selected]="cashRegisterIdx === index"
-                  (selectedChange)="cashRegisterSelected(cashRegister, index)"
-                ></co-payment-tile>
-              }
-            </div>
-          </div>
-          <div class="payment-methods-wrapper">
-            <div class="payment-methods-header">
-              <span class="payment-header-title" [textContent]="'SELECT' | localize"></span>
-              <span class="payment-header-title" [textContent]="'PAYMENT_METHOD' | localize:false"></span>
-            </div>
-            <div class="payment-methods co-small-scrollbar">
-              @if (showLoader) {
-                <co-loader class="loader"></co-loader>
-              }
-              @if (!showLoader) {
-                @for (paymentMethod of paymentMethods; track paymentMethod; let index = $index) {
-                  <co-payment-tile
-                    [image]="paymentMethod.image"
-                    [description]="paymentMethod.payment.description"
-                    [selected]="paymentMethodIdx === index"
-                    (selectedChange)="paymentMethodSelected(paymentMethod.payment, index)"
-                  ></co-payment-tile>
-                }
-              }
-            </div>
-          </div>
-        </div>
-        <div class="payment-to-pay-wrapper">
-          <div class="payment-to-pay-total">
-            <div class="payment-to-pay-header">
-              <span class="payment-header-title" [textContent]="'TOTAL_AMOUNT_TO_PAY' | localize"></span>
-              <span class="payment-total-pay" [textContent]="paymentService.amountToPay | coCurrency: true"></span>
+        <div class="payment-wrapper">
+            <div class="payment-methods-register-wrapper">
+                <div class="payment-cash-register-wrapper">
+                    <div class="payment-cash-register-header">
+                        <span class="payment-header-title" [textContent]="'SELECT_CASH_REGISTER' | localize"></span>
+                    </div>
+                    <div class="payment-methods">
+                        @for (cashRegister of cashRegisters; track cashRegister; let index = $index) {
+                            <co-payment-tile
+                                    [icon]="cashRegister.icon"
+                                    [description]="cashRegister.description"
+                                    [selected]="cashRegisterIdx === index"
+                                    (selectedChange)="cashRegisterSelected(cashRegister, index)"
+                            ></co-payment-tile>
+                        }
+                    </div>
+                </div>
+                <div class="payment-methods-wrapper">
+                    <div class="payment-methods-header">
+                        <span class="payment-header-title" [textContent]="'SELECT' | localize"></span>
+                        <span class="payment-header-title" [textContent]="'PAYMENT_METHOD' | localize:false"></span>
+                        <span [textContent]="' (*)'"></span>
+                    </div>
+                    <div class="payment-methods co-small-scrollbar">
+                        @if (showLoader) {
+                            <co-loader class="loader"></co-loader>
+                        }
+                        @if (!showLoader) {
+                            @for (paymentMethod of paymentMethods; track paymentMethod; let index = $index) {
+                                <co-payment-tile
+                                        [image]="paymentMethod.image"
+                                        [description]="paymentMethod.payment.description"
+                                        [selected]="paymentMethodIdx === index"
+                                        (selectedChange)="paymentMethodSelected(paymentMethod.payment, index)"
+                                ></co-payment-tile>
+                            }
+                        }
+                    </div>
+                </div>
             </div>
-            <div class="payment-input-button-wrapper">
-              <div class="payment-input-button">
-                <co-payment-to-pay
-                [amountToPay]="paymentService.amountToPay"></co-payment-to-pay>
-                <div class="payment-to-pay-button">
-                  <co-button
-                    [iconData]="iconCacheService.getIcon(icons.CheckDuotone)"
-                    [disabled]="paymentService.amountToPay === 0"
-                    (click)="handlePayment()">
-                  </co-button>
+            <div class="payment-to-pay-wrapper">
+                <div class="payment-to-pay-total">
+                    <div class="payment-to-pay-header">
+                        <span class="payment-header-title" [textContent]="'TOTAL_AMOUNT_TO_PAY' | localize"></span>
+                        <span class="payment-total-pay" [textContent]="paymentService.amountToPay | coCurrency: true"></span>
+                    </div>
+                    <div class="payment-input-button-wrapper">
+                        <div class="payment-input-button">
+                            <co-payment-to-pay
+                                    [amountToPay]="paymentService.amountToPay"></co-payment-to-pay>
+                            <div class="payment-to-pay-button">
+                                <co-button
+                                        [iconData]="iconCacheService.getIcon(icons.CheckDuotone)"
+                                        [disabled]="paymentService.amountToPay === 0"
+                                        (click)="handlePayment()">
+                                </co-button>
+                            </div>
+                        </div>
+                        @if (paymentService.showPaymentMethodMessage) {
+                            <div class="payment-method-message" [textContent]="'PAYMENT_METHOD_MESSAGE' | localize"></div>
+                        }
+                        @if (showPaymentDate) {
+                            <div class="payment-bookdate">
+                                <co-input-date [(model)]="paymentDate"></co-input-date>
+                            </div>
+                        }
+                        @if (paymentService.statusMessage) {
+                            <div class="payment-error-message"
+                                 [textContent]="paymentService.statusMessage"></div>
+                        }
+                    </div>
                 </div>
-              </div>
-              @if (showPaymentDate) {
-                <div class="payment-bookdate">
-                  <co-input-date [(model)]="paymentDate"></co-input-date>
+
+                <div class="payment-deposit">
+                    <co-deposit-payment
+                            [branch]="branch"
+                            [transactionUuid]="transactionUuid"
+                            (depositPaymentFetched)="onDepositPaymentFetched($event)">
+                    </co-deposit-payment>
                 </div>
-              }
-              @if (paymentService.statusMessage) {
-                <div class="payment-error-message"
-                [textContent]="paymentService.statusMessage"></div>
-              }
+                @if (showKeyPad) {
+                    <co-key-pad class="payment-to-pay-keypad"
+                                [showValue]="false"
+                                [emitModelChangeOnEnter]="false"
+                                [model]="paymentService.amountToPay"
+                                (modelChange)="handleKeyPadModelChange($event)"
+                                (enterClick)="handlePayment()"
+                    ></co-key-pad>
+                }
             </div>
-          </div>
-      
-          <div class="payment-deposit">
-            <co-deposit-payment
-              [branch]="branch"
-              [transactionUuid]="transactionUuid"
-              (depositPaymentFetched)="onDepositPaymentFetched($event)">
-            </co-deposit-payment>
-          </div>
-          @if (showKeyPad) {
-            <co-key-pad class="payment-to-pay-keypad"
-              [showValue]="false"
-              [emitModelChangeOnEnter]="false"
-              [model]="paymentService.amountToPay"
-              (modelChange)="handleKeyPadModelChange($event)"
-              (enterClick)="handlePayment()"
-            ></co-key-pad>
-          }
         </div>
-      </div>
-      @if (paymentService.showPspQrCode) {
-        <co-dialog (closeClick)="paymentService.showPspQrCode = false">
-          <co-payment-qr-code
-            [qrCodeImage]="paymentService.qrCodeImage"
-          ></co-payment-qr-code>
-        </co-dialog>
-      }
-      `,
+        @if (paymentService.showPspQrCode) {
+            <co-dialog (closeClick)="paymentService.showPspQrCode = false">
+                <co-payment-qr-code
+                        [qrCodeImage]="paymentService.qrCodeImage"
+                ></co-payment-qr-code>
+            </co-dialog>
+        }
+    `,
                     providers: [
                         TransactionPaymentService
                     ],
@@ -59295,7 +59338,9 @@ class TransactionToBePickedLineComponent extends TransactionLineBaseComponent {
     transactionLineSet() {
         if (this.transactionLine.articleLineStatus) {
             this.transactionLine.quantityToBePicked = this.transactionLine.articleLineStatus.quantityAllocated - this.transactionLine.articleLineStatus.quantityToBePicked;
-            this.transactionLineToBePickedCompleted = this.transactionLine.articleLineStatus.quantityAllocated === this.transactionLine.articleLineStatus.quantityPicked;
+            this.transactionLineToBePickedCompleted =
+                (this.transactionLine.articleLineStatus.quantityAllocated === this.transactionLine.articleLineStatus.quantityPicked) ||
+                    (this.transactionLine.articleLineStatus.quantityAllocated === this.transactionLine.articleLineStatus.quantityToBePicked);
         }
     }
     static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.3.16", ngImport: i0, type: TransactionToBePickedLineComponent, deps: null, target: i0.ɵɵFactoryTarget.Component });
@@ -59321,37 +59366,37 @@ class TransactionToBePickedLineComponent extends TransactionLineBaseComponent {
                               [activeCategory]="category.SalesOrderLogistics">
                       </co-transaction-line-statusbar>
                       <co-transaction-line-warehouse-button
-                        class="transaction-field-wrapper medium"
-                        [screenConfigurationObject]="cfgNames.LineWarehouse"
-                        [readonly]="transactionLineToBePickedCompleted"
-                        [inputLabel]="true"
+                              class="transaction-field-wrapper medium"
+                              [screenConfigurationObject]="cfgNames.LineWarehouse"
+                              [readonly]="transactionLineToBePickedCompleted"
+                              [inputLabel]="true"
                       ></co-transaction-line-warehouse-button>
                       <co-transaction-line-warehouse-location-button
-                        class="transaction-field-wrapper medium"
-                        [screenConfigurationObject]="cfgNames.LineWarehouseLocation"
-                        [readonly]="transactionLineToBePickedCompleted || !transactionLine.isLocationRequired"
-                        [inputLabel]="true"
+                              class="transaction-field-wrapper medium"
+                              [screenConfigurationObject]="cfgNames.LineWarehouseLocation"
+                              [readonly]="transactionLineToBePickedCompleted || !transactionLine.isLocationRequired"
+                              [inputLabel]="true"
                       ></co-transaction-line-warehouse-location-button>
                       <co-transaction-line-delivery-button
-                        class="transaction-field-wrapper medium"
-                        [screenConfigurationObject]="cfgNames.LineDeliveryMethod"
-                        [inputLabel]="true"
+                              class="transaction-field-wrapper medium"
+                              [screenConfigurationObject]="cfgNames.LineDeliveryMethod"
+                              [inputLabel]="true"
                       ></co-transaction-line-delivery-button>
                       <co-transaction-line-price
-                        class="transaction-field-wrapper small transaction-line-totals-price price"
-                        [screenConfigurationObject]="cfgNames.LinePrice"
-                        [showLabel]="false"
-                        [defaultEditMode]="false"
-                        [showPurchasePrice]="true"
-                        [inputLabel]="true"
-                        [forceReadonly]="transactionLineService.lineQuantityInvoiced && transactionLineService.lineQuantityInvoiced !== 0"
+                              class="transaction-field-wrapper small transaction-line-totals-price price"
+                              [screenConfigurationObject]="cfgNames.LinePrice"
+                              [showLabel]="false"
+                              [defaultEditMode]="false"
+                              [showPurchasePrice]="true"
+                              [inputLabel]="true"
+                              [forceReadonly]="transactionLineService.lineQuantityInvoiced && transactionLineService.lineQuantityInvoiced !== 0"
                       ></co-transaction-line-price>
                       <co-transaction-line-discount-button
-                        *ngIf="!preview"
-                        class="transaction-field-wrapper small"
-                        [screenConfigurationObject]="cfgNames.LineDiscount"
-                        [configNames]="discountConfigNames"
-                        [inputLabel]="true"
+                              *ngIf="!preview"
+                              class="transaction-field-wrapper small"
+                              [screenConfigurationObject]="cfgNames.LineDiscount"
+                              [configNames]="discountConfigNames"
+                              [inputLabel]="true"
                       ></co-transaction-line-discount-button>
                       <div class="transaction-field-wrapper small">
                           <div class="inside-field">
@@ -59382,7 +59427,7 @@ class TransactionToBePickedLineComponent extends TransactionLineBaseComponent {
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.16", ngImport: i0, type: TransactionToBePickedLineComponent, decorators: [{
             type: Component,
             args: [{
-                    selector: "co-transaction-to-be-picked-line",
+                    selector: 'co-transaction-to-be-picked-line',
                     template: `
       <co-transaction-base-line
               [lineIndex]="lineIndex"
@@ -59405,37 +59450,37 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.16", ngImpo
                               [activeCategory]="category.SalesOrderLogistics">
                       </co-transaction-line-statusbar>
                       <co-transaction-line-warehouse-button
-                        class="transaction-field-wrapper medium"
-                        [screenConfigurationObject]="cfgNames.LineWarehouse"
-                        [readonly]="transactionLineToBePickedCompleted"
-                        [inputLabel]="true"
+                              class="transaction-field-wrapper medium"
+                              [screenConfigurationObject]="cfgNames.LineWarehouse"
+                              [readonly]="transactionLineToBePickedCompleted"
+                              [inputLabel]="true"
                       ></co-transaction-line-warehouse-button>
                       <co-transaction-line-warehouse-location-button
-                        class="transaction-field-wrapper medium"
-                        [screenConfigurationObject]="cfgNames.LineWarehouseLocation"
-                        [readonly]="transactionLineToBePickedCompleted || !transactionLine.isLocationRequired"
-                        [inputLabel]="true"
+                              class="transaction-field-wrapper medium"
+                              [screenConfigurationObject]="cfgNames.LineWarehouseLocation"
+                              [readonly]="transactionLineToBePickedCompleted || !transactionLine.isLocationRequired"
+                              [inputLabel]="true"
                       ></co-transaction-line-warehouse-location-button>
                       <co-transaction-line-delivery-button
-                        class="transaction-field-wrapper medium"
-                        [screenConfigurationObject]="cfgNames.LineDeliveryMethod"
-                        [inputLabel]="true"
+                              class="transaction-field-wrapper medium"
+                              [screenConfigurationObject]="cfgNames.LineDeliveryMethod"
+                              [inputLabel]="true"
                       ></co-transaction-line-delivery-button>
                       <co-transaction-line-price
-                        class="transaction-field-wrapper small transaction-line-totals-price price"
-                        [screenConfigurationObject]="cfgNames.LinePrice"
-                        [showLabel]="false"
-                        [defaultEditMode]="false"
-                        [showPurchasePrice]="true"
-                        [inputLabel]="true"
-                        [forceReadonly]="transactionLineService.lineQuantityInvoiced && transactionLineService.lineQuantityInvoiced !== 0"
+                              class="transaction-field-wrapper small transaction-line-totals-price price"
+                              [screenConfigurationObject]="cfgNames.LinePrice"
+                              [showLabel]="false"
+                              [defaultEditMode]="false"
+                              [showPurchasePrice]="true"
+                              [inputLabel]="true"
+                              [forceReadonly]="transactionLineService.lineQuantityInvoiced && transactionLineService.lineQuantityInvoiced !== 0"
                       ></co-transaction-line-price>
                       <co-transaction-line-discount-button
-                        *ngIf="!preview"
-                        class="transaction-field-wrapper small"
-                        [screenConfigurationObject]="cfgNames.LineDiscount"
-                        [configNames]="discountConfigNames"
-                        [inputLabel]="true"
+                              *ngIf="!preview"
+                              class="transaction-field-wrapper small"
+                              [screenConfigurationObject]="cfgNames.LineDiscount"
+                              [configNames]="discountConfigNames"
+                              [inputLabel]="true"
                       ></co-transaction-line-discount-button>
                       <div class="transaction-field-wrapper small">
                           <div class="inside-field">
@@ -59469,7 +59514,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.16", ngImpo
                 type: Input
             }], showClass: [{
                 type: HostBinding,
-                args: ["class.co-transaction-to-be-picked-line"]
+                args: ['class.co-transaction-to-be-picked-line']
             }] } });
 
 class TransactionToBePickedLineModule {
@@ -70177,7 +70222,7 @@ class ShippingMethodDialogComponent {
         [BatchDeliveryCategory.DeliveryOrder, LayoutCode$1.DeliveryNote],
         [BatchDeliveryCategory.Invoice, LayoutCode$1.Invoice],
         [BatchDeliveryCategory.Picked, LayoutCode$1.PackageSticker],
-        [BatchDeliveryCategory.Reserve, LayoutCode$1.ReserveSticker],
+        [BatchDeliveryCategory.Reserve, LayoutCode$1.ReserveSticker]
     ]);
     constructor(iconService, transactionService, changeDetector, _transactionMapping) {
         this.iconService = iconService;
@@ -70207,7 +70252,7 @@ class ShippingMethodDialogComponent {
             batchRequest.overruleSendMethodForPrinting = this.reportDocumentCombinedRequest.reportIdForPrinting;
             batchRequest.overruleSendMethodForEDI = this.reportDocumentCombinedRequest.overruleSendMethodForEDI;
         }
-        batchRequest.printerName = this.reportDocumentCombinedRequest.printerName ? this.reportDocumentCombinedRequest.printerName : null;
+        batchRequest.printerName = this.reportDocumentPrintRequest.printerName ?? this.reportDocumentCombinedRequest.printerName;
         if (this.category === BatchDeliveryCategory.Invoice || this.category === BatchDeliveryCategory.ToPick) {
             batchRequest.documentDate = this.documentDate;
         }
@@ -70322,98 +70367,98 @@ class ShippingMethodDialogComponent {
     }
     static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.3.16", ngImport: i0, type: ShippingMethodDialogComponent, deps: [{ token: IconCacheService }, { token: TransactionService }, { token: i0.ChangeDetectorRef }, { token: TransactionMappingService }], target: i0.ɵɵFactoryTarget.Component });
     static ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "17.0.0", version: "20.3.16", type: ShippingMethodDialogComponent, isStandalone: false, selector: "co-shipping-method-dialog", inputs: { category: "category", selectedTransactions: "selectedTransactions" }, outputs: { saveClicked: "saveClicked", cancelClicked: "cancelClicked" }, host: { properties: { "class.co-shipping-method-dialog": "this.showClass" } }, ngImport: i0, template: `
-    @if (ready) {
-      <co-send-method-dialog
-        [headerTitle]="'SENDMETHODS' | localize"
-        [printerList]="printerList"
-        [defaultSendMethod]="sendMethodType.CombinePrintAndEmail"
-        [visibleMethods]="[sendMethodType.CombinePrintAndEmail]"
-        [emailAddresses]="emailAddresses"
-        [emailLayouts]="emailLayouts"
-        [printLayouts]="printLayouts"
-        [disablePdfPreview]="true"
-        [isDocSignEnabled]="true"
-        [pdfDoc]="pdfDoc"
-        [showAdditionalChecks]="false"
-        [showLocalPrint]="false"
-        [layoutCode]="layoutCode"
-        [(reportingDocumentEmailRequest)]="reportDocumentEmailRequest"
-        [(reportingDocumentPrintRequest)]="reportDocumentPrintRequest"
-        [(reportingDocumentPdfRequest)]="reportDocumentPdfRequest"
-        [(reportingDocumentCombinedRequest)]="reportDocumentCombinedRequest"
-        (closeClick)="cancelButtonClicked()"
-        (okClick)="saveButtonClicked($event)"
-        >
-        <div extra-content>
-          @if (category === BatchDeliveryCategory.Invoice) {
-            <section>
-              <h3 [textContent]="'INVOICE_DATE' | localize"></h3>
-              <co-input-date [placeholder]="'INVOICE_DATE' | localize"
-                             [firstDayOfWeek]="firstDayOfWeek"
-                             [(model)]="documentDate"></co-input-date>
-            </section>
-          }
-          @if (category === BatchDeliveryCategory.ToPick) {
-            <section>
-              <h3 [textContent]="'TO_BE_PICKED' | localize"></h3>
-              <co-input-date [placeholder]="'TO_BE_PICKED' | localize"
-                             [firstDayOfWeek]="firstDayOfWeek"
-                             [(model)]="documentDate"></co-input-date>
-            </section>
-          }
-        </div>
-      </co-send-method-dialog>
-    }
-    `, isInline: true, dependencies: [{ kind: "component", type: i2.SendMethodDialogComponent, selector: "co-send-method-dialog", inputs: ["printerList", "reportingDocumentPrintRequest", "reportingDocumentEmailRequest", "reportingDocumentPdfRequest", "reportingDocumentCombinedRequest", "emailLayouts", "printLayouts", "headerTitle", "emailAddresses", "defaultSendMethod", "visibleMethods", "isDocSignEnabled", "docSign", "hideSignatureBtn", "isPrinterLayoutsEnabled", "isAdditionalDocEnabled", "additionalFileName", "additionalFileContents", "pdfDoc", "disablePdfPreview", "emailUnsignedPossible", "showPDFPreview", "showAdditionalChecks", "showLocalPrint", "layoutCode"], outputs: ["reportingDocumentPrintRequestChange", "reportingDocumentEmailRequestChange", "reportingDocumentPdfRequestChange", "reportingDocumentCombinedRequestChange", "startSignatureClicked", "closeClick", "okClick", "additionalFileChangeEvent", "showFilePreview", "loadDefaultPrinterName"] }, { kind: "component", type: i1$1.InputDatePickerComponent, selector: "co-input-date", inputs: ["firstDayOfWeek", "showClearButton"] }, { kind: "pipe", type: LocalizePipe, name: "localize" }], encapsulation: i0.ViewEncapsulation.None });
+      @if (ready) {
+          <co-send-method-dialog
+                  [headerTitle]="'SENDMETHODS' | localize"
+                  [printerList]="printerList"
+                  [defaultSendMethod]="sendMethodType.CombinePrintAndEmail"
+                  [visibleMethods]="[sendMethodType.CombinePrintAndEmail]"
+                  [emailAddresses]="emailAddresses"
+                  [emailLayouts]="emailLayouts"
+                  [printLayouts]="printLayouts"
+                  [disablePdfPreview]="true"
+                  [isDocSignEnabled]="true"
+                  [pdfDoc]="pdfDoc"
+                  [showAdditionalChecks]="false"
+                  [showLocalPrint]="false"
+                  [layoutCode]="layoutCode"
+                  [(reportingDocumentEmailRequest)]="reportDocumentEmailRequest"
+                  [(reportingDocumentPrintRequest)]="reportDocumentPrintRequest"
+                  [(reportingDocumentPdfRequest)]="reportDocumentPdfRequest"
+                  [(reportingDocumentCombinedRequest)]="reportDocumentCombinedRequest"
+                  (closeClick)="cancelButtonClicked()"
+                  (okClick)="saveButtonClicked($event)"
+          >
+              <div extra-content>
+                  @if (category === BatchDeliveryCategory.Invoice) {
+                      <section>
+                          <h3 [textContent]="'INVOICE_DATE' | localize"></h3>
+                          <co-input-date [placeholder]="'INVOICE_DATE' | localize"
+                                         [firstDayOfWeek]="firstDayOfWeek"
+                                         [(model)]="documentDate"></co-input-date>
+                      </section>
+                  }
+                  @if (category === BatchDeliveryCategory.ToPick) {
+                      <section>
+                          <h3 [textContent]="'TO_BE_PICKED' | localize"></h3>
+                          <co-input-date [placeholder]="'TO_BE_PICKED' | localize"
+                                         [firstDayOfWeek]="firstDayOfWeek"
+                                         [(model)]="documentDate"></co-input-date>
+                      </section>
+                  }
+              </div>
+          </co-send-method-dialog>
+      }
+  `, isInline: true, dependencies: [{ kind: "component", type: i2.SendMethodDialogComponent, selector: "co-send-method-dialog", inputs: ["printerList", "reportingDocumentPrintRequest", "reportingDocumentEmailRequest", "reportingDocumentPdfRequest", "reportingDocumentCombinedRequest", "emailLayouts", "printLayouts", "headerTitle", "emailAddresses", "defaultSendMethod", "visibleMethods", "isDocSignEnabled", "docSign", "hideSignatureBtn", "isPrinterLayoutsEnabled", "isAdditionalDocEnabled", "additionalFileName", "additionalFileContents", "pdfDoc", "disablePdfPreview", "emailUnsignedPossible", "showPDFPreview", "showAdditionalChecks", "showLocalPrint", "layoutCode"], outputs: ["reportingDocumentPrintRequestChange", "reportingDocumentEmailRequestChange", "reportingDocumentPdfRequestChange", "reportingDocumentCombinedRequestChange", "startSignatureClicked", "closeClick", "okClick", "additionalFileChangeEvent", "showFilePreview", "loadDefaultPrinterName"] }, { kind: "component", type: i1$1.InputDatePickerComponent, selector: "co-input-date", inputs: ["firstDayOfWeek", "showClearButton"] }, { kind: "pipe", type: LocalizePipe, name: "localize" }], encapsulation: i0.ViewEncapsulation.None });
 }
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.16", ngImport: i0, type: ShippingMethodDialogComponent, decorators: [{
             type: Component,
             args: [{
                     selector: 'co-shipping-method-dialog',
                     template: `
-    @if (ready) {
-      <co-send-method-dialog
-        [headerTitle]="'SENDMETHODS' | localize"
-        [printerList]="printerList"
-        [defaultSendMethod]="sendMethodType.CombinePrintAndEmail"
-        [visibleMethods]="[sendMethodType.CombinePrintAndEmail]"
-        [emailAddresses]="emailAddresses"
-        [emailLayouts]="emailLayouts"
-        [printLayouts]="printLayouts"
-        [disablePdfPreview]="true"
-        [isDocSignEnabled]="true"
-        [pdfDoc]="pdfDoc"
-        [showAdditionalChecks]="false"
-        [showLocalPrint]="false"
-        [layoutCode]="layoutCode"
-        [(reportingDocumentEmailRequest)]="reportDocumentEmailRequest"
-        [(reportingDocumentPrintRequest)]="reportDocumentPrintRequest"
-        [(reportingDocumentPdfRequest)]="reportDocumentPdfRequest"
-        [(reportingDocumentCombinedRequest)]="reportDocumentCombinedRequest"
-        (closeClick)="cancelButtonClicked()"
-        (okClick)="saveButtonClicked($event)"
-        >
-        <div extra-content>
-          @if (category === BatchDeliveryCategory.Invoice) {
-            <section>
-              <h3 [textContent]="'INVOICE_DATE' | localize"></h3>
-              <co-input-date [placeholder]="'INVOICE_DATE' | localize"
-                             [firstDayOfWeek]="firstDayOfWeek"
-                             [(model)]="documentDate"></co-input-date>
-            </section>
-          }
-          @if (category === BatchDeliveryCategory.ToPick) {
-            <section>
-              <h3 [textContent]="'TO_BE_PICKED' | localize"></h3>
-              <co-input-date [placeholder]="'TO_BE_PICKED' | localize"
-                             [firstDayOfWeek]="firstDayOfWeek"
-                             [(model)]="documentDate"></co-input-date>
-            </section>
-          }
-        </div>
-      </co-send-method-dialog>
-    }
-    `,
+      @if (ready) {
+          <co-send-method-dialog
+                  [headerTitle]="'SENDMETHODS' | localize"
+                  [printerList]="printerList"
+                  [defaultSendMethod]="sendMethodType.CombinePrintAndEmail"
+                  [visibleMethods]="[sendMethodType.CombinePrintAndEmail]"
+                  [emailAddresses]="emailAddresses"
+                  [emailLayouts]="emailLayouts"
+                  [printLayouts]="printLayouts"
+                  [disablePdfPreview]="true"
+                  [isDocSignEnabled]="true"
+                  [pdfDoc]="pdfDoc"
+                  [showAdditionalChecks]="false"
+                  [showLocalPrint]="false"
+                  [layoutCode]="layoutCode"
+                  [(reportingDocumentEmailRequest)]="reportDocumentEmailRequest"
+                  [(reportingDocumentPrintRequest)]="reportDocumentPrintRequest"
+                  [(reportingDocumentPdfRequest)]="reportDocumentPdfRequest"
+                  [(reportingDocumentCombinedRequest)]="reportDocumentCombinedRequest"
+                  (closeClick)="cancelButtonClicked()"
+                  (okClick)="saveButtonClicked($event)"
+          >
+              <div extra-content>
+                  @if (category === BatchDeliveryCategory.Invoice) {
+                      <section>
+                          <h3 [textContent]="'INVOICE_DATE' | localize"></h3>
+                          <co-input-date [placeholder]="'INVOICE_DATE' | localize"
+                                         [firstDayOfWeek]="firstDayOfWeek"
+                                         [(model)]="documentDate"></co-input-date>
+                      </section>
+                  }
+                  @if (category === BatchDeliveryCategory.ToPick) {
+                      <section>
+                          <h3 [textContent]="'TO_BE_PICKED' | localize"></h3>
+                          <co-input-date [placeholder]="'TO_BE_PICKED' | localize"
+                                         [firstDayOfWeek]="firstDayOfWeek"
+                                         [(model)]="documentDate"></co-input-date>
+                      </section>
+                  }
+              </div>
+          </co-send-method-dialog>
+      }
+  `,
                     encapsulation: ViewEncapsulation.None,
                     standalone: false
                 }]
@@ -71480,6 +71525,7 @@ class TransactionSearchResultComponent {
         this.searchService.setBatchOptionsState(Object.values(BatchDeliveryCategory).includes(category));
     }
     _showBatchProcessesStatus() {
+        this._clearSelected();
         this.showProcessOrdersLoader = false;
         this.transactionService.getBatchJobProgressesForTheUser().then((batchJobProgresses) => {
             this.batchJobProgress = batchJobProgresses;
@@ -71497,7 +71543,7 @@ class TransactionSearchResultComponent {
     @if (screenConfigLoaded) {
       @if (searchService.transactions?.length > 0 && batchPageActive && searchService.showBatchOptions) {
         <div class="actions-wrapper">
-          @if (checkIfSelected() && batchCategory !== BatchDeliveryCategory.Transport) {
+          @if (batchCategory && batchCategory !== BatchDeliveryCategory.Transport) {
             <co-input-checkbox
               [model]="checkIfAllSelected()"
               [label]="(checkIfAllSelected() ? 'DESELECT' : 'SELECT_ALL_ORDERS') | localize"
@@ -71620,7 +71666,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.16", ngImpo
     @if (screenConfigLoaded) {
       @if (searchService.transactions?.length > 0 && batchPageActive && searchService.showBatchOptions) {
         <div class="actions-wrapper">
-          @if (checkIfSelected() && batchCategory !== BatchDeliveryCategory.Transport) {
+          @if (batchCategory && batchCategory !== BatchDeliveryCategory.Transport) {
             <co-input-checkbox
               [model]="checkIfAllSelected()"
               [label]="(checkIfAllSelected() ? 'DESELECT' : 'SELECT_ALL_ORDERS') | localize"
@@ -87230,10 +87276,6 @@ class TransactionInternalComponent {
                 // if (transaction?.transactionInfo?.uuid) {
                 //   this.getTransactionMarginInfo(transaction?.transactionInfo?.uuid);
                 // }
-                if (transaction?.transactionInfo.id && transaction.transactionInfo.transactionKind === TransactionKind.SalesOrder) {
-                    this.getPlanOrderForTransaction(transaction);
-                    this.checkPreferredPlanning();
-                }
                 if (this._containerForFillMode && this.transaction && this.transaction.transactionInfo.transactionKind === TransactionKind.PurchaseOrder) {
                     this._transactionEventService.activeRubricChange.next({ category: TransactionTypeCategory.PurchaseOrderTransport });
                 }
@@ -87545,18 +87587,6 @@ class TransactionInternalComponent {
     handleViewModeChange(mode) {
         this.activeViewMode = mode;
     }
-    async getPlanOrderForTransaction(transaction) {
-        if (!this.deliveryPlanningService.currentPlanning?.planningId) {
-            const planningSources = await this._transactionConnectorService.getPlanningSources();
-            this.deliveryPlanningService.currentPlanning = planningSources[0] ? planningSources[0] : undefined;
-        }
-        let planOrder = await this._transactionConnectorService.getPlanOrder(transaction.transactionInfo.id);
-        if (planOrder) {
-            await this.deliveryPlanningService.getSequenceOrderValue(planOrder);
-            await this.deliveryPlanningService.getOrderLinesPlanned(planOrder);
-            this.deliveryPlanningService.linesPlanOrder = planOrder;
-        }
-    }
     async handleShowSalesPersonInput(event) {
         event.preventDefault();
         event.stopPropagation();
@@ -94288,13 +94318,13 @@ class TransactionQuickAccessOrderActivitiesComponent extends TransactionQuickAcc
         return Promise.resolve([]); // Not yet provided by middle tier
     }
     getDefaultSendMethod() {
-        return this.transactionService.getDeliveryNoteDefaultSendMethod(this.transactionInfo.relation.relationId);
+        return this.transactionService.getWorkOrderDefaultSendMethod(this.transactionInfo.relation.relationId);
     }
     getEmailLayouts() {
-        return this.transactionService.getDeliveryNoteEmailLayouts(this.transactionInfo.uuid);
+        return this.transactionService.getWorkOrderEmailLayouts(this.transactionInfo.uuid);
     }
     getPrintLayouts() {
-        return this.transactionService.getDeliveryNotePrintLayouts(this.transactionInfo.uuid);
+        return this.transactionService.getWorkOrderPrintLayouts(this.transactionInfo.uuid);
     }
     pdfDocument(reportingDocumentPdfBaseRequest) {
         if (this.sendDocumentsComponent.selected) {
@@ -94356,7 +94386,7 @@ class TransactionQuickAccessOrderActivitiesComponent extends TransactionQuickAcc
         historicRequest.reportId = reportId;
         historicRequest.transId = this.sendDocumentsComponent.activeReport.reportTransId;
         this._prepareHistoricRequest(historicRequest);
-        return await this.transactionService.previewHistoricDeliveryNote(historicRequest);
+        return await this.transactionService.previewWorkOrder(historicRequest);
     }
     async getPreviewDocumentData(reportId) {
         let request;