@colijnit/transaction 12.1.92 → 12.1.93

package/lib/component/shared/transaction-article-text/style/_layout.scss

@@ -45,13 +45,13 @@
         padding: 20px 0;
 
         .co-input-listbox-content {
-          max-height: 150px;
+          max-height: 300px;
         }
 
         .e-listbox-wrapper {
           border: 0;
           column-count: 2;
-          min-height: 100px;
+          height: 300px;
           //max-height: 150px;
         }
       }
@@ -69,24 +69,6 @@
       font-weight: bold;
     }
 
-    .search-button {
-      position: absolute;
-      top: 0;
-      right: 15px;
-      height: 35px;
-      width: 35px;
-      margin: 2px;
-      cursor: pointer;
-      display: flex;
-      align-items: center;
-      justify-content: center;
-
-      co-icon {
-        height: 35px;
-        width: 35px;
-      }
-    }
-
     .co-transaction-line-image-and-description {;
       display: flex;
 
@@ -98,6 +80,17 @@
 
     .standard-texts-dropdown-wrapper {
       height: 50px;
+
+      co-drop-down-list {
+        border: none;
+      }
+    }
+
+    .label,
+    .e-ddl.e-lib.e-input-group.e-control-wrapper.e-float-input .e-float-text.e-label-top,
+    .co-input-listbox .co-input-listbox-header {
+      font-weight: bold;
+      color: $tp-color-label;
     }
   }
 }

package/lib/component/shared/transaction-article-text/transaction-article-text.component.d.ts

@@ -18,20 +18,18 @@ export declare class TransactionArticleTextComponent implements OnInit {
     set editText(value: string);
     set articleLineNr(value: number);
     showArticleImageDescription: boolean;
+    showImage: boolean;
     closeClick: EventEmitter<MouseEvent>;
     cancelClick: EventEmitter<MouseEvent>;
     saveClick: EventEmitter<TransactionAddTextLineRequest>;
     showClass(): boolean;
     readonly icon: typeof Icon;
     private _transactionLine;
-    showOverviewDialog: boolean;
     standardTexts: StandardText[];
     documents: any[];
     fields: Object;
     fieldsDocuments: Object;
     textAreaPlaceholder: string;
-    searchIcon: import("@angular/platform-browser").SafeHtml;
-    showDropdown: boolean;
     transactionAddTextLineRequest: TransactionAddTextLineRequest;
     private _articleRef;
     constructor(transactionService: TransactionService, iconCacheService: IconCacheService, _dictionaryService: DictionaryService);
@@ -40,5 +38,4 @@ export declare class TransactionArticleTextComponent implements OnInit {
     onCancelClick(event: MouseEvent): void;
     onSelectStandardText(value: any): void;
     handleDocumentsChange(docs: any): void;
-    showStandardTextsDropdown(): void;
 }

package/lib/component/shared/transaction-article-text-overview/style/_layout.scss

@@ -29,6 +29,10 @@
       background-color: $tp-transaction-article-text-overview-index-background-color;
       width: 20px;
     }
+    .text {
+      max-height: 150px;
+      overflow: hidden;
+    }
   }
   .article-text-overview-article-text-wrapper.cdk-drag-preview {
     box-sizing: border-box;

package/lib/component/shared/transaction-article-text-overview/transaction-article-text-overview.component.d.ts

@@ -1,11 +1,12 @@
 import { EventEmitter } from "@angular/core";
+import { TransactionEventService } from "../../../service/transaction-event.service";
 import { TransactionService } from "../../../service/transaction.service";
 import { TransactionLineInfo } from "@colijnit/transactionapi/build/model/transaction-line-info.bo";
 import { TransactionAddTextLineRequest } from "@colijnit/transactionapi/build/model/transaction-add-text-line-request.bo";
 import { CdkDrag, CdkDragDrop, CdkDropList } from "@angular/cdk/drag-drop";
 export declare class TransactionArticleTextOverviewComponent {
     service: TransactionService;
-    header: string;
+    private _transactionEventService;
     set transactionLine(value: TransactionLineInfo);
     closeClick: EventEmitter<MouseEvent>;
     cancelClick: EventEmitter<MouseEvent>;
@@ -15,15 +16,15 @@ export declare class TransactionArticleTextOverviewComponent {
     showTransactionArticleText: boolean;
     editTransactionLine: TransactionLineInfo;
     textToEdit: string;
+    header: string;
     private _boFactory;
-    constructor(service: TransactionService);
+    constructor(service: TransactionService, _transactionEventService: TransactionEventService);
     onOkClick(event: MouseEvent): void;
     onCancelClick(event: MouseEvent): void;
     handleCanDragDrop(drag: CdkDrag, drop: CdkDropList): boolean;
     handleDrop(event: CdkDragDrop<TransactionLineInfo[]>): void;
     handleOpenArticleText(transLine: TransactionLineInfo): void;
-    closeTransactionArticleText(event: MouseEvent): void;
-    saveTransactionArticleLineText(transactionAddTextLineRequest: TransactionAddTextLineRequest): void;
+    closeArticleText(): void;
     private _hideArticleTextDialog;
     private _getArticleTexts;
 }

package/lib/component/transaction/transaction.component.d.ts

@@ -16,6 +16,7 @@ export declare class TransactionComponent implements OnDestroy {
     iconCacheService: IconCacheService;
     service: TransactionService;
     private _appRef;
+    private _transactionService;
     private _dynamicComponentService;
     private _transactionEventService;
     readonly viewModes: typeof ContentViewMode;
@@ -33,13 +34,34 @@ export declare class TransactionComponent implements OnDestroy {
     activeViewMode: ContentViewMode;
     activeCategory: TransactionTypeCategory;
     sidePanelTransactionLine: TransactionLineInfo;
+    transactionLine: TransactionLineInfo;
     showSidePanel: boolean;
+    showArticleTextOverview: boolean;
+    showTransactionText: boolean;
+    showArticleText: boolean;
+    textToEdit: string;
     private _subs;
     private _transaction;
     private _transactionId;
-    constructor(iconCacheService: IconCacheService, service: TransactionService, _appRef: ApplicationRef, _dynamicComponentService: DynamicComponentService, _transactionEventService: TransactionEventService);
+    constructor(iconCacheService: IconCacheService, service: TransactionService, _appRef: ApplicationRef, _transactionService: TransactionService, _dynamicComponentService: DynamicComponentService, _transactionEventService: TransactionEventService);
     ngOnDestroy(): void;
-    saveTransactionLine(transactionAddTextLineRequest: TransactionAddTextLineRequest): void;
     handleButtonBarButtonClicked(button: TransactionBarButton): void;
     handleShowSidePanel(line: TransactionLineInfo): void;
+    handleShowArticleTextOverview(line: TransactionLineInfo): void;
+    handleShowTransactionText(line: TransactionLineInfo): void;
+    handleShowArticleText(line: TransactionLineInfo): void;
+    onSaveArticleTextOverview(request: TransactionAddTextLineRequest): void;
+    saveTransactionLineText(transactionAddTextLineRequest: TransactionAddTextLineRequest): void;
+    saveArticleLineText(transactionAddTextLineRequest: TransactionAddTextLineRequest): void;
+    handleEditTransactionText(line: TransactionLineInfo): void;
+    handleEditArticleText(line: TransactionLineInfo): void;
+    closeArticleText(): void;
+    closeTransactionText(): void;
+    closeArticleTextOverview(): void;
+    showTransactionTextDialog(): void;
+    showArticleTextDialog(): void;
+    showArticleTextOverviewDialog(): void;
+    private _hideArticleTextDialog;
+    private _hideTransactionTextDialog;
+    private _hideArticleTextOverviewDialog;
 }

package/lib/component/transaction-card/transaction-card-footer/style/_layout.scss

@@ -22,17 +22,50 @@
         }
       }
 
-      .date-or-delivery-method-container {
+      .date-or-drop-shipment-container {
         width: 100%;
+        margin: 0 10px;
         text-align: -webkit-center;
 
-        .transaction-line-button {
-          width: inherit;
-          max-width: 200px;
+        co-transaction-line-drop-shipment-button {
+          .transaction-line-button {
+            background-color: white;
+            justify-content: center;
+            max-width: 150px;
+            &.disabled {
+              cursor: default;
+              opacity: 0.6;
+            }
+          }
+          &.active {
+            .transaction-line-button {
+              background-color: $tp-color-action;
+              color: white;
+            }
+          }
         }
 
-        .delivery-method-preview {
+        .drop-shipment-wrapper {
           margin: 0 10px;
+          max-width: 150px;
+
+          .drop-shipment-button {
+            font-size: 11px;
+            font-weight: 600;
+            display: flex;
+            align-items: center;
+            height: 26px;
+            border: 1px solid #DCE4EA;
+            border-radius: 10px;
+            background-color: white;
+            cursor: pointer;
+            justify-content: center;
+
+            &.active {
+              background-color: #3e7eff;
+              color: white;
+            }
+          }
         }
       }
 

package/lib/component/transaction-card/transaction-card-sales-overview/transaction-card-sales-overview.component.d.ts

@@ -15,5 +15,4 @@ export declare class TransactionCardSalesOverviewComponent extends TransactionBa
     expanded: boolean;
     constructor(iconCacheService: IconCacheService, transactionService: TransactionService, _dictionaryService: DictionaryService);
     ngOnInit(): void;
-    handleOpenArticleText(text: string): void;
 }

package/lib/component/transaction-line/transaction-line/style/_layout.scss

@@ -60,6 +60,21 @@
       }
       .column3 {
         margin-right: $tp-transaction-line-column-gap;
+
+        co-transaction-line-drop-shipment-button {
+          .transaction-line-button {
+            &.disabled {
+              cursor: default;
+              opacity: 0.6;
+            }
+          }
+          &.active {
+            .transaction-line-button {
+              background-color: $tp-color-action;
+              color: white;
+            }
+          }
+        }
       }
       co-transaction-line-delivery-date-button {
         //max-width: calc((#{$tp-transaction-line-button-width} * 2) + #{$tp-transaction-line-column-gap});

package/lib/component/transaction-line/transaction-overview-line/transaction-overview-line.component.d.ts

@@ -22,5 +22,4 @@ export declare class TransactionOverviewLineComponent extends TransactionBaseCom
     transactionKind: TransactionKind;
     constructor(iconCacheService: IconCacheService, transactionService: TransactionService, _dictionaryService: DictionaryService);
     ngOnInit(): void;
-    handleOpenArticleText(text: string): void;
 }

package/lib/component/transaction-line-action-buttons/transaction-line-action-buttons.component.d.ts

@@ -1,4 +1,5 @@
 import { EventEmitter, OnInit } from "@angular/core";
+import { TransactionEventService } from "../../service/transaction-event.service";
 import { TransactionService } from "../../service/transaction.service";
 import { TransactionKind } from "@colijnit/transactionapi/build/enum/transaction-kind.enum";
 import { Icon } from "../../enum/icon.enum";
@@ -6,11 +7,11 @@ import { DictionaryService } from "../../service/dictionary.service";
 import { IconCacheService } from "../../service/icon-cache.service";
 import { Direction } from "../../enum/direction.enum";
 import { TransactionLineInfo } from "@colijnit/transactionapi/build/model/transaction-line-info.bo";
-import { TransactionAddTextLineRequest } from "@colijnit/transactionapi/build/model/transaction-add-text-line-request.bo";
 export declare class TransactionLineActionButtonsComponent implements OnInit {
     iconCacheService: IconCacheService;
     private _transactionService;
     private _dictionaryService;
+    private _transactionEventService;
     readonly icons: typeof Icon;
     set transactionLine(value: TransactionLineInfo);
     get transactionLine(): TransactionLineInfo;
@@ -18,32 +19,20 @@ export declare class TransactionLineActionButtonsComponent implements OnInit {
     set showActionButtons(value: boolean);
     get showActionButtons(): boolean;
     waitingForUserAction: EventEmitter<boolean>;
+    transactionArticleTextOverviewButtonClicked: EventEmitter<TransactionLineInfo>;
+    transactionTextButtonClicked: EventEmitter<TransactionLineInfo>;
+    articleTextButtonClicked: EventEmitter<TransactionLineInfo>;
     sidePanelButtonClicked: EventEmitter<TransactionLineInfo>;
     showClass(): boolean;
     showActionButtonsDelayed: boolean;
     transactionKind: TransactionKind;
-    showTransactionArticleText: boolean;
-    showTransactionArticleTextOverview: boolean;
-    articleTextHeader: string;
-    textToEdit: string;
     readonly: boolean;
     private _transactionLine;
     private _showActionButtons;
-    constructor(iconCacheService: IconCacheService, _transactionService: TransactionService, _dictionaryService: DictionaryService);
+    constructor(iconCacheService: IconCacheService, _transactionService: TransactionService, _dictionaryService: DictionaryService, _transactionEventService: TransactionEventService);
     ngOnInit(): void;
     handleShowHideClick(): void;
-    handleTransactionArticleTextOverview(): void;
-    handleTransactionArticleText(): void;
+    handleTransactionText(): void;
+    handleArticleText(): void;
     handleShowSidePanel(): void;
-    showOverviewButton(): boolean;
-    showAddTextButton(): boolean;
-    showSidebarButton(): boolean;
-    onSaveTransactionArticleTextOverview(request: TransactionAddTextLineRequest): void;
-    saveTransactionArticleLineText(transactionAddTextLineRequest: TransactionAddTextLineRequest): void;
-    closeTransactionArticleText(event: MouseEvent): void;
-    closeTransactionArticleTextOverview(): void;
-    showArticleTextDialog(): void;
-    private _hideArticleTextDialog;
-    private _showArticleTextOverviewDialog;
-    private _hideArticleTextOverviewDialog;
 }

package/lib/component/transaction-line-fields/transaction-line-drop-shipment-button.component.d.ts

@@ -0,0 +1,18 @@
+import { OnInit } from "@angular/core";
+import { TransactionBaseComponent } from "../core/base/transaction-base.component";
+import { TransactionService } from "../../service/transaction.service";
+import { RelationService } from "../../service/relation.service";
+export declare class TransactionLineDropShipmentButtonComponent extends TransactionBaseComponent implements OnInit {
+    transactionService: TransactionService;
+    private _relationService;
+    supplierAllowsDropShipment: boolean;
+    internalParameterAllowsDropShipment: boolean;
+    buttonDisabled: boolean;
+    showDialogWarehouse: boolean;
+    showClass(): boolean;
+    constructor(transactionService: TransactionService, _relationService: RelationService);
+    ngOnInit(): void;
+    handleToggleDropShipment(): Promise<void>;
+    private _getSupplierAllowsDropShipmentParameter;
+    private _getInternalAllowDropShipmentParameter;
+}

package/lib/component/transaction-line-fields/transaction-line-drop-shipment-button.module.d.ts

@@ -0,0 +1,2 @@
+export declare class TransactionLineDropShipmentButtonModule {
+}

package/lib/component/transaction-line-purchase-receive-goods/transaction-line-purchase-receive-goods.component.d.ts

@@ -29,7 +29,7 @@ export declare class TransactionLinePurchaseReceiveGoodsComponent extends Transa
     ngOnDestroy(): void;
     submit(): boolean;
     locationRequired(): boolean;
-    getGoodsReceiptStatusWithHistory(): Promise<void>;
+    getGoodsReceiptHistory(): Promise<void>;
     handleSaveDetailsEdit(): void;
     handleDeleteSelectedRow(row: LogisticalStateDetail): Promise<void>;
     handleSelectStock(availableStock: AvailableStock): void;

package/lib/component/transaction-line-sales-allocation/transaction-line-sales-allocation.component.d.ts

@@ -22,7 +22,7 @@ export declare class TransactionLineSalesAllocationComponent extends Transaction
     constructor(iconCacheService: IconCacheService, transactionService: TransactionService, _formMaster: FormMasterService, _dialogService: DialogService, _transactionEventService: TransactionEventService);
     ngOnDestroy(): void;
     submit(): boolean;
-    getGoodsAllocationStatusWithHistory(): Promise<void>;
+    getGoodsAllocationHistory(): Promise<void>;
     handleSaveDetailsEdit(): void;
     handleDeleteSelectedRow(row: LogisticalStateDetail): void;
     openWarehouseLocationDialog(): void;

package/lib/component/transaction-line-side-panel-purchase/transaction-line-side-panel-purchase.component.d.ts

@@ -1,11 +1,11 @@
 import { EventEmitter } from "@angular/core";
-import { GoodsReceiptStatusWithHistory } from "@colijnit/transactionapi/build/model/goods-receipt-status-with-history.bo";
 import { TransactionLineInfo } from "@colijnit/transactionapi/build/model/transaction-line-info.bo";
 import { TransactionTypeCategory } from "../../enum/transaction-type-category.enum";
 import { TransactionService } from "../../service/transaction.service";
 import { TransactionEventService } from "../../service/transaction-event.service";
 import { TransactionInfo } from "@colijnit/transactionapi/build/model/transaction-info.bo";
 import { DocDeliveryBatch } from "@colijnit/transactionapi/build/model/doc-delivery-batch.bo";
+import { GoodsReceiptHistory } from "@colijnit/transactionapi/build/model/goods-receipt-history.bo";
 export declare class TransactionLineSidePanelPurchaseComponent {
     private _service;
     private _transactionEventService;
@@ -16,7 +16,7 @@ export declare class TransactionLineSidePanelPurchaseComponent {
     category: TransactionTypeCategory;
     quantityToReceiveChange: EventEmitter<number>;
     showClass(): boolean;
-    goodsReceiptStatus: GoodsReceiptStatusWithHistory;
+    goodsReceiptStatus: GoodsReceiptHistory;
     selectedLineDocBatchArray: DocDeliveryBatch;
     isDocBatchSaved: boolean;
     editingMode: boolean;

package/lib/component/transaction-lines/transaction-lines.component.d.ts

@@ -1,6 +1,7 @@
 import { EventEmitter } from "@angular/core";
 import { CdkDrag, CdkDragDrop, CdkDropList } from "@angular/cdk/drag-drop";
 import { IconCacheService } from "../../service/icon-cache.service";
+import { TransactionEventService } from "../../service/transaction-event.service";
 import { TransactionArticleTextComponent } from "../shared/transaction-article-text/transaction-article-text.component";
 import { TransactionLineInfo } from "@colijnit/transactionapi/build/model/transaction-line-info.bo";
 import { TransactionAddTextLineRequest } from "@colijnit/transactionapi/build/model/transaction-add-text-line-request.bo";
@@ -9,27 +10,21 @@ import { TransactionTypeCategory } from "../../enum/transaction-type-category.en
 import { TransactionBaseComponent } from "../core/base/transaction-base.component";
 export declare class TransactionLinesComponent extends TransactionBaseComponent {
     iconCacheService: IconCacheService;
+    private _transactionEventService;
     protected transactionService: TransactionService;
     transactionArticleText: TransactionArticleTextComponent;
     set activeCategory(value: TransactionTypeCategory);
     get activeCategory(): TransactionTypeCategory;
     saveTransactionLine: EventEmitter<TransactionAddTextLineRequest>;
     showClass(): boolean;
-    showTransactionArticleText: boolean;
-    selectedArticleText: TransactionLineInfo;
-    textToEdit: string;
     userActionRequired: boolean;
     selectedTransactionLine: TransactionLineInfo;
     hasComponent: boolean;
     private _activeCategory;
-    constructor(iconCacheService: IconCacheService, transactionService: TransactionService);
+    constructor(iconCacheService: IconCacheService, _transactionEventService: TransactionEventService, transactionService: TransactionService);
     trackByFn(index: number, line: TransactionLineInfo): any;
     handleCanDragDrop(drag: CdkDrag, drop: CdkDropList): boolean;
     handleDrop(event: CdkDragDrop<TransactionLineInfo[]>): Promise<void>;
-    handleTransactionLineDblClick(line: TransactionLineInfo): void;
-    handleTransactionArticleText(event: MouseEvent): void;
-    closeTransactionArticleText(event: MouseEvent): void;
-    saveTransactionArticleLineText(transactionLine: TransactionAddTextLineRequest): void;
-    private _showArticleTextDialog;
-    private _hideArticleTextDialog;
+    onTransactionLineDblClick(line: TransactionLineInfo): void;
+    handleTransactionText(): void;
 }

package/lib/res/dictionary/dictionaries.d.ts

@@ -455,6 +455,7 @@ export declare class Dictionaries {
         PICK_A_CASH_REGISTER: string;
         PICK_A_DRAWER: string;
         PIN_TERMINAL: string;
+        PINNER_ID: string;
         PLANNED: string;
         WAREH: string;
         WAREHOUSE: string;
@@ -5734,6 +5735,7 @@ export declare class Dictionaries {
         ORDER_STATUS_NOT_COMPLETE: string;
         ORDER_STOCK: string;
         ORDER_SUM: string;
+        ORDER_TEXT_LINE: string;
         ORDER_TOTAL: string;
         ORDER_TOTALS: string;
         ORDER_TOTAL_EXCL: string;
@@ -5959,6 +5961,7 @@ export declare class Dictionaries {
         PIN_RESULT_FILE_FORMAT_ERROR: string;
         PIN_TERMINAL: string;
         PIN_TERMINAL_NR: string;
+        PINNER_ID: string;
         PIT_SYMBOLS: string;
         PLACE_COLUMNS_HERE_TO_GROUP: string;
         PLANNED: string;
@@ -6251,6 +6254,7 @@ export declare class Dictionaries {
         PRODUCT_NUMBER_SUPPLIER: string;
         PRODUCT_OPEN_ACTIVITIES: string;
         PRODUCT_PAGE: string;
+        PRODUCT_RELATED_TEXTS: string;
         PRODUCT_SELECTION: string;
         PRODUCT_SHOWN_IN: string;
         PRODUCT_STATE: string;
@@ -7228,6 +7232,7 @@ export declare class Dictionaries {
         STANDARD_PRINTER_SAVE_FAILED: string;
         STANDARD_TEXT: string;
         STANDARD_TEXTS: string;
+        STANDARD_TEXT_SELECT: string;
         STANDARD_TIME_RANGE: string;
         STANDARD_WEEKLY_WORKING_HOURS: string;
         START: string;
@@ -7729,6 +7734,7 @@ export declare class Dictionaries {
         TYPE_OF_RATE: string;
         TYPE_ORGAN_DONATION: string;
         TYPE_OR_SEARCH_TEXT: string;
+        TYPE_TEXT: string;
         TYPE_RELATION: string;
         UNABLE_TO_USE_POS_NO_WH_OR_RETURN_WH: string;
         UNABLE_TO_USE_POS_WITHOUT_LOCATION: string;
@@ -8370,6 +8376,7 @@ export declare class Dictionaries {
         PHONE_NUMBER: string;
         PICKED: string;
         PIN_TERMINAL: string;
+        PINNER_ID: string;
         PLANNED: string;
         WAREH: string;
         WAREHOUSE: string;
@@ -10575,6 +10582,8 @@ export declare class Dictionaries {
         CANNOT_CHANGE_NEGATIVE_AMOUNT: string;
         CANNOT_CHANGE_NEGATIVE_QUANTITY: string;
         CANNOT_CORRECT: string;
+        CANNOT_CREATE_SERVICE_FOR_NOT_INVOICED_LINE: string;
+        CANNOT_CREATE_SERVICE_FOR_UNDELIVERED_LINE: string;
         CANNOT_CREATE_TASK_NO_RELATION: string;
         CANNOT_DEACTIVATE_TASK_WORFLOW: string;
         CANNOT_DELETE_ACTIVE_TASK_WORKFLOW: string;
@@ -13648,6 +13657,7 @@ export declare class Dictionaries {
         "NOTI_FR_4.1_OPTION_2": string;
         "NOTI_FR_4.1_QUESTION": string;
         NOTI_FR_4_RUBRIC: string;
+        NOT_ACTIVATED_YET: string;
         NOT_AFTER: string;
         NOT_ALLOWED_ON_BASE_ART: string;
         NOT_ALLOWED_TO_DELETE_EXISTING_EXECUTED_INTERNAL_DELIVERY: string;
@@ -14078,6 +14088,7 @@ export declare class Dictionaries {
         ORDER_STOCK: string;
         ORDER_SUM: string;
         ORDER_SUPPLIER_PARAMETERS: string;
+        ORDER_TEXT_LINE: string;
         ORDER_TOTAL: string;
         ORDER_TOTALS: string;
         ORDER_TOTAL_EXCL: string;
@@ -14315,6 +14326,7 @@ export declare class Dictionaries {
         PIN_RESULT_FILE_FORMAT_ERROR: string;
         PIN_TERMINAL: string;
         PIN_TERMINAL_NR: string;
+        PINNER_ID: string;
         PIT_SYMBOLS: string;
         PLACE_COLUMNS_HERE_TO_GROUP: string;
         PLANNED: string;
@@ -14646,6 +14658,7 @@ export declare class Dictionaries {
         PRODUCT_ACTIVE: string;
         PRODUCT_BUILDER: string;
         PRODUCT_DESCRIPTION: string;
+        PRODUCT_DESCRIPTION_AND_TEXT: string;
         PRODUCT_DESCRIPTION_AND_TEXTS: string;
         PRODUCT_GROUP: string;
         PRODUCT_INFO: string;
@@ -14654,6 +14667,7 @@ export declare class Dictionaries {
         PRODUCT_NUMBER_SUPPLIER: string;
         PRODUCT_OPEN_ACTIVITIES: string;
         PRODUCT_PAGE: string;
+        PRODUCT_RELATED_TEXTS: string;
         PRODUCT_SELECTION: string;
         PRODUCT_SHOWN_IN: string;
         PRODUCT_STATE: string;
@@ -15763,6 +15777,7 @@ export declare class Dictionaries {
         STANDARD_PRINTER_SAVE_FAILED: string;
         STANDARD_TEXT: string;
         STANDARD_TEXTS: string;
+        STANDARD_TEXT_SELECT: string;
         STANDARD_TEXT_CHOICE: string;
         STANDARD_TIME: string;
         STANDARD_TIME_RANGE: string;
@@ -16339,6 +16354,7 @@ export declare class Dictionaries {
         TYPE_OF_RATE: string;
         TYPE_ORGAN_DONATION: string;
         TYPE_OR_SEARCH_TEXT: string;
+        TYPE_TEXT: string;
         TYPE_RELATION: string;
         UNABLE_TO_USE_POS_NO_WH_OR_RETURN_WH: string;
         UNABLE_TO_USE_POS_WITHOUT_LOCATION: string;

package/lib/service/transaction-base.service.d.ts

@@ -13,13 +13,10 @@ import { BehaviorSubject, Subject } from "rxjs";
 import { PurchasePortalLine } from "@colijnit/transactionapi/build/model/purchase-portal-line.bo";
 import { DocDeliveryBatch } from "@colijnit/transactionapi/build/model/doc-delivery-batch.bo";
 import { TransactionInfoHistory } from "@colijnit/transactionapi/build/model/transaction-info-history.bo";
-import { DeliveryOrderStatus } from "@colijnit/transactionapi/build/model/delivery-order-status.bo";
-import { GoodsAllocationStatus } from "@colijnit/transactionapi/build/model/goods-allocation-status.bo";
 import { GetPurchasePortalLine } from "@colijnit/transactionapi/build/model/get-purchase-portal-line";
 import { RefTransaction } from "@colijnit/transactionapi/build/model/ref-transaction.bo";
 import { TransactionSearchViewRequest } from "@colijnit/transactionapi/build/model/transaction-search-view-request";
 import { TransactionSearchResult } from "../model/transaction-search-result";
-import { GoodsReceiptStatusWithHistory } from "@colijnit/transactionapi/build/model/goods-receipt-status-with-history.bo";
 export declare class TransactionBaseService {
     optionsService: OptionsService;
     protected dialogService: DialogService;
@@ -75,9 +72,6 @@ export declare class TransactionBaseService {
     tryToLockTransaction(id: number, version: number, secondAttempt?: boolean): Promise<boolean>;
     getTransactionInfo(transId: number, lineId: number): Promise<TransactionInfoHistory[]>;
     getRefTransactions(transId: number): Promise<RefTransaction[]>;
-    getGoodsReceiptStatus(transId: number, lineNr: number): Promise<GoodsReceiptStatusWithHistory>;
-    getDeliveryOrderStatus(transId: number, lineId: number): Promise<DeliveryOrderStatus>;
-    getGoodsAllocationStatus(transId: number, lineNr: number): Promise<GoodsAllocationStatus>;
     getPurchasePortalLines(request: GetPurchasePortalLine): Promise<PurchasePortalLine[]>;
     rememberCurrentTransaction(value: TransactionInfoResponse): Promise<void>;
     protected _checkPurchaseOrders(): Promise<void>;

package/lib/service/transaction-connector-adapter.service.d.ts

@@ -24,7 +24,6 @@ import { OnHoldCode } from "@colijnit/transactionapi/build/model/on-hold-code.bo
 import { Warehouse } from "@colijnit/transactionapi/build/model/warehouse.bo";
 import { CodeDescription } from "@colijnit/transactionapi/build/model/code-description";
 import { ReceiveGoodsForPurchaseOrderRequest } from "@colijnit/transactionapi/build/model/receive-goods-for-purchase-order-request.bo";
-import { GoodsReceiptStatusWithHistory } from "@colijnit/transactionapi/build/model/goods-receipt-status-with-history.bo";
 import { ReceiveGoodsForPurchaseOrderCorrectionRequest } from "@colijnit/transactionapi/build/model/receive-goods-for-purchase-order-correction-request.bo";
 import { PaymentMethod } from "@colijnit/transactionapi/build/model/payment-method.bo";
 import { GetPurchasePortalLine } from "@colijnit/transactionapi/build/model/get-purchase-portal-line";
@@ -43,15 +42,12 @@ import { DataServiceResponseData } from "@colijnit/ioneconnector/build/model/dat
 import { RelationPrivacySetting } from "@colijnit/relationapi/build/model/relation-privacy-setting.bo";
 import { CoDomainValue } from "@colijnit/mainapi/build/model/co-domain-value.bo";
 import { Tag } from "@colijnit/mainapi/build/model/tag";
-import { DeliveryOrderStatus } from "@colijnit/transactionapi/build/model/delivery-order-status.bo";
 import { SalesPerson } from "@colijnit/relationapi/build/model/sales-person.bo";
 import { StockStickersPrintLayouts } from "@colijnit/sharedapi/build/model/report/stock-stickers-print-layouts.bo";
 import { Sharedapi } from "@colijnit/sharedapi/build/sharedapi";
 import { AvailableStock } from "@colijnit/transactionapi/build/model/available-stock.bo";
 import { AllocateGoodsForSalesOrderRequest } from "@colijnit/transactionapi/build/model/allocate-goods-for-sales-order-request";
 import { AllocateGoodsForSalesOrderCorrectionRequest } from "@colijnit/transactionapi/build/model/allocate-goods-for-sales-order-correction-request";
-import { GoodsAllocationStatus } from "@colijnit/transactionapi/build/model/goods-allocation-status.bo";
-import { GoodsAllocationStatusWithHistory } from "@colijnit/transactionapi/build/model/goods-allocation-status-with-history.bo";
 import { ReportLayoutSelectionEmail } from "@colijnit/mainapi/build/model/report-layout-selection-email.bo";
 import { ReportLayoutSelectionPrint } from "@colijnit/mainapi/build/model/report-layout-selection-print.bo";
 import { EmailOrderConfirmationRequest } from "@colijnit/mainapi/build/model/email-order-confirmation-request";
@@ -78,6 +74,9 @@ import { EmailInvoiceRequest } from "@colijnit/transactionapi/build/model/email-
 import { RefTransaction } from "@colijnit/transactionapi/build/model/ref-transaction.bo";
 import { MainApi } from "@colijnit/mainapi";
 import { TagTreeItem } from "@colijnit/mainapi/build/model/tag-tree-item.bo";
+import { InternalParam } from "@colijnit/mainapi/build/enum/internal-param.enum";
+import { GoodsAllocationHistory } from "@colijnit/transactionapi/build/model/goods-allocation-history.bo";
+import { GoodsReceiptHistory } from "@colijnit/transactionapi/build/model/goods-receipt-history.bo";
 export declare class TransactionConnectorAdapterService {
     private _optionsService;
     private _selectMultipleCacheService;
@@ -148,6 +147,7 @@ export declare class TransactionConnectorAdapterService {
     changeTransactionLinePriceList(uuid: string, lineUuid: string, priceList: string): Promise<TransactionInfoResponse>;
     changeTransactionLineVat(uuid: string, lineUuid: string, id: number): Promise<TransactionInfoResponse>;
     changeTransactionLineLineDiscount(uuid: string, lineUuid: string, type: DiscountType, discount: number, reason: string, code: string): Promise<TransactionInfoResponse>;
+    changeTransactionLineDropShipment(uuid: string, lineUuid: string, newDropShipment: boolean): Promise<TransactionInfoResponse>;
     changeTransactionLineDeliveryMethod(uuid: string, lineUuid: string, method: string): Promise<TransactionInfoResponse>;
     changeTransactionLineDeliveryDate(uuid: string, lineUuid: string, date: Date): Promise<TransactionInfoResponse>;
     changeTransactionLineAssemblyTime(uuid: string, lineUuid: string, time: number): Promise<TransactionInfoResponse>;
@@ -179,8 +179,7 @@ export declare class TransactionConnectorAdapterService {
     createIonePaymentLinkAndQRCode(uuid: string, amount: number, paymentMethodCode: string): Promise<CreatePaymentLinkResult>;
     getPaymentLinkStatus(paymentLinkUUID: string): Promise<PaymentLinkStatus>;
     getDepositPaymentInfo(uuid: string): Promise<TransactionDepositPaymentInfo>;
-    getGoodsReceiptStatus(transId: number, lineNr: number): Promise<GoodsReceiptStatusWithHistory>;
-    getGoodsReceiptStatusWithHistory(transId: number, lineNr: number): Promise<GoodsReceiptStatusWithHistory>;
+    getGoodsReceiptHistory(transId: number, lineNr: number): Promise<GoodsReceiptHistory>;
     receiveGoodsForPurchaseOrder(request: ReceiveGoodsForPurchaseOrderRequest): Promise<boolean>;
     receiveGoodsForPurchaseOrderCorrection(request: ReceiveGoodsForPurchaseOrderCorrectionRequest): Promise<boolean>;
     getPurchasePortalLines(request: GetPurchasePortalLine): Promise<PurchasePortalLine[]>;
@@ -189,12 +188,10 @@ export declare class TransactionConnectorAdapterService {
     lockPurchasePortalLines(transIdPurchase: number, lineId: number): Promise<boolean>;
     getStockStickerTemplates(data: StockStickersPrintLayouts): Promise<StockStickersPrintLayouts[]>;
     generateCommissionOrders(transId: number, onlyGenerateForDirectSellSuppliers: boolean): Promise<boolean>;
-    getDeliveryOrderStatus(transId: number, lineNr: number): Promise<DeliveryOrderStatus>;
     getAvailableStockGroupedByWLBSByTransIdLineNr(transId: number, lineNr: number): Promise<AvailableStock[]>;
     allocateGoodsForSalesOrder(request: AllocateGoodsForSalesOrderRequest): Promise<boolean>;
     allocateGoodsForSalesOrderCorrection(request: AllocateGoodsForSalesOrderCorrectionRequest): Promise<boolean>;
-    getGoodsAllocationStatus(transId: number, lineNr: number): Promise<GoodsAllocationStatus>;
-    getGoodsAllocationStatusWithHistory(transId: number, lineNr: number): Promise<GoodsAllocationStatusWithHistory>;
+    getGoodsAllocationHistory(transId: number, lineNr: number): Promise<GoodsAllocationHistory>;
     getOrderConfirmationEmailLayouts(transactionUUID: string): Promise<ReportLayoutSelectionEmail[]>;
     getOrderConfirmationPrintLayouts(transactionUUID: string): Promise<ReportLayoutSelectionPrint[]>;
     getOrderConfirmationDefaultSendMethod(relationId: number): Promise<number>;
@@ -226,5 +223,7 @@ export declare class TransactionConnectorAdapterService {
     getJoinedTags(table: string, key: string): Promise<TagTreeItem[]>;
     getTransactionInfo(transId: number, lineNr: number): Promise<TransactionInfoHistory[]>;
     getRefTransactions(transId: number): Promise<RefTransaction[]>;
+    getInternalParameterValue(param: InternalParam): Promise<boolean>;
+    getPackageStickerPrintLayouts(): Promise<ReportLayoutSelectionPrint[]>;
     private _handleExceptionFromResponse;
 }