@colijnit/transaction 261.20.48 → 261.20.50

package/fesm2022/colijnit-transaction.mjs

@@ -224,6 +224,7 @@ import { IonePaymentStatusCode } from '@colijnit/transactionapi/build/enum/ione-
 import { HttpClient } from '@angular/common/http';
 import { CashDrawersRequest } from '@colijnit/transactionapi/build/model/cash-drawers-request';
 import { PspType } from '@colijnit/transactionapi/build/enum/psp-type.enum';
+import { CalculateAmountToPayRequest } from '@colijnit/transactionapi/build/model/calculate-amount-to-pay-request';
 import { DateUtils } from '@colijnit/ioneconnector/build/utils/date-utils';
 import { ImageUtils } from '@colijnit/ioneconnector/build/utils/image-utils';
 import { FormsModule, ReactiveFormsModule } from '@angular/forms';
@@ -273,7 +274,6 @@ import { TrueFalseDbType } from '@colijnit/mainapi/build/enum/true-false-db-type
 import { OrderLineSetDTO } from '@colijnit/transactionapi/build/model/order-line-set-dto';
 import { TransactionAddOrderLineSetTextLineRequest } from '@colijnit/transactionapi/build/model/transaction-add-order-line-set-text-line-request';
 import { TransactionLineCopyRequest } from '@colijnit/transactionapi/build/model/transaction-line-copy-request.bo';
-import { CalculateAmountToPayRequest } from '@colijnit/transactionapi/build/model/calculate-amount-to-pay-request';
 import { ExternalCatalogAddArticleRequest } from '@colijnit/transactionapi/build/model/external-catalog-add-article-request';
 import { CopyTransactionRequest } from '@colijnit/transactionapi/build/model/copy-transaction-request';
 import { ArrayUtils } from '@colijnit/ioneconnector/build/utils/array-utils';
@@ -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.48";
-    publishDate = "10-6-2026, 11:16:03";
+    symVer = "261.20.50";
+    publishDate = "16/06/2026, 14:38:48";
 }
 
 class CheckoutModuleService extends BaseModuleService {
@@ -34648,6 +34648,7 @@ class TransactionPaymentService {
             }
             else {
                 pspTransactionUuid = await this._paymentConnectorService.doPayment(request);
+                await this._triggerCalculateAmountToPay();
             }
             if (pspTransactionUuid) {
                 this._paymentStatusPollIntervalCount = 0;
@@ -34660,6 +34661,9 @@ class TransactionPaymentService {
                 if (this.currentPaymentMethod.voucher) {
                     this._transactionEventService.posOrderVoucherPayment.next();
                 }
+                else {
+                    await this._triggerCalculateAmountToPay();
+                }
                 this._handlePayment(false);
                 if (this.amountToPay === 0) {
                     this._handlePayment();
@@ -34791,14 +34795,14 @@ class TransactionPaymentService {
             }
         });
     }
-    // private async _triggerCalculateAmountToPay(): Promise<void> {
-    //   const amountToPayRequest: CalculateAmountToPayRequest = new CalculateAmountToPayRequest();
-    //   amountToPayRequest.transactionUuid = this.transactionUuid;
-    //   amountToPayRequest.paymentMethodCode = this.currentPaymentMethod.code;
-    //   this._paymentConnectorService.calculateAmountToPay(amountToPayRequest).then((result: AmountToPay) => {
-    //     this.amountToPay = result.amountToPay;
-    //   });
-    // }
+    async _triggerCalculateAmountToPay() {
+        const amountToPayRequest = new CalculateAmountToPayRequest();
+        amountToPayRequest.transactionUuid = this.transactionUuid;
+        amountToPayRequest.paymentMethodCode = this.currentPaymentMethod.code;
+        this._paymentConnectorService.calculateAmountToPay(amountToPayRequest).then((result) => {
+            this.amountToPay = result.amountToPay;
+        });
+    }
     async _handleCashLimitCheck() {
         let payedAmount = await this._transactionService.getCashPaymentValueByTransId(this.transId);
         const limit = await this._transactionService.getCashLimitValue(InternalParam.ThresholdCashPaymentMessage);
@@ -41888,8 +41892,9 @@ class CashOnDeliveryModalComponent extends TransactionInputLineFieldBaseComponen
     changeAmountRequest = new ChangeHeaderCashOnDeliveryAmountRequest();
     icons = Icon;
     cashOnDeliveryAmount = 0;
-    ngOnInit() {
+    async ngOnInit() {
         this._getCashOnDeliveryData();
+        await this.lockTransaction();
     }
     updateCashOnDeliveryAmount() {
         this.cashOnDeliveryAmount = this.input.model;
@@ -41969,7 +41974,7 @@ class CashOnDeliveryModalComponent extends TransactionInputLineFieldBaseComponen
             #input
             [type]="'number'"
             [placeholder]="'CASH_ON_DELIVERY_AMOUNT' | localize"
-            [model]="cashOnDeliveryAmount" 
+            [model]="cashOnDeliveryAmount"
             [formatPipe]="currencyPipe"
             (keydown)="onEnterKey($event)">
           </co-input-text>
@@ -42051,7 +42056,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.16", ngImpo
             #input
             [type]="'number'"
             [placeholder]="'CASH_ON_DELIVERY_AMOUNT' | localize"
-            [model]="cashOnDeliveryAmount" 
+            [model]="cashOnDeliveryAmount"
             [formatPipe]="currencyPipe"
             (keydown)="onEnterKey($event)">
           </co-input-text>
@@ -42176,6 +42181,9 @@ class TransactionHeaderPopupPaymentComponent extends TransactionHeaderPopupBaseC
     }
     showCashOnDeliveryModal(value) {
         this.cashOnDeliveryModalVisible = value;
+        if (value === false) {
+            this.transactionEventService.headerPopupSaveButtonEnableChange.next(true);
+        }
     }
     getCashAmount(value) {
         this.cashOnDelivery = value;
@@ -42244,6 +42252,7 @@ class TransactionHeaderPopupPaymentComponent extends TransactionHeaderPopupBaseC
         super.transactionSet();
         this._getDepositInfo();
         this._getOutstandingAmounts();
+        this._getCashOnDeliveryData();
     }
     _getDepositInfo() {
         this._paymentConnectorService.getDepositPaymentInfo(this.transactionInfo.uuid).then((info) => {
@@ -42312,6 +42321,15 @@ class TransactionHeaderPopupPaymentComponent extends TransactionHeaderPopupBaseC
             this.chosenAmountToPay = 0;
         }
     }
+    _getCashOnDeliveryData() {
+        this.transactionService.getCashOnDeliveryData(this.transactionInfo.uuid)
+            .then((response) => {
+            if (response) {
+                this.cashOnDelivery = response.proposedCashOnDeliveryAmount;
+                this.changeDetector.detectChanges();
+            }
+        });
+    }
     static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.3.16", ngImport: i0, type: TransactionHeaderPopupPaymentComponent, deps: [{ token: TransactionHeaderService }, { token: TransactionEventService }, { token: TransactionService }, { token: IconCacheService }, { token: TransactionScreenConfigurationService }, { token: DictionaryService }, { token: TransactionImageService }, { token: i0.ChangeDetectorRef }, { token: TransactionDialogService }, { token: i1$1.FormMasterService }, { token: TransactionRelationService }, { token: TransactionPaymentConnectorService }], target: i0.ɵɵFactoryTarget.Component });
     static ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "17.0.0", version: "20.3.16", type: TransactionHeaderPopupPaymentComponent, isStandalone: false, selector: "co-transaction-header-popup-payment", host: { properties: { "class.co-transaction-header-popup-payment": "this.showClass" } }, usesInheritance: true, ngImport: i0, template: `
       <div class="transaction-header-popup-category-wrapper co-small-scrollbar">
@@ -42323,7 +42341,7 @@ class TransactionHeaderPopupPaymentComponent extends TransactionHeaderPopupBaseC
                 [textContent]="'TO_PAY_DOWN' | localize">
               </div>
             }
-      
+
             <div class="transaction-header-popup-two-column-grid">
               <co-transaction-header-deposit-percentage
                 [screenConfigurationObject]="cfgNames.DepositPercentage"
@@ -42338,7 +42356,7 @@ class TransactionHeaderPopupPaymentComponent extends TransactionHeaderPopupBaseC
                 (depositUpdated)="showOutstandingAmounts()">
               </co-transaction-header-deposit-amount>
             </div>
-      
+
             <div class="transaction-header-popup-three-column-grid">
               @if (transactionInfo.transactionKind !== transKind.PurchaseOrder) {
                 <co-transaction-header-use-deposit-rule
@@ -42365,7 +42383,7 @@ class TransactionHeaderPopupPaymentComponent extends TransactionHeaderPopupBaseC
                 </div>
               }
             </div>
-      
+
             <div class="transaction-header-popup-two-column-grid">
               <co-transaction-header-amount-to-settle
                 [screenConfigurationObject]="cfgNames.AmountToSettle"
@@ -42384,7 +42402,7 @@ class TransactionHeaderPopupPaymentComponent extends TransactionHeaderPopupBaseC
                 </co-input-text>
               </div>
             </div>
-      
+
             @if (showCashOnDelivery) {
               <div class="transaction-header-popup-two-column-grid">
                 <div class="cash-on-delivery-row">
@@ -42404,7 +42422,7 @@ class TransactionHeaderPopupPaymentComponent extends TransactionHeaderPopupBaseC
                 <div></div>
               </div>
             }
-      
+
             <div
               class="transaction-header-popup-two-column-grid"
               [screenConfigurationObject]="cfgNames.PaymentBtn"
@@ -42417,7 +42435,7 @@ class TransactionHeaderPopupPaymentComponent extends TransactionHeaderPopupBaseC
               }
             </div>
           </div>
-      
+
           @if (paymentAnalysis) {
             <div class="transaction-header-popup-section">
               <div class="transaction-header-popup-section-label" [textContent]="'TO_INVOICE' | localize"></div>
@@ -42439,7 +42457,7 @@ class TransactionHeaderPopupPaymentComponent extends TransactionHeaderPopupBaseC
               </div>
             </div>
           }
-      
+
           @if (orderPaymentAnalysis.length > 0) {
             <div class="payment-information">
               @if (showPaymentButton()) {
@@ -42570,7 +42588,7 @@ class TransactionHeaderPopupPaymentComponent extends TransactionHeaderPopupBaseC
             </div>
           }
         </co-form>
-      
+
         @if (cashOnDeliveryModalVisible) {
           <co-cash-on-delivery-modal
             [transactionInfoUuid]="transactionInfo.uuid"
@@ -42579,7 +42597,7 @@ class TransactionHeaderPopupPaymentComponent extends TransactionHeaderPopupBaseC
           </co-cash-on-delivery-modal>
         }
       </div>
-      
+
       @if (showPaymentDialog) {
         <co-dialog
           class="payment-dialog"
@@ -42621,7 +42639,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.16", ngImpo
                 [textContent]="'TO_PAY_DOWN' | localize">
               </div>
             }
-      
+
             <div class="transaction-header-popup-two-column-grid">
               <co-transaction-header-deposit-percentage
                 [screenConfigurationObject]="cfgNames.DepositPercentage"
@@ -42636,7 +42654,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.16", ngImpo
                 (depositUpdated)="showOutstandingAmounts()">
               </co-transaction-header-deposit-amount>
             </div>
-      
+
             <div class="transaction-header-popup-three-column-grid">
               @if (transactionInfo.transactionKind !== transKind.PurchaseOrder) {
                 <co-transaction-header-use-deposit-rule
@@ -42663,7 +42681,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.16", ngImpo
                 </div>
               }
             </div>
-      
+
             <div class="transaction-header-popup-two-column-grid">
               <co-transaction-header-amount-to-settle
                 [screenConfigurationObject]="cfgNames.AmountToSettle"
@@ -42682,7 +42700,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.16", ngImpo
                 </co-input-text>
               </div>
             </div>
-      
+
             @if (showCashOnDelivery) {
               <div class="transaction-header-popup-two-column-grid">
                 <div class="cash-on-delivery-row">
@@ -42702,7 +42720,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.16", ngImpo
                 <div></div>
               </div>
             }
-      
+
             <div
               class="transaction-header-popup-two-column-grid"
               [screenConfigurationObject]="cfgNames.PaymentBtn"
@@ -42715,7 +42733,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.16", ngImpo
               }
             </div>
           </div>
-      
+
           @if (paymentAnalysis) {
             <div class="transaction-header-popup-section">
               <div class="transaction-header-popup-section-label" [textContent]="'TO_INVOICE' | localize"></div>
@@ -42737,7 +42755,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.16", ngImpo
               </div>
             </div>
           }
-      
+
           @if (orderPaymentAnalysis.length > 0) {
             <div class="payment-information">
               @if (showPaymentButton()) {
@@ -42868,7 +42886,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.16", ngImpo
             </div>
           }
         </co-form>
-      
+
         @if (cashOnDeliveryModalVisible) {
           <co-cash-on-delivery-modal
             [transactionInfoUuid]="transactionInfo.uuid"
@@ -42877,7 +42895,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.16", ngImpo
           </co-cash-on-delivery-modal>
         }
       </div>
-      
+
       @if (showPaymentDialog) {
         <co-dialog
           class="payment-dialog"
@@ -49130,14 +49148,12 @@ class TransactionArticleTextComponent {
         let html = event.target.innerHTML ?? "";
         html = html.replace(/&nbsp;/g, " ");
         if (!html.trim()) {
-            this.transactionAddTextLineRequest.text = "<p></p>";
+            this.transactionAddTextLineRequest.text = "";
             return;
         }
         html = html.replace(/<div>/gi, "<p>");
         html = html.replace(/<\/div>/gi, "</p>");
         html = html.replace(/<p>\s*<br\s*\/?>\s*<\/p>/gi, "<p></p>");
-        html = html.replace(/<br\s*\/?>\s*<\/p>/gi, "</p><p></p>");
-        html = html.replace(/<br\s*\/?>/gi, "</p><p></p><p>");
         html = html.replace(/^([^<][\s\S]*?)(?=<p>|$)/i, (match) => {
             const text = match.trim();
             return text ? `<p>${text}</p>` : "";
@@ -49154,12 +49170,16 @@ class TransactionArticleTextComponent {
     updateWysiwyg() {
         if (!this.wysiwyg)
             return;
-        let txt = this.transactionAddTextLineRequest.text ?? "";
+        const txt = this.transactionAddTextLineRequest.text ?? "";
         const isEmpty = txt.trim().length === 0;
         const hasHtml = txt.includes("<");
-        if (isEmpty || !hasHtml) {
-            const wrapped = "<p>" + txt.replace(/\n/g, "</p><p>") + "</p>";
-            this.wysiwyg.nativeElement.innerHTML = wrapped;
+        if (isEmpty) {
+            this.wysiwyg.nativeElement.innerHTML = "";
+            return;
+        }
+        if (!hasHtml) {
+            this.wysiwyg.nativeElement.innerHTML =
+                "<p>" + txt.replace(/\n/g, "</p><p>") + "</p>";
         }
         else {
             this.wysiwyg.nativeElement.innerHTML = txt;
@@ -49168,13 +49188,15 @@ class TransactionArticleTextComponent {
     changeEditorMode() {
         this.editRawText = !this.editRawText;
         if (this.editRawText) {
-            let txt = this.transactionAddTextLineRequest.text;
-            if (!txt) {
-                txt = "";
+            let txt = this.transactionAddTextLineRequest.text ?? "";
+            if (!txt.trim().length) {
+                this.transactionAddTextLineRequest.text = "";
+                this.updateWysiwyg();
+                return;
             }
-            if (!txt.trim().length || !txt.includes("<")) {
-                const wrapped = "<p>" + txt.replace(/\n/g, "</p><p>") + "</p>";
-                this.transactionAddTextLineRequest.text = wrapped;
+            if (!txt.includes("<")) {
+                this.transactionAddTextLineRequest.text =
+                    "<p>" + txt.replace(/\n/g, "</p><p>") + "</p>";
                 this.updateWysiwyg();
             }
         }
@@ -66509,21 +66531,11 @@ class TransactionPurchaseOrderFilterContentLogisticsComponent extends Transactio
       <div class="filter-item-wrapper">
         <co-transaction-filter-item [placeholder]="'WAREHOUSE'"
                                     [collection]="warehouses"
-                                    [(model)]="searchService.searchRequest.warehouse"
-                                    [mode]="modes.SingleSelectList">
-        </co-transaction-filter-item>
-      </div>
-
-      <!--Bron magazijn-->
-      <div class="filter-item-wrapper">
-        <co-transaction-filter-item [placeholder]="'SOURCE_WAREHOUSE'"
-                                    [(model)]="searchService.searchRequest.sourceWarehouse"
-                                    [mode]="modes.Filterlist"
-                                    [collection]="sourceWarehouses"
-                                    (modelChange)="modelChange($event)">
+                                    [(model)]="searchService.searchRequest.rangeWarehouse"
+                                    [mode]="modes.Filterlist">
         </co-transaction-filter-item>
       </div>
-
+        
       <!--Levermethode-->
       <div class="filter-item-wrapper">
         <co-transaction-filter-item [placeholder]="'DELIVERY_METHOD'"
@@ -66674,21 +66686,11 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.16", ngImpo
       <div class="filter-item-wrapper">
         <co-transaction-filter-item [placeholder]="'WAREHOUSE'"
                                     [collection]="warehouses"
-                                    [(model)]="searchService.searchRequest.warehouse"
-                                    [mode]="modes.SingleSelectList">
-        </co-transaction-filter-item>
-      </div>
-
-      <!--Bron magazijn-->
-      <div class="filter-item-wrapper">
-        <co-transaction-filter-item [placeholder]="'SOURCE_WAREHOUSE'"
-                                    [(model)]="searchService.searchRequest.sourceWarehouse"
-                                    [mode]="modes.Filterlist"
-                                    [collection]="sourceWarehouses"
-                                    (modelChange)="modelChange($event)">
+                                    [(model)]="searchService.searchRequest.rangeWarehouse"
+                                    [mode]="modes.Filterlist">
         </co-transaction-filter-item>
       </div>
-
+        
       <!--Levermethode-->
       <div class="filter-item-wrapper">
         <co-transaction-filter-item [placeholder]="'DELIVERY_METHOD'"
@@ -66831,6 +66833,8 @@ class TransactionPurchaseOrderFilterContentOrderComponent extends TransactionFil
     workflowStatusFields = { text: "name", value: "name" };
     projectCodes;
     projectCodeFields = { text: "description", value: "description" };
+    withOrWithoutLines;
+    withOrWithoutLinesFields = { text: "description", value: "code" };
     transStartDate;
     transEndDate;
     deliveryStartDate;
@@ -66848,6 +66852,7 @@ class TransactionPurchaseOrderFilterContentOrderComponent extends TransactionFil
         this._setOrderDepositFullyPaid();
         this._setWorkFlowStatusNames();
         this._setAllProjectCodes();
+        this._setWithOrWithoutLines();
     }
     //Inkoper
     _setPurchasePersons() {
@@ -66918,6 +66923,11 @@ class TransactionPurchaseOrderFilterContentOrderComponent extends TransactionFil
             this.suppliers = new FilterViewmodel(relationListObjects, this.supplierFields).filterItems;
         });
     }
+    _setWithOrWithoutLines() {
+        this.transactionService.getYesNo("NL").then((withOrWithoutLines) => {
+            this.withOrWithoutLines = new FilterViewmodel(withOrWithoutLines, this.withOrWithoutLinesFields).filterItems;
+        });
+    }
     static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.3.16", ngImport: i0, type: TransactionPurchaseOrderFilterContentOrderComponent, deps: null, target: i0.ɵɵFactoryTarget.Component });
     static ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "14.0.0", version: "20.3.16", type: TransactionPurchaseOrderFilterContentOrderComponent, isStandalone: false, selector: "co-transaction-purchase-order-filter-content-order", host: { properties: { "class.co-transaction-search-filter-content": "this.showClass" } }, usesInheritance: true, ngImport: i0, template: `
     <div class="transaction-filter-content-order-wrapper transaction-filter-content-wrapper">
@@ -66930,6 +66940,15 @@ class TransactionPurchaseOrderFilterContentOrderComponent extends TransactionFil
         </co-transaction-filter-item>
       </div>
 
+      <div class="filter-item-wrapper">
+        <co-transaction-filter-item [placeholder]="'HAS_LINES'"
+                                    [(model)]="searchService.searchRequest.ordersWithOrWithoutLines"
+                                    [mode]="modes.Filterlist"
+                                    [collection]="withOrWithoutLines"
+                                    (activeFilterCountChange)="onActiveFilterCountChanged($event)">
+        </co-transaction-filter-item>
+      </div>
+
       <!--Orderdatum-->
       <div class="filter-item-wrapper">
         <co-transaction-filter-item [placeholder]="'ORDER_DATE'"
@@ -66937,7 +66956,7 @@ class TransactionPurchaseOrderFilterContentOrderComponent extends TransactionFil
                                     [mode]="modes.DateRangeField">
         </co-transaction-filter-item>
       </div>
-        
+
         <!--Leverancier-->
         <div class="filter-item-wrapper">
             <co-transaction-filter-item [placeholder]="'SUPPLIER'"
@@ -66947,7 +66966,7 @@ class TransactionPurchaseOrderFilterContentOrderComponent extends TransactionFil
                                         [mode]="modes.Filterlist">
             </co-transaction-filter-item>
         </div>
-        
+
       <!--Leverdatum-->
       <div class="filter-item-wrapper">
         <co-transaction-filter-item [placeholder]="'DELIVERY_DATE'"
@@ -67104,6 +67123,15 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.16", ngImpo
         </co-transaction-filter-item>
       </div>
 
+      <div class="filter-item-wrapper">
+        <co-transaction-filter-item [placeholder]="'HAS_LINES'"
+                                    [(model)]="searchService.searchRequest.ordersWithOrWithoutLines"
+                                    [mode]="modes.Filterlist"
+                                    [collection]="withOrWithoutLines"
+                                    (activeFilterCountChange)="onActiveFilterCountChanged($event)">
+        </co-transaction-filter-item>
+      </div>
+
       <!--Orderdatum-->
       <div class="filter-item-wrapper">
         <co-transaction-filter-item [placeholder]="'ORDER_DATE'"
@@ -67111,7 +67139,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.16", ngImpo
                                     [mode]="modes.DateRangeField">
         </co-transaction-filter-item>
       </div>
-        
+
         <!--Leverancier-->
         <div class="filter-item-wrapper">
             <co-transaction-filter-item [placeholder]="'SUPPLIER'"
@@ -67121,7 +67149,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.16", ngImpo
                                         [mode]="modes.Filterlist">
             </co-transaction-filter-item>
         </div>
-        
+
       <!--Leverdatum-->
       <div class="filter-item-wrapper">
         <co-transaction-filter-item [placeholder]="'DELIVERY_DATE'"
@@ -67895,8 +67923,8 @@ class TransactionSalesOrderFilterContentLogisticsComponent extends TransactionFi
       <div class="filter-item-wrapper">
         <co-transaction-filter-item [placeholder]="'WAREHOUSE'"
                                     [collection]="warehouses"
-                                    [(model)]="searchService.searchRequest.warehouse"
-                                    [mode]="modes.SingleSelectList"
+                                    [(model)]="searchService.searchRequest.rangeWarehouse"
+                                    [mode]="modes.Filterlist"
                                     (activeFilterCountChange)="onActiveFilterCountChanged($event)">
         </co-transaction-filter-item>
       </div>
@@ -68078,8 +68106,8 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.16", ngImpo
       <div class="filter-item-wrapper">
         <co-transaction-filter-item [placeholder]="'WAREHOUSE'"
                                     [collection]="warehouses"
-                                    [(model)]="searchService.searchRequest.warehouse"
-                                    [mode]="modes.SingleSelectList"
+                                    [(model)]="searchService.searchRequest.rangeWarehouse"
+                                    [mode]="modes.Filterlist"
                                     (activeFilterCountChange)="onActiveFilterCountChanged($event)">
         </co-transaction-filter-item>
       </div>
@@ -74045,8 +74073,8 @@ class TransactionSalesQuotationFilterContentLogisticsComponent extends Transacti
         <div class="filter-item-wrapper">
           <co-transaction-filter-item [placeholder]="'WAREHOUSE'"
                                       [collection]="warehouses"
-                                      [(model)]="searchRequest.warehouse"
-                                      [mode]="modes.SingleSelectList">
+                                      [(model)]="searchRequest.rangeWarehouse"
+                                      [mode]="modes.Filterlist">
           </co-transaction-filter-item>
         </div>
 
@@ -74099,8 +74127,8 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.16", ngImpo
         <div class="filter-item-wrapper">
           <co-transaction-filter-item [placeholder]="'WAREHOUSE'"
                                       [collection]="warehouses"
-                                      [(model)]="searchRequest.warehouse"
-                                      [mode]="modes.SingleSelectList">
+                                      [(model)]="searchRequest.rangeWarehouse"
+                                      [mode]="modes.Filterlist">
           </co-transaction-filter-item>
         </div>
 
@@ -74777,8 +74805,8 @@ class TransactionCashDeskFilterContentLogisticsComponent extends TransactionFilt
       <div class="filter-item-wrapper">
         <co-transaction-filter-item [placeholder]="'WAREHOUSE'"
                                     [collection]="warehouses"
-                                    [(model)]="searchService.searchRequest.warehouse"
-                                    [mode]="modes.SingleSelectList">
+                                    [(model)]="searchService.searchRequest.rangeWarehouse"
+                                    [mode]="modes.Filterlist">
         </co-transaction-filter-item>
       </div>
 
@@ -74926,8 +74954,8 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.16", ngImpo
       <div class="filter-item-wrapper">
         <co-transaction-filter-item [placeholder]="'WAREHOUSE'"
                                     [collection]="warehouses"
-                                    [(model)]="searchService.searchRequest.warehouse"
-                                    [mode]="modes.SingleSelectList">
+                                    [(model)]="searchService.searchRequest.rangeWarehouse"
+                                    [mode]="modes.Filterlist">
         </co-transaction-filter-item>
       </div>
 
@@ -76341,8 +76369,8 @@ class TransactionServiceOrderFilterContentLogisticsComponent extends Transaction
       <div class="filter-item-wrapper">
         <co-transaction-filter-item [placeholder]="'WAREHOUSE'"
                                     [collection]="warehouses"
-                                    [(model)]="searchService.searchRequest.warehouse"
-                                    [mode]="modes.SingleSelectList">
+                                    [(model)]="searchService.searchRequest.rangeWarehouse"
+                                    [mode]="modes.Filterlist">
         </co-transaction-filter-item>
       </div>
 
@@ -76490,8 +76518,8 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.16", ngImpo
       <div class="filter-item-wrapper">
         <co-transaction-filter-item [placeholder]="'WAREHOUSE'"
                                     [collection]="warehouses"
-                                    [(model)]="searchService.searchRequest.warehouse"
-                                    [mode]="modes.SingleSelectList">
+                                    [(model)]="searchService.searchRequest.rangeWarehouse"
+                                    [mode]="modes.Filterlist">
         </co-transaction-filter-item>
       </div>
 
@@ -103425,6 +103453,7 @@ class DialogTransactionLineWarehouseCcComponent extends DialogBaseComponent {
     iconCacheService;
     transactionHeaderService;
     transactionLineService;
+    transactionService;
     articleService;
     icons = Icon;
     tab = WarehouseCCTab;
@@ -103447,6 +103476,7 @@ class DialogTransactionLineWarehouseCcComponent extends DialogBaseComponent {
     transactionInfo;
     transactionLine;
     reason;
+    articleName;
     showDirectSell = false;
     directSellSupplier;
     directSellPurchaseOrderNumber;
@@ -103456,11 +103486,12 @@ class DialogTransactionLineWarehouseCcComponent extends DialogBaseComponent {
     chosenConversionUnit;
     conversionAmount;
     TransactionKind = TransactionKind;
-    constructor(iconCacheService, transactionHeaderService, transactionLineService, articleService) {
+    constructor(iconCacheService, transactionHeaderService, transactionLineService, transactionService, articleService) {
         super();
         this.iconCacheService = iconCacheService;
         this.transactionHeaderService = transactionHeaderService;
         this.transactionLineService = transactionLineService;
+        this.transactionService = transactionService;
         this.articleService = articleService;
     }
     async ngOnInit() {
@@ -103470,6 +103501,7 @@ class DialogTransactionLineWarehouseCcComponent extends DialogBaseComponent {
         if (this.transactionLine) {
             this.transactionLineService.transactionLine = this.transactionLine;
             this.transactionLineService.transactionLine.visible = true;
+            await this.setArticleName();
         }
         if (this.transactionInfo && this.transactionLine) {
             this.articleService.getConversionUnitsForDefaultArticleUnitByGoodIdAndTransactionKind(this.transactionLine.goodId, this.transactionInfo.transactionKind).then((units) => {
@@ -103601,8 +103633,16 @@ class DialogTransactionLineWarehouseCcComponent extends DialogBaseComponent {
     _scrollIntoView(element) {
         element.scrollIntoView({ behavior: 'smooth', block: 'start' });
     }
+    async setArticleName() {
+        if (this.transactionKind === 'I') {
+            this.articleName = this.transactionLine.defaultPurchaseDescription;
+            return;
+        }
+        const article = await this.transactionService.getArticleExtended(this.transactionLine.articleNumber);
+        this.articleName = article?.salesDescription || this.transactionLine.defaultPurchaseDescription;
+    }
     model = model;
-    static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.3.16", ngImport: i0, type: DialogTransactionLineWarehouseCcComponent, deps: [{ token: IconCacheService }, { token: TransactionHeaderService }, { token: TransactionLineService }, { token: ArticleService }], target: i0.ɵɵFactoryTarget.Component });
+    static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.3.16", ngImport: i0, type: DialogTransactionLineWarehouseCcComponent, deps: [{ token: IconCacheService }, { token: TransactionHeaderService }, { token: TransactionLineService }, { token: TransactionService }, { token: ArticleService }], target: i0.ɵɵFactoryTarget.Component });
     static ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "17.0.0", version: "20.3.16", type: DialogTransactionLineWarehouseCcComponent, isStandalone: false, selector: "co-dialog-transaction-line-warehouse-cc", inputs: { transactionKind: "transactionKind" }, outputs: { close: "close" }, host: { properties: { "class.co-dialog-transaction-line-warehouse-cc": "this.showClass" } }, providers: [
             TransactionHeaderService,
             TransactionLineService
@@ -103694,8 +103734,7 @@ class DialogTransactionLineWarehouseCcComponent extends DialogBaseComponent {
           @if (transactionLine) {
             <div class="article-name">
               <span [textContent]="'FOR' | localize"></span>
-              &nbsp;
-              <span [textContent]=" transactionLine.defaultPurchaseDescription"></span>
+              &nbsp;<span [textContent]="articleName"></span>
             </div>
           }
           @if (reason) {
@@ -103807,8 +103846,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.16", ngImpo
           @if (transactionLine) {
             <div class="article-name">
               <span [textContent]="'FOR' | localize"></span>
-              &nbsp;
-              <span [textContent]=" transactionLine.defaultPurchaseDescription"></span>
+              &nbsp;<span [textContent]="articleName"></span>
             </div>
           }
           @if (reason) {
@@ -103834,7 +103872,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.16", ngImpo
                     encapsulation: ViewEncapsulation.None,
                     standalone: false
                 }]
-        }], ctorParameters: () => [{ type: IconCacheService }, { type: TransactionHeaderService }, { type: TransactionLineService }, { type: ArticleService }], propDecorators: { general: [{
+        }], ctorParameters: () => [{ type: IconCacheService }, { type: TransactionHeaderService }, { type: TransactionLineService }, { type: TransactionService }, { type: ArticleService }], propDecorators: { general: [{
                 type: ViewChild,
                 args: ['general']
             }], directSell: [{