@colijnit/transaction 256.1.2 → 256.1.4

package/fesm2015/colijnit-transaction.js

@@ -87,6 +87,7 @@ import { RelationListObject } from '@colijnit/relationapi/build/model/relation-l
 import { BranchLov } from '@colijnit/relationapi/build/model/branch-lov.bo';
 import { Address } from '@colijnit/relationapi/build/model/address.bo';
 import { RelationSmallObject } from '@colijnit/mainapi/build/model/relation-small-object.bo';
+import { SupplierLightObject } from '@colijnit/relationapi/build/model/supplier-light-object.bo';
 import { Articles } from '@colijnit/articleapi/build/articles';
 import { StockLocation } from '@colijnit/articleapi/build/model/stock-location.bo';
 import { ArticleExtendedRequest } from '@colijnit/articleapi/build/model/article-extended-request';
@@ -277,8 +278,8 @@ class Version {
     constructor() {
         this.name = "@colijnit/transaction";
         this.description = "Colijn IT transaction package";
-        this.symVer = "256.1.2";
-        this.publishDate = "21-10-2024 09:58:53";
+        this.symVer = "256.1.4";
+        this.publishDate = "23-10-2024 11:11:51";
     }
 }
 
@@ -1691,6 +1692,18 @@ class TransactionRelationConnectorService {
             }
         });
     }
+    getSupplierLightById(supplierId) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const result = yield this.connector.getSupplierLightById(supplierId);
+            if (result.validationResult && result.validationResult.success) {
+                return this._boFactory.makeWithRawBackendData(SupplierLightObject, result.resultObject);
+            }
+            else {
+                this._handleExceptionFromResponse(result);
+                return null;
+            }
+        });
+    }
     getRelationListObjects(relationRequest) {
         return __awaiter(this, void 0, void 0, function* () {
             const result = yield this.connector.getRelationListObjects(relationRequest);
@@ -5581,6 +5594,18 @@ class TransactionConnectorAdapterService {
             }
         });
     }
+    getReportHeadersByTransIdAndLayoutCode(transId, documentCode) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const response = yield this.connector.getReportHeadersByTransIdAndLayoutCode(transId, documentCode);
+            if (response && response.validationResult && response.validationResult.success) {
+                return this._boFactory.makeBOArrayFromRawBackendDataArray(HistoricReport, response.resultObject);
+            }
+            else {
+                this._handleExceptionFromResponse(response);
+                return null;
+            }
+        });
+    }
     getPackageStickerPrintLayouts() {
         return __awaiter(this, void 0, void 0, function* () {
             const response = yield this.mainConnector.getPackageStickerPrintLayouts();
@@ -6647,37 +6672,55 @@ class TransactionConnectorService {
     }
     getCommissionCodes(languageCode) {
         return __awaiter(this, void 0, void 0, function* () {
-            const domainName = DomainName.CommissionCode;
-            return this._selectMultipleParameterizedCacheService.requestCache(CoDomainValue, (languageCode, domainName) => {
-                return this._adapterService.getCommissionCodes(languageCode);
-            }).getValue(languageCode, domainName);
+            //const domainName: DomainName = DomainName.CommissionCode;
+            //return this._selectMultipleParameterizedCacheService.requestCache<CoDomainValue>(CoDomainValue, (languageCode: string, domainName: DomainName) => {
+            return this._adapterService.getCommissionCodes(languageCode);
+            //}).getValue(languageCode, domainName);
         });
     }
     getInOutCollection(languageCode) {
         return __awaiter(this, void 0, void 0, function* () {
+            //const domainName: DomainName = DomainName.InOutCollection;
+            //return this._selectMultipleParameterizedCacheService.requestCache<CoDomainValue>(CoDomainValue, (languageCode: string, domainName: DomainName) => {
             return this._adapterService.getInOutCollection(languageCode);
+            //}).getValue(languageCode, domainName);
         });
     }
     getYesNoCollection(languageCode) {
         return __awaiter(this, void 0, void 0, function* () {
+            //const domainName: DomainName = DomainName.YesNo;
+            //return this._selectMultipleParameterizedCacheService.requestCache<CoDomainValue>(CoDomainValue, (languageCode: string, domainName: DomainName) => {
             return this._adapterService.getYesNoCollection(languageCode);
+            //}).getValue(languageCode, domainName);
         });
     }
     getPriceKindCollection(languageCode) {
         return __awaiter(this, void 0, void 0, function* () {
+            //const domainName: DomainName = DomainName.PriceKind;
+            //return this._selectMultipleParameterizedCacheService.requestCache<CoDomainValue>(CoDomainValue, (languageCode: string, domainName: DomainName) => {
             return this._adapterService.getPriceKindCollection(languageCode);
+            //}).getValue(languageCode, domainName);
         });
     }
     getPriorityCollection(languageCode) {
         return __awaiter(this, void 0, void 0, function* () {
+            // const domainName: DomainName = DomainName.Priority;
+            //return this._selectMultipleParameterizedCacheService.requestCache<CoDomainValue>(CoDomainValue, (languageCode: string, domainName: DomainName) => {
             return this._adapterService.getPriorityCollection(languageCode);
+            // }).getValue(languageCode, domainName);
         });
     }
     getEntryTypes(languageCode) {
+        // const domainName: DomainName = DomainName.ServiceCommunicationType;
+        //return this._selectMultipleParameterizedCacheService.requestCache<CoDomainValue>(CoDomainValue, (languageCode: string, domainName: DomainName) => {
         return this._adapterService.getEntryTypes(languageCode);
+        //}).getValue(languageCode, domainName);
     }
     getDomainTypes(languageCode) {
+        // const domainName: DomainName = DomainName.TransType;
+        // return this._selectMultipleParameterizedCacheService.requestCache<CoDomainValue>(CoDomainValue, (languageCode: string, domainName: DomainName) => {
         return this._adapterService.getDomainTypes(languageCode);
+        //}).getValue(languageCode, domainName);
     }
     getCauseCodes() {
         return this._adapterService.getCauseCodes();
@@ -7582,6 +7625,11 @@ class TransactionConnectorService {
             return yield this._adapterService.getHistoricDocuments(transId, documentCode);
         });
     }
+    getReportHeadersByTransIdAndLayoutCode(transId, documentCode) {
+        return __awaiter(this, void 0, void 0, function* () {
+            return yield this._adapterService.getReportHeadersByTransIdAndLayoutCode(transId, documentCode);
+        });
+    }
     getPackageStickerPrintLayouts() {
         return __awaiter(this, void 0, void 0, function* () {
             return yield this._adapterService.getPackageStickerPrintLayouts();
@@ -8308,12 +8356,14 @@ class TransactionBaseComponent {
     get transactionLine() {
         return this._transactionLine;
     }
-    set transactionMarginInfo(marginInfo) {
-        this._transactionMarginInfo = marginInfo;
-    }
-    get transactionMarginInfo() {
-        return this._transactionMarginInfo;
-    }
+    // @Input()
+    // public set transactionMarginInfo(marginInfo: TransactionMarginInfo) {
+    //   this._transactionMarginInfo = marginInfo;
+    // }
+    //
+    // public get transactionMarginInfo(): TransactionMarginInfo {
+    //   return this._transactionMarginInfo;
+    // }
     set transactionInfo(value) {
         if (value) {
             this.headerReadonly = false;
@@ -8509,7 +8559,6 @@ TransactionBaseComponent.propDecorators = {
     forceWritable: [{ type: Input }],
     transaction: [{ type: Input }],
     transactionLine: [{ type: Input }],
-    transactionMarginInfo: [{ type: Input }],
     transactionInfo: [{ type: Input }],
     orderLineSets: [{ type: Input }],
     transactionTotal: [{ type: Input }],
@@ -9260,6 +9309,11 @@ class TransactionRelationService {
         return this._adapterService.getSupplierFullObject(relationNo);
         // }).getValue();
     }
+    getSupplierLightById(supplierId) {
+        // return this._selectSingleCacheService.requestCache<SupplierFullObject>(SupplierFullObject, relationNo, () => {
+        return this._adapterService.getSupplierLightById(supplierId);
+        // }).getValue();
+    }
     insertAddress(address) {
         return this._adapterService.insertAddress(address);
     }
@@ -9457,6 +9511,7 @@ class TransactionBaseService extends BaseModuleService {
         this.transactionUpdated = new BehaviorSubject(undefined);
         this.relationUpdated = new BehaviorSubject(undefined);
         this.transactionKindSet = new BehaviorSubject(false);
+        this.transactionMargeViewClicked = new Subject();
         this.currentBranch = "1"; // current user branch, needs to be set before we can do anything with transactions
         this.autoSave = false;
         this.manualSaveParam = false;
@@ -9464,6 +9519,14 @@ class TransactionBaseService extends BaseModuleService {
         this.invoiceAddressSameAsDelivery = true;
         this.getRelationOnRememberCurrentTransaction = true;
         this.currentTransaction = new TransactionInfoResponse();
+        /*public set cashRegistersDirty(value: boolean) {
+          this._cashRegistersDirty = value;
+          //this.transactionEventService.transactionDirty.next(this._transactionDirty);
+        }
+      
+        public get cashRegistersDirty(): boolean {
+          return this._cashRegistersDirty;
+        }*/
         this.purchasePortalLine = [];
         this.docDeliveryBatch = new DocDeliveryBatch();
         this.internalParameterAllowsDropShipment = false;
@@ -9489,6 +9552,7 @@ class TransactionBaseService extends BaseModuleService {
         this._invoiceCompleted = false;
         this._alreadyLocked = false;
         this._transactionDirty = false;
+        this._cashRegistersDirty = false;
         this._salesOrderConfirmationSent = false;
         this._subs = [];
     }
@@ -9518,6 +9582,12 @@ class TransactionBaseService extends BaseModuleService {
     get transactionKind() {
         return this._transactionKind;
     }
+    set transactionLocalMarginInfo(marginInfo) {
+        this._transactionMarginInfo = marginInfo;
+    }
+    get transactionLocalMarginInfo() {
+        return this._transactionMarginInfo;
+    }
     set purchaseOrdersCompleted(value) {
         this._purchaseOrdersCompleted = value;
         this.transactionEventService.salesOrderGeneratePurchaseOrdersCompletedChanged.next(this._purchaseOrdersCompleted);
@@ -9876,6 +9946,13 @@ class TransactionBaseService extends BaseModuleService {
         this._alreadyLocked = false;
         this.transactionDirty = false;
     }
+    loadTransactionMargeInfoList(uuid) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (uuid) {
+                return yield this.connector.getTransactionMarginInfo(uuid);
+            }
+        });
+    }
     _handleBeforeRememberCurrentTransaction(transactionInfoResponse) {
         return Promise.resolve();
     }
@@ -9944,8 +10021,9 @@ class TransactionBaseService extends BaseModuleService {
                 this.currentTransaction.transactionInfo.transactionKind === TransactionKind.SalesQuotation);
     }
 }
+TransactionBaseService.ɵprov = i0.ɵɵdefineInjectable({ factory: function TransactionBaseService_Factory() { return new TransactionBaseService(i0.ɵɵinject(TransactionSettingsService), i0.ɵɵinject(DialogService), i0.ɵɵinject(TransactionConnectorService), i0.ɵɵinject(ArticleConnectorService), i0.ɵɵinject(DictionaryService), i0.ɵɵinject(TransactionEventService), i0.ɵɵinject(TransactionRelationService), i0.ɵɵinject(TransactionScreenConfigurationService), i0.ɵɵinject(i9.RelationService), i0.ɵɵinject(i10.SharedService)); }, token: TransactionBaseService, providedIn: "root" });
 TransactionBaseService.decorators = [
-    { type: Injectable }
+    { type: Injectable, args: [{ providedIn: "root" },] }
 ];
 TransactionBaseService.ctorParameters = () => [
     { type: TransactionSettingsService },
@@ -9958,7 +10036,10 @@ TransactionBaseService.ctorParameters = () => [
     { type: TransactionScreenConfigurationService },
     { type: RelationService },
     { type: SharedService }
-];
+];
+TransactionBaseService.propDecorators = {
+    transactionLocalMarginInfo: [{ type: Input }]
+};
 
 class PendingReasonService extends TransactionBaseService {
     cancelAddTransactionLine(lineUuid) {
@@ -12154,6 +12235,11 @@ class TransactionService extends PendingReasonService {
             return yield this.connector.getHistoricDocuments(transId, documentCode);
         });
     }
+    getReportHeadersByTransIdAndLayoutCode(transId, documentCode) {
+        return __awaiter(this, void 0, void 0, function* () {
+            return yield this.connector.getReportHeadersByTransIdAndLayoutCode(transId, documentCode);
+        });
+    }
     undoDeliveryByReportId(reportId) {
         return __awaiter(this, void 0, void 0, function* () {
             return yield this.connector.undoDeliveryByReportId(reportId);
@@ -12684,12 +12770,28 @@ class CheckoutComponent {
             if (this.checkoutRelation && this.stepRelation) {
                 const valid = this.checkoutRelation.submit();
                 if (valid) {
+                    this.checkForAndSetSearchAddress();
                     this.stepRelation.completed = yield this.saveRelation();
                 }
                 return valid;
             }
         });
     }
+    //If a relation has no search address set the first active address to be such.
+    checkForAndSetSearchAddress() {
+        if (this.service.relation.activeAddresses.length > 0) {
+            let searchAddressFound = false;
+            this.service.relation.activeAddresses.forEach(address => {
+                if (address.searchAddress) {
+                    searchAddressFound = true;
+                    return;
+                }
+            });
+            if (!searchAddressFound) {
+                this.service.relation.activeAddresses[0].searchAddress = true;
+            }
+        }
+    }
     handleDeliveryValidation() {
         return __awaiter(this, void 0, void 0, function* () {
             if (this.checkoutDelivery && this.stepDelivery) {
@@ -16523,6 +16625,8 @@ class TransactionSearchService {
             [TransactionKind.CashDesk, "SEARCH_NUMBER_OR_CUSTOMER"]
         ]);
         this.transactionsPerPage = 20;
+        this.resultSubject = new BehaviorSubject(false);
+        this.resultsUpdated = this.resultSubject.asObservable();
         this._currentPage = 1;
         this._transactionType = TransactionKind.SalesOrder;
         this._subs = [];
@@ -16578,6 +16682,7 @@ class TransactionSearchService {
                 var _a, _b;
                 this.transactions = (_a = result.transactions) !== null && _a !== void 0 ? _a : [];
                 this.resultCount = (_b = result.count) !== null && _b !== void 0 ? _b : undefined;
+                this.resultSubject.next(true);
             });
             this.setPreviousSearchRequest();
         });
@@ -17095,25 +17200,6 @@ class TransactionSearchSalesOrderTileComponent extends TransactionSearchTileBase
             statusBarGF: this.cfgNames.StatusBarGF
         };
         this.showAvatar = true;
-        this.selectedTransactions = [];
-    }
-    onTransactionSelected(checked) {
-        return __awaiter(this, void 0, void 0, function* () {
-            console.log(checked);
-            console.log(this.transaction);
-            // save selected transactions
-            if (checked) {
-                this.selectedTransactions.push(this.transaction);
-            }
-            else {
-                // const transId = this.transaction.id;
-                // const index = this.selectedTransactions.findIndex(transaction => transaction.id === transId);
-                // if (index !== -1) {
-                //   this.selectedTransactions.splice(index, 1);
-                // }
-            }
-            console.log(this.selectedTransactions);
-        });
     }
 }
 TransactionSearchSalesOrderTileComponent.decorators = [
@@ -17786,7 +17872,7 @@ class TransactionSendDocumentsComponent extends TransactionBaseComponent {
         super.ngOnDestroy();
     }
     getHistoricDocuments() {
-        this.transactionService.getHistoricDocuments(this.transactionInfo.id, this.getLayoutCode())
+        this.transactionService.getReportHeadersByTransIdAndLayoutCode(this.transactionInfo.id, this.getLayoutCode())
             .then((result) => {
             if (result) {
                 this.historicReports = result;
@@ -22138,7 +22224,7 @@ TransactionQuickAccessPickedComponent.propDecorators = {
 };
 
 class TransactionSalesOverviewButtonBarButtonComponent extends TransactionButtonBarButtonBaseComponent {
-    constructor(iconCacheService, _transactionEventService, _mappingService, _dictionaryService, _screenConfigService, _transactionService, _elementRef, _renderer) {
+    constructor(iconCacheService, _transactionEventService, _mappingService, _dictionaryService, _screenConfigService, _transactionService, _elementRef, _renderer, _transactionBaseService) {
         super();
         this.iconCacheService = iconCacheService;
         this._transactionEventService = _transactionEventService;
@@ -22148,6 +22234,7 @@ class TransactionSalesOverviewButtonBarButtonComponent extends TransactionButton
         this._transactionService = _transactionService;
         this._elementRef = _elementRef;
         this._renderer = _renderer;
+        this._transactionBaseService = _transactionBaseService;
         this.icons = Icon;
         this.category = TransactionTypeCategory;
         this.cfgNames = TransactionCfgName;
@@ -22203,6 +22290,7 @@ class TransactionSalesOverviewButtonBarButtonComponent extends TransactionButton
             overviewButton.title = "MARGINS";
             overviewButton.category = TransactionTypeCategory.SalesOrderMarginInfo;
             this.buttonClicked.next(overviewButton);
+            this._transactionBaseService.transactionMargeViewClicked.next(true);
         }
         else {
             const marginButton = this._mappingService.getButtonBar(TransactionKind.SalesOrder)
@@ -22249,7 +22337,8 @@ TransactionSalesOverviewButtonBarButtonComponent.ctorParameters = () => [
     { type: TransactionScreenConfigurationService },
     { type: TransactionService },
     { type: ElementRef },
-    { type: Renderer2 }
+    { type: Renderer2 },
+    { type: TransactionService }
 ];
 TransactionSalesOverviewButtonBarButtonComponent.propDecorators = {
     showClass: [{ type: HostBinding, args: ['class.co-transaction-sales-overview-button-bar-button',] }]
@@ -24822,12 +24911,13 @@ TransactionSalesPlanningButtonBarButtonComponent.propDecorators = {
 };
 
 class TransactionMarginInfoLineComponent extends TransactionBaseComponent {
-    constructor(transactionEventService, iconCacheService, screenConfigService, orderLineSetService, imageService, dictionaryService, transactionService, changeDetector) {
+    constructor(transactionEventService, iconCacheService, screenConfigService, orderLineSetService, _transactionBaseService, imageService, dictionaryService, transactionService, changeDetector) {
         super(transactionEventService, iconCacheService, screenConfigService, imageService, dictionaryService, transactionService, changeDetector);
         this.transactionEventService = transactionEventService;
         this.iconCacheService = iconCacheService;
         this.screenConfigService = screenConfigService;
         this.orderLineSetService = orderLineSetService;
+        this._transactionBaseService = _transactionBaseService;
         this.imageService = imageService;
         this.dictionaryService = dictionaryService;
         this.transactionService = transactionService;
@@ -24865,13 +24955,9 @@ class TransactionMarginInfoLineComponent extends TransactionBaseComponent {
     handleMouseLeave(event) {
         this.mouseOver = false;
     }
-    ngAfterViewInit() {
-        if (!this.transactionMarginInfo.lineMarginInfos) {
-            this.transactionService.getTransactionMarginInfo(this.transactionInfo.uuid).then(marginInfo => {
-                this.transactionMarginInfo = marginInfo;
-                this.lineMarginInfo = marginInfo.lineMarginInfos.find(line => line.lineNr === this.transactionLine.lineNr);
-            });
-        }
+    get lineMarginInfo() {
+        return this._transactionBaseService.transactionLocalMarginInfo.lineMarginInfos.find(line => line.lineNr === this.transactionLine.lineNr);
+        ;
     }
     handleCheckBoxValueChanged(value) {
         if (value) {
@@ -24890,97 +24976,101 @@ TransactionMarginInfoLineComponent.decorators = [
     { type: Component, args: [{
                 selector: "co-transaction-overview-line",
                 template: `
-      <co-transaction-base-line
-              [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)"
-              observeVisibility #observer=visibilityObserve
-              (visibilityChange)="handleVisibilityChange(transactionLine, $event)">
-          <ng-container *ngIf="transactionLine.isArticle">
-              <div class="transaction-line-wrapper">
-                  <div *ngIf=!preview class="transaction-line-extended-wrapper">
-                      <div class="column1">
+    <co-transaction-base-line
+      [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)"
+      observeVisibility #observer=visibilityObserve
+      (visibilityChange)="handleVisibilityChange(transactionLine, $event)">
+      <ng-container *ngIf="transactionLine.isArticle">
+        <div class="transaction-line-wrapper">
+          <div *ngIf=!preview class="transaction-line-extended-wrapper">
+            <div class="column1">
                           <span class="transaction-field-label" [textContent]="'COMMISSION_CODE' | localize"
                                 *ngIf="isFirst"></span>
-                          <co-transaction-line-commission-button
-                                  [screenConfigurationObject]="cfgNames.LineCommission"
-                                  [transactionLine]="transactionLine"
-                                  [transactionInfo]="transactionInfo"
-                          ></co-transaction-line-commission-button>
-                      </div>
-                      <div class="column2">
+              <co-transaction-line-commission-button
+                [screenConfigurationObject]="cfgNames.LineCommission"
+                [transactionLine]="transactionLine"
+                [transactionInfo]="transactionInfo"
+              ></co-transaction-line-commission-button>
+            </div>
+            <div class="column2">
                           <span class="transaction-field-label" [textContent]="'WAREHOUSE_AND_STATUS' | localize"
                                 *ngIf="isFirst"></span>
-                          <co-transaction-line-warehouse-button
-                                  [screenConfigurationObject]="cfgNames.LineWarehouse"
-                                  [transactionLine]="transactionLine"
-                                  [transactionInfo]="transactionInfo"
-                          ></co-transaction-line-warehouse-button>
-                          <co-transaction-line-statusbar
-                                  [screenConfigurationObject]="cfgNames.StatusBar"
-                                  [configNames]="statusBarConfigNames"
-                                  [transactionInfo]="transactionInfo"
-                                  [transactionLine]="transactionLine"
-                                  [activeCategory]="category.SalesOrderOverview"></co-transaction-line-statusbar>
-                      </div>
-                      <div class="column3">
+              <co-transaction-line-warehouse-button
+                [screenConfigurationObject]="cfgNames.LineWarehouse"
+                [transactionLine]="transactionLine"
+                [transactionInfo]="transactionInfo"
+              ></co-transaction-line-warehouse-button>
+              <co-transaction-line-statusbar
+                [screenConfigurationObject]="cfgNames.StatusBar"
+                [configNames]="statusBarConfigNames"
+                [transactionInfo]="transactionInfo"
+                [transactionLine]="transactionLine"
+                [activeCategory]="category.SalesOrderOverview"></co-transaction-line-statusbar>
+            </div>
+            <div class="column3">
                           <span class="transaction-field-label" [textContent]="'DELIVERY_INFORMATION' | localize"
                                 *ngIf="isFirst"></span>
-                          <co-transaction-line-delivery-button
-                                  [screenConfigurationObject]="cfgNames.LineDeliveryMethod"
-                                  [transactionLine]="transactionLine"
-                                  [transactionInfo]="transactionInfo"
-                          ></co-transaction-line-delivery-button>
-                          <co-transaction-line-delivery-date-button class="transaction-line-delivery-date two-column"
-                                                                    [screenConfigurationObject]="cfgNames.LineDeliveryDate"
-                                                                    [transactionInfo]="transactionInfo"
-                                                                    [transactionLine]="transactionLine"
-                          ></co-transaction-line-delivery-date-button>
-                      </div>
-                  </div>
-                  <div class="transaction-margin-section">
-                    <div class="transaction-line-section">
-                      <span class="transaction-field-label" *ngIf="isFirst" [textContent]="'NET_PURCHASE' | localize"></span>
-                      <co-editable-label class="transaction-line-totals-total price"
-                                         [model]="lineMarginInfo?.calculationFactor | coCurrency: true"
-                                         [editModel]="transactionLine.displayNetLineTotal"
-                                         [readonly]="true"
-                      ></co-editable-label>
-                    </div>
-                    <div class="transaction-line-section">
-                      <span class="transaction-field-label" *ngIf="isFirst" [textContent]="'GROSS_PROFIT_PERCENT' | localize"></span>
-                      <co-transaction-button [statusColor]="true"
-                                               class="no-gap"
-                                               [iconData]="iconCacheService.getIcon(icons.ChartPieSimpleRegular)"
-                                               [title]="lineMarginInfo?.grossProfitPercentage / 100 | percent : '1.2-2'">
-                      </co-transaction-button>
-                    </div>
-                    <div class="transaction-line-section">
-                      <span class="transaction-field-label" *ngIf="isFirst" [textContent]="'GROSS_PROFIT_TOTAL' | localize"></span>
-                      <co-transaction-button [statusColor]="true"
-                                               class="no-gap"
-                                               [iconData]="iconCacheService.getIcon(icons.ChartPieSimpleRegular)"
-                                               [title]="lineMarginInfo?.grossProfit | coCurrency: true">
-                      </co-transaction-button>
-                    </div>
-                    <div class="transaction-line-section">
-                      <span class="transaction-field-label" *ngIf="isFirst" [textContent]="'CALCULATION_FACTOR' | localize"></span>
-                      <co-transaction-button [statusColor]="true"
-                                               class="no-gap"
-                                               [iconData]="iconCacheService.getIcon(icons.ChartPieSimpleRegular)"
-                                               [title]="lineMarginInfo?.calculationFactor | number">
-                      </co-transaction-button>
-                    </div>
-                  </div>
-              </div>
-          </ng-container>
-      </co-transaction-base-line>
+              <co-transaction-line-delivery-button
+                [screenConfigurationObject]="cfgNames.LineDeliveryMethod"
+                [transactionLine]="transactionLine"
+                [transactionInfo]="transactionInfo"
+              ></co-transaction-line-delivery-button>
+              <co-transaction-line-delivery-date-button class="transaction-line-delivery-date two-column"
+                                                        [screenConfigurationObject]="cfgNames.LineDeliveryDate"
+                                                        [transactionInfo]="transactionInfo"
+                                                        [transactionLine]="transactionLine"
+              ></co-transaction-line-delivery-date-button>
+            </div>
+          </div>
+          <div class="transaction-margin-section">
+            <div class="transaction-line-section">
+              <span class="transaction-field-label" *ngIf="isFirst" [textContent]="'NET_PURCHASE' | localize"></span>
+              <co-editable-label class="transaction-line-totals-total price"
+                                 [model]="lineMarginInfo?.calculationFactor | coCurrency: true"
+                                 [editModel]="transactionLine.displayNetLineTotal"
+                                 [readonly]="true"
+              ></co-editable-label>
+            </div>
+            <div class="transaction-line-section">
+              <span class="transaction-field-label" *ngIf="isFirst"
+                    [textContent]="'GROSS_PROFIT_PERCENT' | localize"></span>
+              <co-transaction-button [statusColor]="true"
+                                     class="no-gap"
+                                     [iconData]="iconCacheService.getIcon(icons.ChartPieSimpleRegular)"
+                                     [title]="lineMarginInfo?.grossProfitPercentage / 100 | percent : '1.2-2'">
+              </co-transaction-button>
+            </div>
+            <div class="transaction-line-section">
+              <span class="transaction-field-label" *ngIf="isFirst"
+                    [textContent]="'GROSS_PROFIT_TOTAL' | localize"></span>
+              <co-transaction-button [statusColor]="true"
+                                     class="no-gap"
+                                     [iconData]="iconCacheService.getIcon(icons.ChartPieSimpleRegular)"
+                                     [title]="lineMarginInfo?.grossProfit | coCurrency: true">
+              </co-transaction-button>
+            </div>
+            <div class="transaction-line-section">
+              <span class="transaction-field-label" *ngIf="isFirst"
+                    [textContent]="'CALCULATION_FACTOR' | localize"></span>
+              <co-transaction-button [statusColor]="true"
+                                     class="no-gap"
+                                     [iconData]="iconCacheService.getIcon(icons.ChartPieSimpleRegular)"
+                                     [title]="lineMarginInfo?.calculationFactor | number">
+              </co-transaction-button>
+            </div>
+          </div>
+        </div>
+      </ng-container>
+    </co-transaction-base-line>
   `,
                 encapsulation: ViewEncapsulation.None
+                //changeDetection: ChangeDetectionStrategy.OnPush
             },] }
 ];
 TransactionMarginInfoLineComponent.ctorParameters = () => [
@@ -24988,6 +25078,7 @@ TransactionMarginInfoLineComponent.ctorParameters = () => [
     { type: IconCacheService },
     { type: TransactionScreenConfigurationService },
     { type: OrderLineSetService },
+    { type: TransactionBaseService },
     { type: TransactionImageService },
     { type: DictionaryService },
     { type: TransactionService },
@@ -25002,12 +25093,13 @@ TransactionMarginInfoLineComponent.propDecorators = {
 };
 
 class TransactionCardMarginComponent extends TransactionBaseComponent {
-    constructor(transactionEventService, iconCacheService, screenConfigService, orderLineSetService, imageService, dictionaryService, transactionService, changeDetector) {
+    constructor(transactionEventService, iconCacheService, screenConfigService, orderLineSetService, _transactionBaseService, imageService, dictionaryService, transactionService, changeDetector) {
         super(transactionEventService, iconCacheService, screenConfigService, imageService, dictionaryService, transactionService, changeDetector);
         this.transactionEventService = transactionEventService;
         this.iconCacheService = iconCacheService;
         this.screenConfigService = screenConfigService;
         this.orderLineSetService = orderLineSetService;
+        this._transactionBaseService = _transactionBaseService;
         this.imageService = imageService;
         this.dictionaryService = dictionaryService;
         this.transactionService = transactionService;
@@ -25039,12 +25131,15 @@ class TransactionCardMarginComponent extends TransactionBaseComponent {
         this.transactionEventService.openSidePanel.next(line);
     }
     ngAfterViewInit() {
-        if (!this.transactionMarginInfo.lineMarginInfos) {
+        if (!this._transactionBaseService.transactionLocalMarginInfo) {
             this.transactionService.getTransactionMarginInfo(this.transactionInfo.uuid).then(marginInfo => {
-                this.transactionMarginInfo = marginInfo;
+                this._transactionBaseService.transactionLocalMarginInfo = marginInfo;
                 this.lineMarginInfo = marginInfo.lineMarginInfos.find(line => line.lineNr === this.transactionLine.lineNr);
             });
         }
+        else {
+            this.lineMarginInfo = this._transactionBaseService.transactionLocalMarginInfo.lineMarginInfos.find(line => line.lineNr === this.transactionLine.lineNr);
+        }
     }
 }
 TransactionCardMarginComponent.decorators = [
@@ -25114,6 +25209,7 @@ TransactionCardMarginComponent.ctorParameters = () => [
     { type: IconCacheService },
     { type: TransactionScreenConfigurationService },
     { type: OrderLineSetService },
+    { type: TransactionBaseService },
     { type: TransactionImageService },
     { type: DictionaryService },
     { type: TransactionService },
@@ -25230,7 +25326,6 @@ class TransactionMappingService {
         ]);
         this._transactionLineComponent = new Map([
             [{ type: TransactionKind.SalesOrder, category: TransactionTypeCategory.SalesOrderOverview }, TransactionOverviewLineComponent],
-            [{ type: TransactionKind.SalesOrder, category: TransactionTypeCategory.SalesOrderMarginInfo }, TransactionMarginInfoLineComponent],
             [{ type: TransactionKind.SalesOrder, category: TransactionTypeCategory.SalesOrderPurchase }, TransactionPurchaseLineComponent],
             [{ type: TransactionKind.SalesOrder, category: TransactionTypeCategory.SalesOrderAllocation }, TransactionGoodsAllocationLineComponent],
             [{ type: TransactionKind.SalesOrder, category: TransactionTypeCategory.SalesOrderDeliveryNote }, TransactionOrderDeliveryLineComponent],
@@ -25238,7 +25333,6 @@ class TransactionMappingService {
             [{ type: TransactionKind.SalesOrder, category: TransactionTypeCategory.SalesOrderPicked }, TransactionPickedLineComponent],
             [{ type: TransactionKind.SalesOrder, category: TransactionTypeCategory.SalesOrderToBePicked }, TransactionToBePickedLineComponent],
             [{ type: TransactionKind.SalesOrder, category: TransactionTypeCategory.SalesOrderPlanning }, TransactionPlanningLineComponent],
-            [{ type: TransactionKind.SalesOrder, category: TransactionTypeCategory.SalesOrderMarginInfo }, TransactionMarginInfoLineComponent],
             [{ type: TransactionKind.PurchaseOrder, category: TransactionTypeCategory.PurchaseOrderOverview }, TransactionPurchaseOverviewLineComponent],
             [{ type: TransactionKind.PurchaseOrder, category: TransactionTypeCategory.PurchaseOrderReceivedGoods }, TransactionReceiveGoodsLineComponent],
             [{ type: TransactionKind.PurchaseOrder, category: TransactionTypeCategory.PurchaseOrderOrderConfirmation }, TransactionPurchaseOrderLineComponent],
@@ -25251,6 +25345,7 @@ class TransactionMappingService {
             [{ type: TransactionKind.ServiceOrder, category: TransactionTypeCategory.ServiceOrderInvoice }, TransactionInvoiceLineComponent],
             [{ type: TransactionKind.ServiceOrder, category: TransactionTypeCategory.ServiceOrderPicked }, TransactionPickedLineComponent],
             [{ type: TransactionKind.ServiceOrder, category: TransactionTypeCategory.ServiceOrderToBePicked }, TransactionToBePickedLineComponent],
+            [{ type: TransactionKind.SalesOrder, category: TransactionTypeCategory.SalesOrderMarginInfo }, TransactionMarginInfoLineComponent],
         ]);
         this._transactionCardComponent = new Map([
             [{ type: TransactionKind.SalesOrder, category: TransactionTypeCategory.SalesOrderOverview }, TransactionCardSalesOverviewComponent],
@@ -29023,17 +29118,21 @@ class TransactionLineDropShipmentButtonComponent extends TransactionBaseComponen
     }
     _getSupplierAllowsDropShipmentParameter() {
         if (this.transactionLine && this.visible) {
-            this._relationService.getRelationById(this.transactionLine.supplierId).then((relations) => {
-                const relation = relations && relations.length > 0 ? relations[0] : null;
-                if (relation) {
-                    this._relationService.getSupplierFullObject(+relation.relationNr).then((result) => {
-                        if (result) {
-                            this.supplierAllowsDropShipment = result.dropshipment;
-                            this.detectChanges();
-                        }
-                    });
-                }
+            this._relationService.getSupplierLightById(this.transactionLine.supplierId).then(result => {
+                this.supplierAllowsDropShipment = result.dropshipment;
+                this.detectChanges();
             });
+            // this._relationService.getRelationById(this.transactionLine.supplierId).then((relations: RelationListObject[]) => {
+            //   const relation: RelationListObject = relations && relations.length > 0 ? relations[0] : null;
+            //   if (relation) {
+            //     this._relationService.getSupplierFullObject(+relation.relationNr).then((result) => {
+            //       if (result) {
+            //         this.supplierAllowsDropShipment = result.dropshipment;
+            //         this.detectChanges();
+            //       }
+            //     });
+            //   }
+            // });
         }
     }
 }
@@ -30803,7 +30902,20 @@ class AvatarComponent {
         return this._initials;
     }
     ngOnInit() {
-        this._setImageForAvatar();
+        // this._setImageForAvatar();
+        this._setAvatar();
+    }
+    _setAvatar() {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (this.image && this.image.documentId) {
+                if (!(yield this._getImageContent(this.image.documentId))) {
+                    this._setRelationInitials();
+                }
+            }
+            else {
+                this._setRelationInitials();
+            }
+        });
     }
     _setImageForAvatar() {
         return __awaiter(this, void 0, void 0, function* () {
@@ -31263,6 +31375,14 @@ class TransactionPaymentBaseComponent {
         this.icons = Icon;
         this.showKeyPad = true;
         this._remainingPayment = false;
+        /*@Input()
+        public set showPaymentDate(value: boolean) {
+          this._showPaymentDate = value;
+        }
+      
+        public get showPaymentDate(): boolean {
+          return this._showPaymentDate;
+        }*/
         this.payed = new EventEmitter();
         this.paymentMethodIdx = 0;
         this.cashRegisterIdx = 0;
@@ -31277,6 +31397,7 @@ class TransactionPaymentBaseComponent {
         // public statusMessage: string = "";
         this.subs = [];
         this._amount = 0;
+        this._showPaymentDate = false;
     }
     set transId(value) {
         this._transId = value;
@@ -31502,6 +31623,7 @@ class PaymentComponent extends TransactionPaymentBaseComponent {
         super(...arguments);
         this.showClass = true;
     }
+    /* public paymentDate:Date = new Date();*/
     cashRegisterSelected(cashRegister, index) {
         super.cashRegisterSelected(cashRegister, index);
         this.activeCashRegister = cashRegister;
@@ -31560,6 +31682,9 @@ PaymentComponent.decorators = [
                            [disabled]="paymentService.amountToPay === 0"></co-button>
               </div>
             </div>
+            <!--<div class="payment-bookdate" *ngIf="showPaymentDate">
+              <co-input-date [(model)]="paymentDate"></co-input-date>
+            </div>-->
             <div class="payment-error-message" *ngIf="paymentService.statusMessage"
                  [textContent]="paymentService.statusMessage"></div>
           </div>
@@ -31891,7 +32016,8 @@ PaymentModule.decorators = [
                     LoaderModule,
                     PaymentToPayModule,
                     IconModule,
-                    ListOfValuesModule
+                    ListOfValuesModule,
+                    InputDatePickerModule
                 ],
                 declarations: [
                     PaymentComponent
@@ -39532,7 +39658,7 @@ LineSelectionService.ctorParameters = () => [
 ];
 
 class TransactionInternalComponent {
-    constructor(iconCacheService, service, transactionEventService, _appRef, _dynamicComponentService, _transactionConnectorService, _transactionEventService, _screenConfigurationService, _dialogService, _lineSelectionService, _purchaseConfirmationService, _deliveryPlanningService) {
+    constructor(iconCacheService, service, transactionEventService, _appRef, _dynamicComponentService, _transactionConnectorService, _transactionEventService, _screenConfigurationService, _dialogService, _lineSelectionService, _purchaseConfirmationService, _deliveryPlanningService, _transactionBaseService) {
         this.iconCacheService = iconCacheService;
         this.service = service;
         this.transactionEventService = transactionEventService;
@@ -39545,6 +39671,7 @@ class TransactionInternalComponent {
         this._lineSelectionService = _lineSelectionService;
         this._purchaseConfirmationService = _purchaseConfirmationService;
         this._deliveryPlanningService = _deliveryPlanningService;
+        this._transactionBaseService = _transactionBaseService;
         this.categories = TransactionTypeCategory;
         this.deliveryPlanningModes = DeliveryPlanningModes;
         this.viewModes = ContentViewMode;
@@ -39587,18 +39714,22 @@ class TransactionInternalComponent {
         this._subs = [];
         this._transaction = new TransactionInfoResponse();
         this._subs.push(this.service.transactionUpdated.subscribe((transaction) => {
-            var _a, _b;
             if (transaction) {
                 this.shouldShowSidePanel = false;
                 this._transaction = transaction;
                 this.updateTransactionLine();
-                if ((_a = transaction === null || transaction === void 0 ? void 0 : transaction.transactionInfo) === null || _a === void 0 ? void 0 : _a.uuid) {
-                    this.getTransactionMarginInfo((_b = transaction === null || transaction === void 0 ? void 0 : transaction.transactionInfo) === null || _b === void 0 ? void 0 : _b.uuid);
-                }
+                // if (transaction?.transactionInfo?.uuid) {
+                //   this.getTransactionMarginInfo(transaction?.transactionInfo?.uuid);
+                // }
                 if ((transaction === null || transaction === void 0 ? void 0 : transaction.transactionInfo.id) && transaction.transactionInfo.transactionKind === TransactionKind.SalesOrder) {
                     this.getPlanOrderForTransaction(transaction);
                 }
             }
+        }), this.service.transactionMargeViewClicked.subscribe((load) => {
+            var _a, _b, _c, _d;
+            if (load && ((_b = (_a = this._transaction) === null || _a === void 0 ? void 0 : _a.transactionInfo) === null || _b === void 0 ? void 0 : _b.uuid)) {
+                this.getTransactionMarginInfo((_d = (_c = this._transaction) === null || _c === void 0 ? void 0 : _c.transactionInfo) === null || _d === void 0 ? void 0 : _d.uuid);
+            }
         }), this.service.relationUpdated.subscribe((relation) => {
             if (relation) {
                 this.relation = relation;
@@ -39841,11 +39972,12 @@ class TransactionInternalComponent {
     //     }
     // }
     getTransactionMarginInfo(transactionUUID) {
-        if (transactionUUID) {
-            this._transactionConnectorService.getTransactionMarginInfo(transactionUUID).then((result) => {
-                this.transactionMarginInfo = result;
-            });
-        }
+        return __awaiter(this, void 0, void 0, function* () {
+            if (transactionUUID) {
+                const result = yield this._transactionBaseService.loadTransactionMargeInfoList(transactionUUID);
+                this._transactionBaseService.transactionLocalMarginInfo = result;
+            }
+        });
     }
     handleViewModeChange(mode) {
         this.activeViewMode = mode;
@@ -39956,7 +40088,6 @@ TransactionInternalComponent.decorators = [
             <div class="transaction-footer-center">
               <co-transaction-margin *ngIf="activeCategory === categories.SalesOrderMarginInfo"
                                      [transactionInfo]="transaction.transactionInfo"
-                                     [transactionMarginInfo]="transactionMarginInfo"
               ></co-transaction-margin>
             </div>
 
@@ -40048,7 +40179,8 @@ TransactionInternalComponent.ctorParameters = () => [
     { type: DialogService },
     { type: LineSelectionService },
     { type: PurchaseConfirmationService },
-    { type: DeliveryPlanningService }
+    { type: DeliveryPlanningService },
+    { type: TransactionBaseService }
 ];
 TransactionInternalComponent.propDecorators = {
     sidePanelComponents: [{ type: ViewChildren, args: [TransactionLineSidePanelComponent,] }],
@@ -40630,8 +40762,9 @@ TransactionHeaderPaymentComponent.decorators = [
         [remainingPayment]="showRemainingPayment"
         [currencyId]="transactionInfo.currencyId"
         [doNotFetchAmountToPayForRemaining]="true"
+
       ></co-payment>
-    </co-dialog>
+    </co-dialog> <!--[showPaymentDate]="true"-->
   `,
                 providers: [
                     { provide: SCREEN_CONFIG_ADAPTER_COMPONENT_INTERFACE_NAME, useExisting: forwardRef(() => TransactionHeaderPaymentComponent) }
@@ -47725,8 +47858,6 @@ class TransactionSearchResultComponent {
         this.transactionClick = new EventEmitter();
         this.screenConfigLoaded = false;
         this.salesOrdersPageActive = false;
-        this.batchDeliveryButtonLoader = true;
-        this.selectAllOrders = false;
         this.showProcessOrdersLoader = false;
         this.selectedTransactions = [];
         this._subs = [];
@@ -47765,6 +47896,10 @@ class TransactionSearchResultComponent {
             if (config && config.length > 0) {
                 this.screenConfigLoaded = true;
             }
+        }), this.searchService.resultsUpdated.subscribe(() => {
+            if (this.salesOrdersPageActive && this.batchCategory === 'levering') {
+                this.markSelectedTransactions();
+            }
         }));
     }
     ngOnDestroy() {
@@ -47775,18 +47910,16 @@ class TransactionSearchResultComponent {
         this.transactionClick.emit(transaction);
     }
     onSelectedClick(transaction) {
-        console.log(transaction);
         if (transaction.selected) {
             this.selectedTransactions.push(transaction);
         }
         else {
-            // const transId = this.transaction.id;
-            // const index = this.selectedTransactions.findIndex(transaction => transaction.id === transId);
-            // if (index !== -1) {
-            //   this.selectedTransactions.splice(index, 1);
-            // }
+            const transId = transaction.transId;
+            const index = this.selectedTransactions.findIndex(transaction => transaction.transId === transId);
+            if (index !== -1) {
+                this.selectedTransactions.splice(index, 1);
+            }
         }
-        console.log(this.selectedTransactions);
     }
     onPreviousClick() {
         this.searchService.currentPage -= 1;
@@ -47797,6 +47930,16 @@ class TransactionSearchResultComponent {
     onPageClick(pageNr) {
         this.searchService.currentPage = pageNr;
     }
+    markSelectedTransactions() {
+        if (this.searchService.resultsUpdated) {
+            this.searchService.transactions.forEach(transaction => {
+                const matchingObject = this.selectedTransactions.find(selectedTransaction => selectedTransaction.transId === transaction.transId);
+                if (matchingObject) {
+                    transaction.selected = true;
+                }
+            });
+        }
+    }
     dragStarted(ev, transaction) {
         this._deliveryPlanningService.dragging = true;
         this._deliveryPlanningService.currentTransId = transaction.transId;
@@ -47834,7 +47977,7 @@ class TransactionSearchResultComponent {
                 printDeliveryNoteRequest = new PrintDeliveryNoteRequest();
             }
             this.transactionService.printDeliveryNotes(printDeliveryNotesRequest)
-                .then((result) => {
+                .then(() => {
                 this.showProcessOrdersLoader = false;
             })
                 .catch(() => {
@@ -47842,8 +47985,12 @@ class TransactionSearchResultComponent {
             });
         });
     }
-    onSelectAllOrders() {
-        this.searchService.transactions.forEach(item => item.selected = !item.selected);
+    onSelectAllOrders(allSelected) {
+        this.searchService.transactions.forEach(item => item.selected = !allSelected);
+        this.selectedTransactions = [];
+        if (!allSelected) {
+            this.selectedTransactions.push(...this.searchService.transactions);
+        }
     }
     _createRequestLines(selectedLines) {
         return selectedLines.map((line) => {
@@ -47865,7 +48012,7 @@ TransactionSearchResultComponent.decorators = [
         <co-input-checkbox
           [model]="checkIfAllSelected()"
           [label]="'SELECT_ALL_ORDERS' | localize"
-          (modelChange)="onSelectAllOrders()">
+          (modelChange)="onSelectAllOrders(checkIfAllSelected())">
         </co-input-checkbox>
         <co-quick-send-button
           *ngIf="checkIfSelected()"
@@ -54840,9 +54987,25 @@ TransactionCardsModule.decorators = [
 ];
 
 class TransactionMarginComponent extends TransactionBaseComponent {
+    constructor(transactionEventService, iconCacheService, screenConfigService, _transactionBaseService, imageService, dictionaryService, transactionService, changeDetector) {
+        super(transactionEventService, iconCacheService, screenConfigService, imageService, dictionaryService, transactionService, changeDetector);
+        this.transactionEventService = transactionEventService;
+        this.iconCacheService = iconCacheService;
+        this.screenConfigService = screenConfigService;
+        this._transactionBaseService = _transactionBaseService;
+        this.imageService = imageService;
+        this.dictionaryService = dictionaryService;
+        this.transactionService = transactionService;
+        this.changeDetector = changeDetector;
+    }
     showClass() {
         return true;
     }
+    get transactionMarginInfo() {
+        return this._transactionBaseService.transactionLocalMarginInfo;
+    }
+    ngOnInit() {
+    }
 }
 TransactionMarginComponent.decorators = [
     { type: Component, args: [{
@@ -54857,11 +55020,20 @@ TransactionMarginComponent.decorators = [
         <co-transaction-margin-block [state]="true" [header]="'GROSS_PROFIT_PERCENTAGE' | localize" [originalValue]="transactionMarginInfo?.grossProfitPercentage" [value]="transactionMarginInfo?.grossProfitPercentage / 100 | percent : '1.2-2'" ></co-transaction-margin-block>
       </div>
     </div>
-
   `,
                 encapsulation: ViewEncapsulation.None
             },] }
 ];
+TransactionMarginComponent.ctorParameters = () => [
+    { type: TransactionEventService },
+    { type: IconCacheService },
+    { type: TransactionScreenConfigurationService },
+    { type: TransactionBaseService },
+    { type: TransactionImageService },
+    { type: DictionaryService },
+    { type: TransactionService },
+    { type: ChangeDetectorRef }
+];
 TransactionMarginComponent.propDecorators = {
     showClass: [{ type: HostBinding, args: ["class.co-transaction-margin",] }]
 };
@@ -55074,6 +55246,7 @@ class TransactionComponent {
         this.saveCancelMovable = false;
         this.transactionPlanning = false;
         this.screenConfigLoaded = false;
+        this._fetching = false;
     }
     set confirmationAnalysisId(value) {
         this._confirmationAnalysisId = value;
@@ -55120,13 +55293,11 @@ class TransactionComponent {
         return !(this.service.transactionDirty && this.service.manualSaveParam);
     }
     _getTransaction() {
-        if (this.transactionKind) {
+        if (this.transactionKind && this.transactionNr) {
             this._transactionConnectorService.connectionInitialized.pipe(take(1)).subscribe((loaded) => {
                 if (loaded) {
                     this._screenConfigurationService.loadConfig([this.transactionKind]).then(() => __awaiter(this, void 0, void 0, function* () {
-                        if (this.transactionNr) {
-                            yield this.service.getTransactionByNrAndKind(this.transactionNr, this.transactionKind);
-                        }
+                        yield this.service.getTransactionByNrAndKind(this.transactionNr, this.transactionKind);
                         this._prepareHeader();
                         this.screenConfigLoaded = true;
                     }));