@colijnit/transaction 261.20.63 → 261.20.64

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.63";
-    publishDate = "17-7-2026, 16:36:05";
+    symVer = "261.20.64";
+    publishDate = "12-8-2026, 18:02:23";
 }
 
 class CheckoutModuleService extends BaseModuleService {
@@ -15450,6 +15450,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.16", ngImpo
 
 class OrderLineSetService {
     currentOrderLineSetCode;
+    currentCompositionId;
     static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.3.16", ngImport: i0, type: OrderLineSetService, deps: [], target: i0.ɵɵFactoryTarget.Injectable });
     static ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "20.3.16", ngImport: i0, type: OrderLineSetService, providedIn: "root" });
 }
@@ -15510,6 +15511,10 @@ class TransactionTextLineComponent extends TransactionLineBaseComponent {
         this.changeDetector = changeDetector;
     }
     orderLineSetButtonClicked() {
+        this.orderLineSetService.currentCompositionId =
+            this.orderLineSetService.currentCompositionId === this.transactionLine.compositionId ?
+                null :
+                this.transactionLine.compositionId;
         this.orderLineSetService.currentOrderLineSetCode =
             this.orderLineSetService.currentOrderLineSetCode === this.transactionLine.orderLineSetCode ?
                 null :
@@ -15684,7 +15689,7 @@ class TransactionLineToolbarComponent {
         this._transactionKind = this._transactionService.currentTransaction.transactionInfo.transactionKind;
         this.canCreateService = ((this._transactionKind === TransactionKind.SalesOrder)
             && (this.transactionLine && this.transactionLine.articleLineStatus
-                && this.transactionLine.articleLineStatus.quantityDelivered && this.transactionLine.articleLineStatus.quantityDelivered > 0));
+                && this.transactionLine.articleLineStatus.quantityAllocated && this.transactionLine.articleLineStatus.quantityAllocated > 0));
         this.canReopenExternalOrder = this._isReopenableExternalCatalogLine();
         this.conversionUnitsAvailable = await this._getConversionUnitsAvailable();
         this.areAllowedToChangeOrder = (this._transactionKind !== TransactionKind.SalesOrder || !(this._transactionService.invoiceCompleted && !this._transactionService.canChangeSalesOrderWhenFullyInvoiced));
@@ -38729,6 +38734,8 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.16", ngImpo
 class DropShipmentComponent {
     iconCacheService;
     transactionService;
+    transactionEventService;
+    changeDetection;
     _dialogService;
     showClass() {
         return true;
@@ -38742,13 +38749,21 @@ class DropShipmentComponent {
     showDisconnectButton = false;
     editMode = false;
     icons = Icon;
-    constructor(iconCacheService, transactionService, _dialogService) {
+    constructor(iconCacheService, transactionService, transactionEventService, changeDetection, _dialogService) {
         this.iconCacheService = iconCacheService;
         this.transactionService = transactionService;
+        this.transactionEventService = transactionEventService;
+        this.changeDetection = changeDetection;
         this._dialogService = _dialogService;
     }
     ngOnInit() {
-        void this._getAddresses();
+        this._getAddresses().then(() => {
+            this.setExistingAddressIfExists();
+        });
+    }
+    handleShowDropShipmentDialog() {
+        this.showDropShipmentDialog = true;
+        this.setExistingAddressIfExists();
     }
     saveDropShipment() {
         this.dropShipmentInfo.relationId = this.transactionService.relation.relationId;
@@ -38786,19 +38801,36 @@ class DropShipmentComponent {
         }
         this.existingDropShipmentAddresses = this.allDropShipmentAddresses.filter(address => this._objectContainsTerm(address, this.searchTerm));
     }
+    setExistingAddressIfExists() {
+        if (this.transactionService.currentTransaction.transactionInfo.dropshipmentInfoId) {
+            const existingAddress = this.existingDropShipmentAddresses.find(di => di.id === this.transactionService.currentTransaction.transactionInfo.dropshipmentInfoId);
+            if (existingAddress) {
+                this.dropShipmentInfo = existingAddress;
+                this.showDisconnectButton = true;
+            }
+        }
+    }
     selectAddress(selectedAddress) {
         this.dropShipmentInfo = selectedAddress;
         const request = new ChangeHeaderDropshipmentInfoRequest();
         request.transactionUuid = this.transUuid;
         request.newDropshipmentInfoId = selectedAddress.id;
-        this.transactionService.changeHeaderDropshipmentInfo(request).then(() => this.showDisconnectButton = true);
+        this.transactionService.changeHeaderDropshipmentInfo(request).then(() => {
+            this.showDisconnectButton = true;
+            this.changeDetection.detectChanges();
+            this.transactionEventService.headerPopupSaveButtonEnableChange.next(true);
+        });
     }
     removeDropShipment() {
         this.dropShipmentInfo = new DropshipmentInfo();
         const request = new ChangeHeaderDropshipmentInfoRequest();
         request.transactionUuid = this.transUuid;
         request.newDropshipmentInfoId = null;
-        this.transactionService.changeHeaderDropshipmentInfo(request).then(() => this.showDisconnectButton = false);
+        this.transactionService.changeHeaderDropshipmentInfo(request).then(() => {
+            this.showDisconnectButton = false;
+            this.changeDetection.detectChanges();
+            this.transactionEventService.headerPopupSaveButtonEnableChange.next(true);
+        });
     }
     addNewAddress() {
         this.dropShipmentInfo = new DropshipmentInfo();
@@ -38808,6 +38840,9 @@ class DropShipmentComponent {
         this.dropShipmentInfo = new DropshipmentInfo();
         this.editMode = false;
     }
+    detectChanges() {
+        this.changeDetection.detectChanges();
+    }
     _objectContainsTerm(address, term) {
         const fieldsToSearch = [
             address.dropshipmentName,
@@ -38829,12 +38864,12 @@ class DropShipmentComponent {
         this.allDropShipmentAddresses = await this.transactionService.getDropshipmentInfosByRelationId(this.transactionService.relation.relationId);
         this.existingDropShipmentAddresses = this.allDropShipmentAddresses;
     }
-    static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.3.16", ngImport: i0, type: DropShipmentComponent, deps: [{ token: IconCacheService }, { token: TransactionService }, { token: TransactionDialogService }], target: i0.ɵɵFactoryTarget.Component });
+    static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.3.16", ngImport: i0, type: DropShipmentComponent, deps: [{ token: IconCacheService }, { token: TransactionService }, { token: TransactionEventService }, { token: i0.ChangeDetectorRef }, { token: TransactionDialogService }], target: i0.ɵɵFactoryTarget.Component });
     static ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "17.0.0", version: "20.3.16", type: DropShipmentComponent, isStandalone: false, selector: "co-drop-shipment", inputs: { transUuid: "transUuid" }, host: { properties: { "class.co-drop-shipment": "this.showClass" } }, ngImport: i0, template: `
         <div class="default-data-row">
             <div class="new-drop-shipment-link">
                 <icon class="drop-shipment-icon" [icon]="icons.ArrowPointRight"></icon>
-                <div [textContent]="'DROPSHIPMENT_INFO' | localize" (click)="showDropShipmentDialog = true"></div>
+                <div [textContent]="'DROPSHIPMENT_INFO' | localize" (click)="handleShowDropShipmentDialog()"></div>
             </div>
         </div>
 
@@ -38970,7 +39005,7 @@ class DropShipmentComponent {
                         </div>
                     }
                 </section>
-                
+
                 <ng-template #templateHeader>
                     <div class="co-dialog-header-title-icon">
                         <co-icon [iconData]="iconCacheService.getIcon(icons.DeliveryTruckFast)"></co-icon>
@@ -38979,11 +39014,6 @@ class DropShipmentComponent {
                 </ng-template>
                 <ng-template #templateFooter>
                     <div class="co-dialog-footer-button-wrapper">
-                        <co-button
-                                class="save-button"
-                                [iconData]="iconCacheService.getIcon(icons.CheckDuotone)"
-                                (click)="closeDropShipment()">
-                        </co-button>
                         <co-button
                                 class="close-button"
                                 [iconData]="iconCacheService.getIcon(icons.Crossskinny)"
@@ -39003,7 +39033,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.16", ngImpo
         <div class="default-data-row">
             <div class="new-drop-shipment-link">
                 <icon class="drop-shipment-icon" [icon]="icons.ArrowPointRight"></icon>
-                <div [textContent]="'DROPSHIPMENT_INFO' | localize" (click)="showDropShipmentDialog = true"></div>
+                <div [textContent]="'DROPSHIPMENT_INFO' | localize" (click)="handleShowDropShipmentDialog()"></div>
             </div>
         </div>
 
@@ -39139,7 +39169,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.16", ngImpo
                         </div>
                     }
                 </section>
-                
+
                 <ng-template #templateHeader>
                     <div class="co-dialog-header-title-icon">
                         <co-icon [iconData]="iconCacheService.getIcon(icons.DeliveryTruckFast)"></co-icon>
@@ -39148,11 +39178,6 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.16", ngImpo
                 </ng-template>
                 <ng-template #templateFooter>
                     <div class="co-dialog-footer-button-wrapper">
-                        <co-button
-                                class="save-button"
-                                [iconData]="iconCacheService.getIcon(icons.CheckDuotone)"
-                                (click)="closeDropShipment()">
-                        </co-button>
                         <co-button
                                 class="close-button"
                                 [iconData]="iconCacheService.getIcon(icons.Crossskinny)"
@@ -39166,7 +39191,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.16", ngImpo
                     encapsulation: ViewEncapsulation.None,
                     standalone: false
                 }]
-        }], ctorParameters: () => [{ type: IconCacheService }, { type: TransactionService }, { type: TransactionDialogService }], propDecorators: { showClass: [{
+        }], ctorParameters: () => [{ type: IconCacheService }, { type: TransactionService }, { type: TransactionEventService }, { type: i0.ChangeDetectorRef }, { type: TransactionDialogService }], propDecorators: { showClass: [{
                 type: HostBinding,
                 args: ['class.co-drop-shipment']
             }], transUuid: [{
@@ -50383,7 +50408,7 @@ class TransactionLineActionButtonsComponent {
         const conversionUnitsAvailable = await this._getConversionUnitsAvailable();
         const canCreateService = ((this.transactionKind === TransactionKind.SalesOrder)
             && (this.transactionLine && this.transactionLine.articleLineStatus
-                && this.transactionLine.articleLineStatus.quantityDelivered && this.transactionLine.articleLineStatus.quantityDelivered > 0));
+                && this.transactionLine.articleLineStatus.quantityAllocated && this.transactionLine.articleLineStatus.quantityAllocated > 0));
         this._actionButtonsPopupComponentRef = this._overlayService.createComponent(TransactionLineActionButtonsPopupComponent, {
             parentForOverlay: this.elementRef,
             configNames: this.configNames,
@@ -53452,6 +53477,32 @@ class TransactionOverviewLineComponent extends TransactionLineBaseComponent {
         this._subs.forEach(s => s.unsubscribe());
         super.ngOnDestroy();
     }
+    //divided into several if statements for readability
+    canShowCheckbox() {
+        if (!this.orderLineSetService.currentOrderLineSetCode) {
+            return false;
+        }
+        if (!this.transactionLine.orderLineSetCode) {
+            //We are now allowed to actually add new lines to a composition.
+            //If we're looking at members of a composition set don't show a checkbox for lines we can't add anyway.
+            return isNaN(this.orderLineSetService.currentCompositionId);
+        }
+        if (this.orderLineSetService.currentOrderLineSetCode === this.transactionLine.orderLineSetCode) {
+            return true;
+        }
+        if (this.orderLineSetService.currentCompositionId && this.orderLineSetService.currentCompositionId === this.transactionLine.compositionId) {
+            return true;
+        }
+        return false;
+    }
+    checkboxValue() {
+        if (isNaN(this.orderLineSetService.currentCompositionId)) {
+            return (this.orderLineSetService.currentOrderLineSetCode === this.transactionLine.orderLineSetCode);
+        }
+        else {
+            return (this.orderLineSetService.currentCompositionId === this.transactionLine.compositionId);
+        }
+    }
     handleCheckBoxValueChanged(value) {
         if (value) {
             this.transactionLine.orderLineSetCode = this.orderLineSetService.currentOrderLineSetCode;
@@ -53472,6 +53523,7 @@ class TransactionOverviewLineComponent extends TransactionLineBaseComponent {
             this.transactionEventService.lineUserFormResponseRequest.next({ formId: this.transactionLine.formId, lineUUID: this.transactionLine.uuid, openUserForm: true, formResponseId: this.transactionLine.formResponseId });
         }
     }
+    isNaN = isNaN;
     static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.3.16", ngImport: i0, type: TransactionOverviewLineComponent, deps: [{ token: OrderLineSetService }, { token: TransactionHeaderService }, { token: TransactionLineService }, { token: TransactionEventService }, { token: TransactionConnectorService }, { token: IconCacheService }, { token: TransactionScreenConfigurationService }, { token: TransactionService }, { token: TransactionImageService }, { token: DictionaryService }, { token: i0.ChangeDetectorRef }], target: i0.ɵɵFactoryTarget.Component });
     static ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "17.0.0", version: "20.3.16", type: TransactionOverviewLineComponent, isStandalone: false, selector: "co-transaction-overview-line", inputs: { lineIndex: "lineIndex" }, outputs: { descriptionDblClick: "descriptionDblClick" }, host: { properties: { "class.co-transaction-overview-line": "this.showClass" } }, viewQueries: [{ propertyName: "transactionLineActionButtons", first: true, predicate: TransactionLineActionButtonsComponent, descendants: true }], usesInheritance: true, ngImport: i0, template: `
       <co-transaction-base-line
@@ -53480,8 +53532,9 @@ class TransactionOverviewLineComponent extends TransactionLineBaseComponent {
               [transactionLine]="transactionLine"
               [preview]="preview"
               [isFirst]="isFirst"
-              [checkbox]="orderLineSetService.currentOrderLineSetCode && (!transactionLine.orderLineSetCode || transactionLine.orderLineSetCode === orderLineSetService.currentOrderLineSetCode)"
-              [checkboxValue]="orderLineSetService.currentOrderLineSetCode === transactionLine.orderLineSetCode"
+              [checkbox]="canShowCheckbox()"
+              [checkboxValue]="checkboxValue()"
+              [checkboxReadonly]="!isNaN(orderLineSetService.currentCompositionId)"
               (checkboxValueChanged)="handleCheckBoxValueChanged($event)">
           <ng-container *ngIf="transactionLine.isArticle">
               <div class="transaction-line-wrapper">
@@ -53590,8 +53643,9 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.16", ngImpo
               [transactionLine]="transactionLine"
               [preview]="preview"
               [isFirst]="isFirst"
-              [checkbox]="orderLineSetService.currentOrderLineSetCode && (!transactionLine.orderLineSetCode || transactionLine.orderLineSetCode === orderLineSetService.currentOrderLineSetCode)"
-              [checkboxValue]="orderLineSetService.currentOrderLineSetCode === transactionLine.orderLineSetCode"
+              [checkbox]="canShowCheckbox()"
+              [checkboxValue]="checkboxValue()"
+              [checkboxReadonly]="!isNaN(orderLineSetService.currentCompositionId)"
               (checkboxValueChanged)="handleCheckBoxValueChanged($event)">
           <ng-container *ngIf="transactionLine.isArticle">
               <div class="transaction-line-wrapper">
@@ -54739,15 +54793,6 @@ class TransactionMarginInfoLineComponent extends TransactionLineBaseComponent {
     // public get lineMarginInfo(): TransactionLineMarginInfo {
     //   return this.transactionService.transactionLocalMarginInfo.lineMarginInfos.find(line => line.lineNr === this.transactionLine.lineNr);
     // }
-    handleCheckBoxValueChanged(value) {
-        if (value) {
-            this.transactionLine.orderLineSetCode = this.orderLineSetService.currentOrderLineSetCode;
-        }
-        else {
-            this.transactionLine.orderLineSetCode = null;
-        }
-        this.transactionService.changeTransactionLineOrderLineSet(this.transactionInfo.uuid, this.transactionLine.uuid, this.transactionLine.orderLineSetCode);
-    }
     onDescriptionDblClick() {
         this.descriptionDblClick.emit();
     }
@@ -54772,10 +54817,7 @@ class TransactionMarginInfoLineComponent extends TransactionLineBaseComponent {
               [transactionInfo]="transactionInfo"
               [transactionLine]="transactionLine"
               [preview]="false"
-              [isFirst]="isFirst"
-              [checkbox]="orderLineSetService.currentOrderLineSetCode && (!transactionLine.orderLineSetCode || transactionLine.orderLineSetCode === orderLineSetService.currentOrderLineSetCode)"
-              [checkboxValue]="orderLineSetService.currentOrderLineSetCode === transactionLine.orderLineSetCode"
-              (checkboxValueChanged)="handleCheckBoxValueChanged($event)">
+              [isFirst]="isFirst">
           <ng-container *ngIf="transactionLine.isArticle">
               <div class="transaction-line-wrapper">
                   <div *ngIf=!preview class="transaction-line-extended-wrapper">
@@ -54862,10 +54904,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.16", ngImpo
               [transactionInfo]="transactionInfo"
               [transactionLine]="transactionLine"
               [preview]="false"
-              [isFirst]="isFirst"
-              [checkbox]="orderLineSetService.currentOrderLineSetCode && (!transactionLine.orderLineSetCode || transactionLine.orderLineSetCode === orderLineSetService.currentOrderLineSetCode)"
-              [checkboxValue]="orderLineSetService.currentOrderLineSetCode === transactionLine.orderLineSetCode"
-              (checkboxValueChanged)="handleCheckBoxValueChanged($event)">
+              [isFirst]="isFirst">
           <ng-container *ngIf="transactionLine.isArticle">
               <div class="transaction-line-wrapper">
                   <div *ngIf=!preview class="transaction-line-extended-wrapper">
@@ -57915,15 +57954,6 @@ class TransactionCustomerPortalLineComponent extends TransactionLineBaseComponen
         this.transactionService = transactionService;
         this.changeDetector = changeDetector;
     }
-    handleCheckBoxValueChanged(value) {
-        if (value) {
-            this.transactionLine.orderLineSetCode = this.orderLineSetService.currentOrderLineSetCode;
-        }
-        else {
-            this.transactionLine.orderLineSetCode = null;
-        }
-        this.transactionService.changeTransactionLineOrderLineSet(this.transactionInfo.uuid, this.transactionLine.uuid, this.transactionLine.orderLineSetCode);
-    }
     onDescriptionDblClick() {
         this.descriptionDblClick.emit();
     }
@@ -62432,6 +62462,32 @@ class TransactionSalesOrderQuotationLineComponent extends TransactionLineBaseCom
         super.ngOnInit();
         // this.transactionEventService.activeRubricChange.next({category: TransactionTypeCategory.SalesOrderMarginInfo});
     }
+    //divided into several if statements for readability
+    canShowCheckbox() {
+        if (!this.orderLineSetService.currentOrderLineSetCode) {
+            return false;
+        }
+        if (!this.transactionLine.orderLineSetCode) {
+            //We are now allowed to actually add new lines to a composition.
+            //If we're looking at members of a composition set don't show a checkbox for lines we can't add anyway.
+            return isNaN(this.orderLineSetService.currentCompositionId);
+        }
+        if (this.orderLineSetService.currentOrderLineSetCode === this.transactionLine.orderLineSetCode) {
+            return true;
+        }
+        if (this.orderLineSetService.currentCompositionId && this.orderLineSetService.currentCompositionId === this.transactionLine.compositionId) {
+            return true;
+        }
+        return false;
+    }
+    checkboxValue() {
+        if (isNaN(this.orderLineSetService.currentCompositionId)) {
+            return (this.orderLineSetService.currentOrderLineSetCode === this.transactionLine.orderLineSetCode);
+        }
+        else {
+            return (this.orderLineSetService.currentCompositionId === this.transactionLine.compositionId);
+        }
+    }
     handleCheckBoxValueChanged(value) {
         if (value) {
             this.transactionLine.orderLineSetCode = this.orderLineSetService.currentOrderLineSetCode;
@@ -62449,6 +62505,7 @@ class TransactionSalesOrderQuotationLineComponent extends TransactionLineBaseCom
         lineDiscountQuantum: this.cfgNames.LineDiscountQuantum
     };
     TransactionTypeCategory = TransactionTypeCategory;
+    isNaN = isNaN;
     static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.3.16", ngImport: i0, type: TransactionSalesOrderQuotationLineComponent, deps: [{ token: OrderLineSetService }, { token: TransactionHeaderService }, { token: TransactionLineService }, { token: TransactionEventService }, { token: IconCacheService }, { token: TransactionScreenConfigurationService }, { token: TransactionImageService }, { token: DictionaryService }, { token: TransactionService }, { token: i0.ChangeDetectorRef }], target: i0.ɵɵFactoryTarget.Component });
     static ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "17.0.0", version: "20.3.16", type: TransactionSalesOrderQuotationLineComponent, isStandalone: false, selector: "co-transaction-sales-order-quotation-line", inputs: { lineIndex: "lineIndex" }, host: { properties: { "class.co-transaction-sales-order-quotation-line": "this.showClass" } }, usesInheritance: true, ngImport: i0, template: `
     <co-transaction-base-line
@@ -62457,8 +62514,9 @@ class TransactionSalesOrderQuotationLineComponent extends TransactionLineBaseCom
       [transactionInfo]="transactionInfo"
       [transactionLine]="transactionLine"
       [selected]="selected"
-      [checkbox]="orderLineSetService.currentOrderLineSetCode && (!transactionLine.orderLineSetCode || transactionLine.orderLineSetCode === orderLineSetService.currentOrderLineSetCode)"
-      [checkboxValue]="orderLineSetService.currentOrderLineSetCode === transactionLine.orderLineSetCode"
+      [checkbox]="canShowCheckbox()"
+      [checkboxValue]="checkboxValue()"
+      [checkboxReadonly]="!isNaN(orderLineSetService.currentCompositionId)"
       (checkboxValueChanged)="handleCheckBoxValueChanged($event)">
       @if (transactionLine.isArticle && !preview) {
         <div class="transaction-line-wrapper">
@@ -62520,8 +62578,9 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.16", ngImpo
       [transactionInfo]="transactionInfo"
       [transactionLine]="transactionLine"
       [selected]="selected"
-      [checkbox]="orderLineSetService.currentOrderLineSetCode && (!transactionLine.orderLineSetCode || transactionLine.orderLineSetCode === orderLineSetService.currentOrderLineSetCode)"
-      [checkboxValue]="orderLineSetService.currentOrderLineSetCode === transactionLine.orderLineSetCode"
+      [checkbox]="canShowCheckbox()"
+      [checkboxValue]="checkboxValue()"
+      [checkboxReadonly]="!isNaN(orderLineSetService.currentCompositionId)"
       (checkboxValueChanged)="handleCheckBoxValueChanged($event)">
       @if (transactionLine.isArticle && !preview) {
         <div class="transaction-line-wrapper">
@@ -99715,7 +99774,6 @@ class TransactionCardMarginComponent extends TransactionLineBaseComponent {
       <div class="transaction-card-wrapper">
         <co-transaction-card-header
           [showActionButtons]="true"
-          [showCheckbox]="orderLineSetService.currentOrderLineSetCode && (!transactionLine.orderLineSetCode || transactionLine.orderLineSetCode === orderLineSetService.currentOrderLineSetCode)"
           [expanded]="expanded"
           (expandClicked)="expanded = !expanded">
         </co-transaction-card-header>
@@ -99823,7 +99881,6 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.16", ngImpo
       <div class="transaction-card-wrapper">
         <co-transaction-card-header
           [showActionButtons]="true"
-          [showCheckbox]="orderLineSetService.currentOrderLineSetCode && (!transactionLine.orderLineSetCode || transactionLine.orderLineSetCode === orderLineSetService.currentOrderLineSetCode)"
           [expanded]="expanded"
           (expandClicked)="expanded = !expanded">
         </co-transaction-card-header>
@@ -109407,6 +109464,9 @@ class TransactionCreateWizardComponent {
                 valid = await this._validateForArticleTransaction();
             }
             else if (this.transactionSection.oldOrderId && this.transactionSection.oldGoodId) {
+                if (!this._branch) {
+                    this.createService.currentBranch = await this.createService.getInternalDefault(InternalDefault.DefaultBranchServiceCustomerPortal);
+                }
                 this.stepTransactionSection.completed = await this.createService.createServiceOrderWithSourceOrderNrAndArticleDescription(this.transactionSection.oldOrderId, this.transactionSection.oldGoodId);
             }
             else if (this.transactionSection.slaProductName) {