@colijnit/transaction 261.20.22 → 261.20.23

package/index.d.ts

@@ -165,6 +165,8 @@ import { ExternalCatalogStartupInfo } from '@colijnit/articleapi/build/model/ext
 import { ArticleExtended } from '@colijnit/articleapi/build/model/article-extended.bo';
 import { GetArticlePriceRequest } from '@colijnit/articleapi/build/model/get-article-price-request';
 import { GetArticlePriceResult } from '@colijnit/articleapi/build/model/get-article-price-result';
+import { Unit } from '@colijnit/articleapi/build/model/unit';
+import { ConvertQuantityToDefaultUnitRequest } from '@colijnit/articleapi/build/model/convert-quantity-to-default-unit-request';
 import { OrderLineSetCategory } from '@colijnit/mainapi/build/model/order-line-set-category.bo';
 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';
@@ -779,6 +781,7 @@ declare class TransactionEventService {
     readonly editTransactionText: Subject<TransactionLineInfo>;
     readonly editorActive: BehaviorSubject<boolean>;
     readonly articleLineTextAddedOrChanged: Subject<number>;
+    readonly requestConversionAssistant: Subject<TransactionLineInfo>;
     readonly newPlanOrderEvent: Subject<void>;
     readonly updatePlanningEvent: Subject<void>;
     readonly openSidePanel: Subject<TransactionLineInfo>;
@@ -992,6 +995,8 @@ declare class ArticleConnectorService {
     storeCatFarmCompositionArticle(catalogId: number, articleFlatTree: ArticleFlatTreeDTO): Promise<string>;
     getWebViewStartupInfo(request: ExternalCatalogStartupInfoRequest): Promise<ExternalCatalogStartupInfo>;
     getArticlePrice(request: GetArticlePriceRequest): Promise<GetArticlePriceResult>;
+    getConversionUnitsForDefaultArticleUnitByGoodIdAndTransactionKind(goodId: number, transactionKind: string): Promise<Unit[]>;
+    convertAmountByUnitCodeToDefaultUnitOfArticle(request: ConvertQuantityToDefaultUnitRequest): Promise<number>;
     private _handleExceptionFromResponse;
     static ɵfac: i0.ɵɵFactoryDeclaration<ArticleConnectorService, never>;
     static ɵprov: i0.ɵɵInjectableDeclaration<ArticleConnectorService>;
@@ -1998,6 +2003,7 @@ declare enum Icon {
     BarsFilter = "bars_filter",
     BoxesPackingRegular = "boxes_packing_regular",
     BoxOpenFullRegular = "box_open_full_regular",
+    CalculatorRegularFull = "calculator_regular_full",
     CalendarDay = "calendar_day",
     CalendarDayRegular = "calendar_day_regular",
     CalendarLinesRegular = "calendar_lines_regular",
@@ -2506,6 +2512,7 @@ declare class TransactionService extends PendingReasonService {
     updateTextLine(uuid: string, lineUuid: string, showOnDocuments: number, text: string): Promise<boolean>;
     changeLineSequence(lineUuid: string, aboveLineNr?: number, belowLineNr?: number): Promise<boolean>;
     deleteTransactionLine(transactionLineUuid: string): Promise<boolean>;
+    checkLockandChangeTransactionLineQuantity(transactionUuid: string, lineUuid: string, newQuantity: number): Promise<boolean>;
     changeTransactionLineQuantity(transactionUuid: string, lineUuid: string, newQuantity: number): Promise<boolean>;
     changeTransactionLineAssemblyTime(uuid: string, lineUuid: string, time: number): Promise<TransactionInfoResponse>;
     changeLineShippingCost(uuid: string, lineUuid: string, newShippingCost: number): Promise<TransactionInfoResponse>;
@@ -4116,7 +4123,6 @@ declare class RelationAddressComponent extends RelationBaseComponent implements
     fields: Object;
     countryModel: Country;
     postalCodeCheckErrorMessage: string;
-    wrongAddress: boolean;
     private _prevPostalCodeForCheck;
     private _prevHouseNoForCheck;
     private _address;
@@ -4766,11 +4772,25 @@ declare class TransactionTextLineModule {
     static ɵinj: i0.ɵɵInjectorDeclaration<TransactionTextLineModule>;
 }
 
+declare class ArticleService {
+    private _articleConnectorService;
+    private _selectMultipleParameterizedCacheService;
+    constructor(_articleConnectorService: ArticleConnectorService, _selectMultipleParameterizedCacheService: TransactionSelectMultipleParameterizedCacheService);
+    getWarehouseLocations(warehouseNr: number): Promise<any>;
+    getWebViewStartupInfo(request: ExternalCatalogStartupInfoRequest): Promise<ExternalCatalogStartupInfo>;
+    getArticlePrice(request: GetArticlePriceRequest): Promise<GetArticlePriceResult>;
+    getConversionUnitsForDefaultArticleUnitByGoodIdAndTransactionKind(goodId: number, transactionKind: string): Promise<Unit[]>;
+    convertAmountByUnitCodeToDefaultUnitOfArticle(goodId: number, transactionKind: TransactionKind, conversionAmount: number, unitCode: string): Promise<number>;
+    static ɵfac: i0.ɵɵFactoryDeclaration<ArticleService, never>;
+    static ɵprov: i0.ɵɵInjectableDeclaration<ArticleService>;
+}
+
 declare class TransactionLineActionButtonsComponent implements OnInit {
     elementRef: ElementRef;
     iconCacheService: IconCacheService;
     private _transactionService;
     private _transactionEventService;
+    private _articleService;
     private _overlayService;
     private _changeDetector;
     private _lineSelectionService;
@@ -4794,7 +4814,7 @@ declare class TransactionLineActionButtonsComponent implements OnInit {
     private _transactionLine;
     private _actionButtonsPopupComponentRef;
     private _orderLineSet;
-    constructor(elementRef: ElementRef, iconCacheService: IconCacheService, _transactionService: TransactionService, _transactionEventService: TransactionEventService, _overlayService: OverlayService, _changeDetector: ChangeDetectorRef, _lineSelectionService: LineSelectionService);
+    constructor(elementRef: ElementRef, iconCacheService: IconCacheService, _transactionService: TransactionService, _transactionEventService: TransactionEventService, _articleService: ArticleService, _overlayService: OverlayService, _changeDetector: ChangeDetectorRef, _lineSelectionService: LineSelectionService);
     ngOnInit(): void;
     handleShowHideClick(event: MouseEvent): void;
     reopenExternalOrderClick(): void;
@@ -4805,9 +4825,11 @@ declare class TransactionLineActionButtonsComponent implements OnInit {
     handleViewStockButtonClick(): void;
     handleClickCopyLineButtonClick(): void;
     handleShowSidePanel(): void;
+    handleCoversionAssistantButtonClick(): void;
     private _showPopup;
     private _hidePopup;
     private _isReopenableExternalCatalogLine;
+    private _getConversionUnitsAvailable;
     static ɵfac: i0.ɵɵFactoryDeclaration<TransactionLineActionButtonsComponent, never>;
     static ɵcmp: i0.ɵɵComponentDeclaration<TransactionLineActionButtonsComponent, "co-transaction-line-action-buttons", never, { "configNames": { "alias": "configNames"; "required": false; }; "transactionLine": { "alias": "transactionLine"; "required": false; }; "isFirst": { "alias": "isFirst"; "required": false; }; "orderLineSets": { "alias": "orderLineSets"; "required": false; }; }, { "waitingForUserAction": "waitingForUserAction"; "transactionArticleTextOverviewButtonClicked": "transactionArticleTextOverviewButtonClicked"; "transactionTextButtonClicked": "transactionTextButtonClicked"; "articleTextButtonClicked": "articleTextButtonClicked"; "sidePanelButtonClicked": "sidePanelButtonClicked"; }, never, never, false, never>;
 }
@@ -5104,6 +5126,7 @@ declare class TransactionLineActionButtonsPopupComponent {
     canReopenExternalOrder: boolean;
     canCreateService: boolean;
     areAllowedToChangeOrder: boolean;
+    conversionUnitsAvailable: boolean;
     reopenExternalOrderClick: EventEmitter<void>;
     addDocumentButtonClick: EventEmitter<void>;
     articleTextButtonClick: EventEmitter<void>;
@@ -5112,6 +5135,7 @@ declare class TransactionLineActionButtonsPopupComponent {
     viewStockButtonClick: EventEmitter<void>;
     sidePanelButtonClick: EventEmitter<void>;
     copyLineButtonClick: EventEmitter<void>;
+    convAssistButtonClick: EventEmitter<void>;
     clickOutsideClick: EventEmitter<void>;
     showClass: boolean;
     constructor(iconCacheService: IconCacheService);
@@ -5123,8 +5147,9 @@ declare class TransactionLineActionButtonsPopupComponent {
     handleViewStockButtonClick(event: MouseEvent): void;
     handleSidePanelButtonClick(event: MouseEvent): void;
     handleCopyLineButtonClick(event: MouseEvent): void;
+    handleCalcAssistButtonClick(event: MouseEvent): void;
     static ɵfac: i0.ɵɵFactoryDeclaration<TransactionLineActionButtonsPopupComponent, never>;
-    static ɵcmp: i0.ɵɵComponentDeclaration<TransactionLineActionButtonsPopupComponent, "co-transaction-line-action-buttons-popup", never, { "configNames": { "alias": "configNames"; "required": false; }; "parentForOverlay": { "alias": "parentForOverlay"; "required": false; }; "canReopenExternalOrder": { "alias": "canReopenExternalOrder"; "required": false; }; "canCreateService": { "alias": "canCreateService"; "required": false; }; "areAllowedToChangeOrder": { "alias": "areAllowedToChangeOrder"; "required": false; }; }, { "reopenExternalOrderClick": "reopenExternalOrderClick"; "addDocumentButtonClick": "addDocumentButtonClick"; "articleTextButtonClick": "articleTextButtonClick"; "transactionTextButtonClick": "transactionTextButtonClick"; "createServiceButtonClick": "createServiceButtonClick"; "viewStockButtonClick": "viewStockButtonClick"; "sidePanelButtonClick": "sidePanelButtonClick"; "copyLineButtonClick": "copyLineButtonClick"; "clickOutsideClick": "clickOutsideClick"; }, never, never, false, never>;
+    static ɵcmp: i0.ɵɵComponentDeclaration<TransactionLineActionButtonsPopupComponent, "co-transaction-line-action-buttons-popup", never, { "configNames": { "alias": "configNames"; "required": false; }; "parentForOverlay": { "alias": "parentForOverlay"; "required": false; }; "canReopenExternalOrder": { "alias": "canReopenExternalOrder"; "required": false; }; "canCreateService": { "alias": "canCreateService"; "required": false; }; "areAllowedToChangeOrder": { "alias": "areAllowedToChangeOrder"; "required": false; }; "conversionUnitsAvailable": { "alias": "conversionUnitsAvailable"; "required": false; }; }, { "reopenExternalOrderClick": "reopenExternalOrderClick"; "addDocumentButtonClick": "addDocumentButtonClick"; "articleTextButtonClick": "articleTextButtonClick"; "transactionTextButtonClick": "transactionTextButtonClick"; "createServiceButtonClick": "createServiceButtonClick"; "viewStockButtonClick": "viewStockButtonClick"; "sidePanelButtonClick": "sidePanelButtonClick"; "copyLineButtonClick": "copyLineButtonClick"; "convAssistButtonClick": "convAssistButtonClick"; "clickOutsideClick": "clickOutsideClick"; }, never, never, false, never>;
 }
 
 declare class TransactionLineActionButtonsModule {
@@ -6270,17 +6295,6 @@ declare class TransactionLineSidePanelArticleDetailsComponent {
     static ɵcmp: i0.ɵɵComponentDeclaration<TransactionLineSidePanelArticleDetailsComponent, "co-transaction-line-side-panel-article-details", never, { "suppliers": { "alias": "suppliers"; "required": false; }; "warehouses": { "alias": "warehouses"; "required": false; }; "purchaseAdviceLine": { "alias": "purchaseAdviceLine"; "required": false; }; "onlySupplierAvailable": { "alias": "onlySupplierAvailable"; "required": false; }; }, { "purchaseAdviceLineChange": "purchaseAdviceLineChange"; "closeSideBarClicked": "closeSideBarClicked"; }, never, never, false, never>;
 }
 
-declare class ArticleService {
-    private _articleConnectorService;
-    private _selectMultipleParameterizedCacheService;
-    constructor(_articleConnectorService: ArticleConnectorService, _selectMultipleParameterizedCacheService: TransactionSelectMultipleParameterizedCacheService);
-    getWarehouseLocations(warehouseNr: number): Promise<any>;
-    getWebViewStartupInfo(request: ExternalCatalogStartupInfoRequest): Promise<ExternalCatalogStartupInfo>;
-    getArticlePrice(request: GetArticlePriceRequest): Promise<GetArticlePriceResult>;
-    static ɵfac: i0.ɵɵFactoryDeclaration<ArticleService, never>;
-    static ɵprov: i0.ɵɵInjectableDeclaration<ArticleService>;
-}
-
 declare class AlternateSupplierTileComponent {
     changeDetection: ChangeDetectorRef;
     private _articleService;
@@ -6711,7 +6725,7 @@ declare class TransactionPlanningLinePlannedResourceComponent {
 
 declare class TransactionPlanningLineModule {
     static ɵfac: i0.ɵɵFactoryDeclaration<TransactionPlanningLineModule, never>;
-    static ɵmod: i0.ɵɵNgModuleDeclaration<TransactionPlanningLineModule, [typeof TransactionPlanningLineComponent, typeof TransactionPlanningLinePlannedResourceComponent], [typeof i2.CommonModule, typeof CoreModule, typeof i3.ButtonModule, typeof i3.InputNumberPickerModule, typeof TransactionArticleTextModule, typeof TransactionArticleTextOverviewModule, typeof PipeModule, typeof TransactionLineActionButtonsModule, typeof i3.IconModule, typeof EditableLabelModule, typeof TransactionLinePriceModule, typeof TransactionLineDescriptionModule, typeof TransactionBaseLineModule, typeof i13.DragDropModule, typeof TransactionLineCommissionButtonModule, typeof TransactionLineWarehouseButtonModule, typeof TransactionLineDeliveryButtonModule, typeof TransactionLineDeliveryDateButtonModule, typeof DialogTransactionLineVatModule, typeof DialogTransactionLineDiscountModule, typeof TransactionLineStatusbarModule, typeof TransactionLineAmountModule, typeof TransactionLineVatButtonModule, typeof TransactionLineDiscountButtonModule, typeof TransactionLineDeliveryDateModule, typeof i3.ObserveVisibilityModule, typeof i3.ScreenConfigurationModule, typeof TransactionLineLabelModule], [typeof TransactionPlanningLineComponent]>;
+    static ɵmod: i0.ɵɵNgModuleDeclaration<TransactionPlanningLineModule, [typeof TransactionPlanningLineComponent, typeof TransactionPlanningLinePlannedResourceComponent], [typeof i2.CommonModule, typeof CoreModule, typeof i3.ButtonModule, typeof i3.InputNumberPickerModule, typeof TransactionArticleTextModule, typeof TransactionArticleTextOverviewModule, typeof PipeModule, typeof TransactionLineActionButtonsModule, typeof i3.IconModule, typeof EditableLabelModule, typeof TransactionLinePriceModule, typeof TransactionLineDescriptionModule, typeof TransactionBaseLineModule, typeof i13.DragDropModule, typeof TransactionLineCommissionButtonModule, typeof TransactionLineWarehouseButtonModule, typeof TransactionLineDeliveryButtonModule, typeof TransactionLineDeliveryDateButtonModule, typeof DialogTransactionLineVatModule, typeof DialogTransactionLineDiscountModule, typeof TransactionLineStatusbarModule, typeof TransactionLineAmountModule, typeof TransactionLineVatButtonModule, typeof TransactionLineDiscountButtonModule, typeof TransactionLineDeliveryDateModule, typeof i3.ObserveVisibilityModule, typeof i3.ScreenConfigurationModule, typeof TransactionLineLabelModule], [typeof TransactionPlanningLineComponent, typeof TransactionPlanningLinePlannedResourceComponent]>;
     static ɵinj: i0.ɵɵInjectorDeclaration<TransactionPlanningLineModule>;
 }
 
@@ -7881,7 +7895,7 @@ declare class TransactionSalesOverviewButtonBarButtonComponent extends Transacti
     showCategories: boolean;
     constructor(iconCacheService: IconCacheService, changeDetector: ChangeDetectorRef, _transactionEventService: TransactionEventService, _mappingService: TransactionMappingService, _dictionaryService: DictionaryService, _screenConfigService: TransactionScreenConfigurationService, _transactionService: TransactionService, _elementRef: ElementRef, _renderer: Renderer2, _transactionBaseService: TransactionService);
     currentIcon(): Icon.CartShoppingRegular | Icon.ChartPieSimpleRegular;
-    currentTitle(): "MARGINS" | "OVERVIEW";
+    currentTitle(): "OVERVIEW" | "MARGINS";
     ngOnDestroy(): void;
     handleClickWrapper(event: MouseEvent): void;
     handleMarginClicked(event: MouseEvent, category: TransactionTypeCategory): void;
@@ -7907,7 +7921,7 @@ declare class TransactionPurchaseOverviewButtonBarButtonComponent extends Transa
     constructor(iconCacheService: IconCacheService, transactionHeaderService: TransactionHeaderService, transactionEventService: TransactionEventService, changeDetector: ChangeDetectorRef, _mappingService: TransactionMappingService, _transactionService: TransactionService, _elementRef: ElementRef);
     ngOnDestroy(): void;
     currentIcon(): Icon.CartShoppingRegular | Icon.ChartPieSimpleRegular;
-    currentTitle(): "MARGINS" | "OVERVIEW";
+    currentTitle(): "OVERVIEW" | "MARGINS";
     handleClickWrapper(event: MouseEvent): void;
     handleMarginClicked(event: MouseEvent, category: TransactionTypeCategory): Promise<void>;
     private handleDocumentClick;
@@ -7959,7 +7973,7 @@ declare class TransactionSalesQuotationButtonBarButtonComponent extends Transact
     showCategories: boolean;
     constructor(iconCacheService: IconCacheService, changeDetector: ChangeDetectorRef, _transactionEventService: TransactionEventService, _mappingService: TransactionMappingService, _dictionaryService: DictionaryService, _screenConfigService: TransactionScreenConfigurationService, _transactionService: TransactionService, _elementRef: ElementRef, _renderer: Renderer2, _transactionBaseService: TransactionService);
     currentIcon(): Icon.CartShoppingRegular | Icon.ChartPieSimpleRegular;
-    currentTitle(): "MARGINS" | "OVERVIEW";
+    currentTitle(): "OVERVIEW" | "MARGINS";
     ngOnDestroy(): void;
     handleClickWrapper(event: MouseEvent): void;
     handleMarginClicked(event: MouseEvent, category: TransactionTypeCategory): void;
@@ -8595,7 +8609,8 @@ declare enum DeliveryPlanningUpdateActions {
     PlanOrder = "planOrder",
     PlanLines = "planLines",
     DeletePlannedOrder = "deletePlannedOrder",
-    DeletePlannedLines = "deletePlannedLines"
+    DeletePlannedLines = "deletePlannedLines",
+    DeleteOrderReplan = "deleteOrderReplan"
 }
 
 declare class DeliveryPlanningMainComponent implements OnInit, OnDestroy {
@@ -8622,6 +8637,7 @@ declare class DeliveryPlanningMainComponent implements OnInit, OnDestroy {
         oldWeek: PlanningTransportWeekDay[];
         week: PlanningTransportWeekDay[];
         action: DeliveryPlanningUpdateActions;
+        resolve?: () => void;
     }): Promise<void>;
     updateNewValues(): Promise<void>;
     getPlanningTransportWeek(): Promise<void>;
@@ -8868,6 +8884,7 @@ declare class DeliveryPlanningOverviewComponent implements OnInit, OnDestroy {
         oldWeek: PlanningTransportWeekDay[];
         week: PlanningTransportWeekDay[];
         action: DeliveryPlanningUpdateActions;
+        resolve?: () => void;
     }>;
     resetPlanningTransportEvent: EventEmitter<void>;
     get planTransportWeekArr(): PlanningTransportWeekDay[][];
@@ -8929,6 +8946,7 @@ declare class DeliveryPlanningOverviewComponent implements OnInit, OnDestroy {
         end: Date;
         transId: number;
     }, transportWeekDay: PlanningTransportWeekDay, week: PlanningTransportWeekDay[]): Promise<void>;
+    handleMoveNormalEvent(transId: string, transport: PlanningTransportWeekDay, week: PlanningTransportWeekDay[], weekArr: PlanningTransportWeekDay[][]): Promise<void>;
     handleReorderOrder(event: {
         transId: number;
         insertIndex: number;
@@ -11595,6 +11613,8 @@ declare class TransactionLineToolbarComponent implements OnInit {
     iconCacheService: IconCacheService;
     private _transactionEventService;
     private _transactionService;
+    private _articleService;
+    private _changeDetector;
     readonly: boolean;
     readonly icons: typeof Icon;
     private _transactionKind;
@@ -11605,14 +11625,16 @@ declare class TransactionLineToolbarComponent implements OnInit {
     canReopenExternalOrder: boolean;
     canCreateService: boolean;
     areAllowedToChangeOrder: boolean;
+    conversionUnitsAvailable: boolean;
     set transactionLine(value: TransactionLineInfo);
     set orderLineSets(value: OrderLineSetInfo[]);
     get orderLineSets(): OrderLineSetInfo[];
     get transactionLine(): TransactionLineInfo;
     waitingForUserAction: EventEmitter<boolean>;
+    calcAssistButtonClick: EventEmitter<void>;
     showClass(): boolean;
-    constructor(iconCacheService: IconCacheService, _transactionEventService: TransactionEventService, _transactionService: TransactionService);
-    ngOnInit(): void;
+    constructor(iconCacheService: IconCacheService, _transactionEventService: TransactionEventService, _transactionService: TransactionService, _articleService: ArticleService, _changeDetector: ChangeDetectorRef);
+    ngOnInit(): Promise<void>;
     handleReopenExternalOrderClick(): void;
     handleAddDocumentButtonClick(): void;
     handleTransactionText(): void;
@@ -11621,9 +11643,12 @@ declare class TransactionLineToolbarComponent implements OnInit {
     handleViewStockButtonClick(): void;
     handleCopyLineButtonClick(): void;
     handleSidePanelButtonClick(): void;
+    handleCalcAssistButtonClick(): void;
     private _isReopenableExternalCatalogLine;
+    private _getConversionUnitsAvailable;
+    private _detectChanges;
     static ɵfac: i0.ɵɵFactoryDeclaration<TransactionLineToolbarComponent, never>;
-    static ɵcmp: i0.ɵɵComponentDeclaration<TransactionLineToolbarComponent, "co-transaction-line-toolbar", never, { "configNames": { "alias": "configNames"; "required": false; }; "canReopenExternalOrder": { "alias": "canReopenExternalOrder"; "required": false; }; "canCreateService": { "alias": "canCreateService"; "required": false; }; "areAllowedToChangeOrder": { "alias": "areAllowedToChangeOrder"; "required": false; }; "transactionLine": { "alias": "transactionLine"; "required": false; }; "orderLineSets": { "alias": "orderLineSets"; "required": false; }; }, { "waitingForUserAction": "waitingForUserAction"; }, never, never, false, never>;
+    static ɵcmp: i0.ɵɵComponentDeclaration<TransactionLineToolbarComponent, "co-transaction-line-toolbar", never, { "configNames": { "alias": "configNames"; "required": false; }; "canReopenExternalOrder": { "alias": "canReopenExternalOrder"; "required": false; }; "canCreateService": { "alias": "canCreateService"; "required": false; }; "areAllowedToChangeOrder": { "alias": "areAllowedToChangeOrder"; "required": false; }; "conversionUnitsAvailable": { "alias": "conversionUnitsAvailable"; "required": false; }; "transactionLine": { "alias": "transactionLine"; "required": false; }; "orderLineSets": { "alias": "orderLineSets"; "required": false; }; }, { "waitingForUserAction": "waitingForUserAction"; "calcAssistButtonClick": "calcAssistButtonClick"; }, never, never, false, never>;
 }
 
 declare class TransactionLineToolbarModule {
@@ -13600,6 +13625,7 @@ declare class TransactionInternalComponent implements OnInit, OnDestroy {
     showReservationPopup: boolean;
     showTransactionText: boolean;
     showArticleText: boolean;
+    showConversionAssistant: boolean;
     showCopyOrderDialog: boolean;
     showArticleStockPopup: boolean;
     showPreferredPlanning: boolean;
@@ -13637,6 +13663,7 @@ declare class TransactionInternalComponent implements OnInit, OnDestroy {
     handleShowArticleTextOverview(line: TransactionLineInfo): void;
     handleShowTransactionText(line: TransactionLineInfo): void;
     handleShowArticleText(line: TransactionLineInfo): void;
+    handleShowConversionAssistant(line: TransactionLineInfo): void;
     saveTransactionLineText(data: {
         request: TransactionAddTextLineRequest;
         new: boolean;
@@ -13651,6 +13678,7 @@ declare class TransactionInternalComponent implements OnInit, OnDestroy {
     }): Promise<void>;
     handleEditTransactionText(line: TransactionLineInfo): void;
     handleEditArticleText(line: TransactionLineInfo): void;
+    updateArticleLineAmount(amount: number): Promise<void>;
     handleCopyTransactionLine(line: TransactionLineInfo): void;
     handleCreateServiceRequest(lineNr: number): void;
     handleViewStock(goodId: number): void;
@@ -13661,6 +13689,8 @@ declare class TransactionInternalComponent implements OnInit, OnDestroy {
     showTransactionTextDialog(): void;
     showArticleTextDialog(): void;
     showArticleTextOverviewDialog(): void;
+    showConversionAssistantDialog(): void;
+    closeConversionAssistantDialog(): void;
     shouldShowTiles(): boolean;
     fullyInvoiced(): boolean;
     private _getOrderLineSetIfExists;
@@ -15910,6 +15940,7 @@ declare class DialogTransactionLineWarehouseCcComponent extends DialogBaseCompon
     iconCacheService: IconCacheService;
     transactionHeaderService: TransactionHeaderService;
     transactionLineService: TransactionLineService;
+    protected articleService: ArticleService;
     readonly icons: typeof Icon;
     readonly tab: typeof WarehouseCCTab;
     readonly buttonType: typeof AppPopupButtonType;
@@ -15933,8 +15964,12 @@ declare class DialogTransactionLineWarehouseCcComponent extends DialogBaseCompon
     directSellSupplier: SupplierLightObject;
     directSellPurchaseOrderNumber: number;
     stockForecastDeliveryDate: Date;
+    conversionUnitsAvailable: boolean;
+    conversionUnits: Unit[];
+    chosenConversionUnit: Unit;
+    conversionAmount: string;
     readonly TransactionKind: typeof TransactionKind;
-    constructor(iconCacheService: IconCacheService, transactionHeaderService: TransactionHeaderService, transactionLineService: TransactionLineService);
+    constructor(iconCacheService: IconCacheService, transactionHeaderService: TransactionHeaderService, transactionLineService: TransactionLineService, articleService: ArticleService);
     ngOnInit(): Promise<void>;
     handleQuantityChange(value: any): void;
     handleCommissionCodeChange(value: any): void;
@@ -15944,16 +15979,18 @@ declare class DialogTransactionLineWarehouseCcComponent extends DialogBaseCompon
     handleClose(type: AppPopupButtonType): void;
     showTab(tab: WarehouseCCTab): void;
     checkWarehouseForTabSwitch(tab: WarehouseCCTab): void;
+    recalculateConversionAmountIfNeeded(): Promise<void>;
     handleCloseDialog(event: MouseEvent, type: AppPopupButtonType): void;
     private _activeTabValid;
     private _scrollIntoView;
+    protected readonly model: i0.ModelFunction;
     static ɵfac: i0.ɵɵFactoryDeclaration<DialogTransactionLineWarehouseCcComponent, never>;
     static ɵcmp: i0.ɵɵComponentDeclaration<DialogTransactionLineWarehouseCcComponent, "co-dialog-transaction-line-warehouse-cc", never, { "transactionKind": { "alias": "transactionKind"; "required": false; }; }, { "close": "close"; }, never, never, false, never>;
 }
 
 declare class DialogTransactionLineWarehouseCcModule {
     static ɵfac: i0.ɵɵFactoryDeclaration<DialogTransactionLineWarehouseCcModule, never>;
-    static ɵmod: i0.ɵɵNgModuleDeclaration<DialogTransactionLineWarehouseCcModule, [typeof DialogTransactionLineWarehouseCcComponent, typeof TransactionLineWarehouseCcGeneralComponent, typeof TransactionLineWarehouseCcDirectsellComponent, typeof TransactionLineWarehouseCcInterbranchComponent], [typeof i2.CommonModule, typeof i3.CoDialogModule, typeof PipeModule, typeof TransactionLineCheckboxModule, typeof TransactionLineCommissionCodeModule, typeof TransactionLineWarehouseModule, typeof i3.InputNumberPickerModule, typeof i3.ButtonModule, typeof i3.IconModule, typeof i3.ListOfValuesModule, typeof i3.InputCheckboxModule, typeof i3.FormModule, typeof TransactionLineDirectSellModule, typeof i3.InputTextModule], [typeof DialogTransactionLineWarehouseCcComponent]>;
+    static ɵmod: i0.ɵɵNgModuleDeclaration<DialogTransactionLineWarehouseCcModule, [typeof DialogTransactionLineWarehouseCcComponent, typeof TransactionLineWarehouseCcGeneralComponent, typeof TransactionLineWarehouseCcDirectsellComponent, typeof TransactionLineWarehouseCcInterbranchComponent], [typeof i2.CommonModule, typeof i3.CoDialogModule, typeof PipeModule, typeof TransactionLineCheckboxModule, typeof TransactionLineCommissionCodeModule, typeof TransactionLineWarehouseModule, typeof i3.InputNumberPickerModule, typeof i3.ButtonModule, typeof i3.IconModule, typeof i3.ListOfValuesModule, typeof i3.InputCheckboxModule, typeof i3.FormModule, typeof TransactionLineDirectSellModule, typeof i3.InputTextModule, typeof PipeModule], [typeof DialogTransactionLineWarehouseCcComponent]>;
     static ɵinj: i0.ɵɵInjectorDeclaration<DialogTransactionLineWarehouseCcModule>;
 }
 
@@ -16156,9 +16193,37 @@ declare class TransactionLineActivitiesModule {
     static ɵinj: i0.ɵɵInjectorDeclaration<TransactionLineActivitiesModule>;
 }
 
+declare class TransactionLineConversionAssistantComponent implements OnInit {
+    iconCacheService: IconCacheService;
+    private _articleService;
+    private _transactionService;
+    readonly icons: typeof Icon;
+    transactionLine: TransactionLineInfo;
+    closeClick: EventEmitter<MouseEvent>;
+    cancelClick: EventEmitter<MouseEvent>;
+    saveClick: EventEmitter<number>;
+    showClass(): boolean;
+    conversionUnits: Unit[];
+    chosenConversionUnit: Unit;
+    conversionAmount: string;
+    articleAmount: number;
+    constructor(iconCacheService: IconCacheService, _articleService: ArticleService, _transactionService: TransactionService);
+    ngOnInit(): void;
+    private _getConversionUnits;
+    recalculateConversionAmountIfNeeded(): Promise<void>;
+    static ɵfac: i0.ɵɵFactoryDeclaration<TransactionLineConversionAssistantComponent, never>;
+    static ɵcmp: i0.ɵɵComponentDeclaration<TransactionLineConversionAssistantComponent, "co-transaction-line-conversion-assistant", never, { "transactionLine": { "alias": "transactionLine"; "required": false; }; }, { "closeClick": "closeClick"; "cancelClick": "cancelClick"; "saveClick": "saveClick"; }, never, never, false, never>;
+}
+
+declare class TransactionLineConversionAssistantModule {
+    static ɵfac: i0.ɵɵFactoryDeclaration<TransactionLineConversionAssistantModule, never>;
+    static ɵmod: i0.ɵɵNgModuleDeclaration<TransactionLineConversionAssistantModule, [typeof TransactionLineConversionAssistantComponent], [typeof i2.CommonModule, typeof CoreModule, typeof i3.CoDialogModule, typeof i13.DragDropModule, typeof i3.ButtonModule, typeof TransactionArticleTextModule, typeof PipeModule, typeof i3.IconModule, typeof i3.InputNumberPickerModule, typeof i3.InputTextModule, typeof i3.ListOfValuesModule], [typeof TransactionLineConversionAssistantComponent]>;
+    static ɵinj: i0.ɵɵInjectorDeclaration<TransactionLineConversionAssistantModule>;
+}
+
 declare class TransactionInternalModule {
     static ɵfac: i0.ɵɵFactoryDeclaration<TransactionInternalModule, never>;
-    static ɵmod: i0.ɵɵNgModuleDeclaration<TransactionInternalModule, [typeof TransactionInternalComponent, typeof TransactionSalesReservationPopupComponent], [typeof i2.CommonModule, typeof TransactionHeaderModule, typeof TransactionQuickAccessModule, typeof TransactionButtonBarModule, typeof AvatarModule, typeof i3.ViewModeButtonsModule, typeof TransactionCardModule, typeof TransactionLinesModule, typeof AddProductModule, typeof TransactionTotalsModule, typeof TransactionLineSidePanelModule, typeof TransactionArticleTextOverviewModule, typeof TransactionArticleTextModule, typeof PipeModule, typeof TransactionCopyOrderModule, typeof i13.DragDropModule, typeof TransactionLinesSidePanelModule, typeof i3.ButtonModule, typeof i3.IconModule, typeof TransactionButtonModule, typeof i3.ScreenConfigurationModule, typeof TransactionServiceOverviewModule, typeof TransactionCardsModule, typeof TransactionMarginModule, typeof ClickBlockModule, typeof DialogTransactionLineWarehouseCcModule, typeof DialogTransactionHeaderBranchModule, typeof DialogBranchModule, typeof TransactionPurchaseReservationOrderTileModule, typeof i3.CoDialogModule, typeof i6.StockModule, typeof TransactionArticleStockModule, typeof TransactionOrderTileModule, typeof TransactionHeaderCustomerPortalModule, typeof TransactionSalesPersonInputModule, typeof TransactionHeaderSalesPersonModule, typeof i3.ClickoutsideModule, typeof i3.OverlayModule, typeof TransactionHeaderHandledByModule, typeof i6.FormBuilderUserFormModule, typeof DeliveryPlanningOverviewModule, typeof TransactionLineActivitiesModule], [typeof TransactionInternalComponent, typeof TransactionSalesReservationPopupComponent]>;
+    static ɵmod: i0.ɵɵNgModuleDeclaration<TransactionInternalModule, [typeof TransactionInternalComponent, typeof TransactionSalesReservationPopupComponent], [typeof i2.CommonModule, typeof TransactionHeaderModule, typeof TransactionQuickAccessModule, typeof TransactionButtonBarModule, typeof AvatarModule, typeof i3.ViewModeButtonsModule, typeof TransactionCardModule, typeof TransactionLinesModule, typeof AddProductModule, typeof TransactionTotalsModule, typeof TransactionLineSidePanelModule, typeof TransactionArticleTextOverviewModule, typeof TransactionArticleTextModule, typeof PipeModule, typeof TransactionCopyOrderModule, typeof i13.DragDropModule, typeof TransactionLinesSidePanelModule, typeof i3.ButtonModule, typeof i3.IconModule, typeof TransactionButtonModule, typeof i3.ScreenConfigurationModule, typeof TransactionServiceOverviewModule, typeof TransactionCardsModule, typeof TransactionMarginModule, typeof ClickBlockModule, typeof DialogTransactionLineWarehouseCcModule, typeof DialogTransactionHeaderBranchModule, typeof DialogBranchModule, typeof TransactionPurchaseReservationOrderTileModule, typeof i3.CoDialogModule, typeof i6.StockModule, typeof TransactionArticleStockModule, typeof TransactionOrderTileModule, typeof TransactionHeaderCustomerPortalModule, typeof TransactionSalesPersonInputModule, typeof TransactionHeaderSalesPersonModule, typeof i3.ClickoutsideModule, typeof i3.OverlayModule, typeof TransactionHeaderHandledByModule, typeof i6.FormBuilderUserFormModule, typeof DeliveryPlanningOverviewModule, typeof TransactionLineActivitiesModule, typeof TransactionLineConversionAssistantModule], [typeof TransactionInternalComponent, typeof TransactionSalesReservationPopupComponent]>;
     static ɵinj: i0.ɵɵInjectorDeclaration<TransactionInternalModule>;
 }
 

package/lib/component/delivery-planning-main/component/delivery-planning-overview/component/delivery-planning-overview-popup/style/_layout.scss

@@ -1,7 +1,18 @@
 @include export-module('cc-delivery-planning-overview-popup-layout') {
   .co-delivery-planning-overview-popup {
 
+    .body-wrapper {
+      margin-top: 50px;
     .popup-row {
+
+      .row {
+        display: flex;
+        flex-direction: row;
+        align-items: center;
+        gap: 5px;
+        justify-content: start;
+        padding-bottom: 5px;
+      }
       display: flex;
       flex-direction: row;
       align-items: center;
@@ -10,6 +21,7 @@
       padding-bottom: 10px;
 
 
+    }
 
       co-editable-label {
         display: flex;

package/lib/component/dialog/transaction-line/dialog-transaction-line-warehouse-cc/style/_layout.scss

@@ -14,6 +14,27 @@
         flex-direction: column;
       }
     }
+    .transaction-line-warehouse-top-cc-section {
+       display: flex;
+       flex-direction: row;
+       column-gap: 5px;
+       margin: $tp-dialog-transaction-line-warehouse-cc-section-margin;
+       .bordered {
+        margin-left: 20px;
+      }
+
+      .unit-amount {
+        height: $tp-dialog-transaction-line-warehouse-cc-quantity-height;
+        max-width: 90px;
+      }
+
+      .unit-list {
+        height: $tp-dialog-transaction-line-warehouse-cc-quantity-height;
+        .co-input-text {
+          height: $tp-dialog-transaction-line-warehouse-cc-quantity-height;
+        }
+      }
+    }
     .transaction-line-warehouse-cc-section {
       display: flex;
       flex-direction: column;
@@ -42,6 +63,23 @@
     .quantity-number-picker {
       width: $tp-dialog-transaction-line-warehouse-cc-quantity-width;
       height: $tp-dialog-transaction-line-warehouse-cc-quantity-height;
+      .icon-wrapper{
+        max-width: $tp-dialog-transaction-line-warehouse-cc-quantity-height;
+      }
+      .co-input-text {
+        width: $tp-dialog-transaction-line-warehouse-cc-quantity-width;
+        height: $tp-dialog-transaction-line-warehouse-cc-quantity-height;
+        .right-icon {
+          min-width: $cc-co-list-of-values-right-icon-spacer-width;
+        }
+        .input-text-right-icon svg {
+          width: $cc-co-list-of-values-right-icon-width;
+          height: $cc-co-list-of-values-right-icon-width;
+          padding: $cc-co-list-of-values-right-icon-padding;
+          background: $cc-co-list-of-values-right-icon-background;
+          border-radius: $cc-co-list-of-values-right-icon-radius;
+        }
+      }
     }
     .transaction-line-warehouse-cc-section-label-wrapper {
       display: flex;

package/lib/component/dialog/transaction-line/dialog-transaction-line-warehouse-cc/style/_material-definition.scss

@@ -4,7 +4,7 @@ $tp-dialog-transaction-line-warehouse-cc-font-color: $tp-color-font !default;
 $tp-dialog-transaction-line-warehouse-cc-min-width: 500px !default;
 $tp-dialog-transaction-line-warehouse-cc-commission-code-height: 100px !default;
 $tp-dialog-transaction-line-warehouse-cc-quantity-width: 150px !default;
-$tp-dialog-transaction-line-warehouse-cc-quantity-height: 28px !default;
+$tp-dialog-transaction-line-warehouse-cc-quantity-height: 36px !default;
 $tp-dialog-transaction-line-warehouse-cc-tab-content-height: 460px !default;
 $tp-dialog-transaction-line-warehouse-cc-section-margin: 0 0 5px 0 !default;
 $tp-dialog-transaction-line-warehouse-cc-section-max-height: auto !default;

package/lib/component/shared/conversion-assistant/style/_layout.scss

@@ -0,0 +1,61 @@
+@import "../../../../style/mixin";
+
+@include export-module('co-transaction-line-conversion-assistant-layout') {
+  .co-transaction-line-conversion-assistant {
+    .co-dialog:not(.is-mobile) .co-dialog-wrapper {
+      width: 500px;
+      .assistant-header {
+        display: flex;
+        flex-direction: row;
+        column-gap: 5px;
+        align-items: center;
+        padding-bottom: 10px;
+      }
+
+      .assistant-content-wrapper {
+        display: flex;
+        flex-direction: row;
+        column-gap: 5px;
+
+        .unit-amount {
+          height: $tp-conversion-assistant-field-height;
+          max-width: 90px;
+        }
+
+        .unit-list {
+          height: $tp-conversion-assistant-field-height;
+
+          .co-input-text {
+            height: $tp-conversion-assistant-field-height;
+          }
+        }
+
+        .quantity-number-picker {
+          width: $tp-conversion-assistant-quantity-width;
+          height: $tp-conversion-assistant-field-height;
+
+          .icon-wrapper {
+            max-width: $tp-conversion-assistant-field-height;
+          }
+
+          .co-input-text {
+            width: $tp-conversion-assistant-quantity-width;
+            height: $tp-conversion-assistant-field-height;
+
+            .right-icon {
+              min-width: $cc-co-list-of-values-right-icon-spacer-width;
+            }
+
+            .input-text-right-icon svg {
+              width: $cc-co-list-of-values-right-icon-width;
+              height: $cc-co-list-of-values-right-icon-width;
+              padding: $cc-co-list-of-values-right-icon-padding;
+              background: $cc-co-list-of-values-right-icon-background;
+              border-radius: $cc-co-list-of-values-right-icon-radius;
+            }
+          }
+        }
+      }
+    }
+  }
+}

package/lib/component/shared/conversion-assistant/style/_material-definition.scss

@@ -0,0 +1,2 @@
+$tp-conversion-assistant-field-height: 36px !default;
+$tp-conversion-assistant-quantity-width: 150px !default;

package/lib/component/shared/conversion-assistant/style/_theme.scss

@@ -0,0 +1,6 @@
+@import "../../../../style/mixin";
+
+@include export-module('co-transaction-line-conversion-assistant-theme') {
+  .co-transaction-line-conversion-assistant {
+  }
+}

package/lib/component/shared/conversion-assistant/style/material.scss

@@ -0,0 +1,3 @@
+@import "./material-definition";
+@import "./layout";
+@import "./theme";

package/lib/component/transaction-header/transaction-header-popup/style/_material-definition.scss

@@ -78,6 +78,7 @@ $tp-transaction-header-popup-business-rule-applied-font-weight: normal !default;
 $tp-co-transaction-header-relation-content-gap: 60px !default;
 $tp-co-transaction-header-relation-content-padding: 0 0 0 0 !default;
 $tp-co-transaction-header-relation-content-empty: 0 !default;
+$tp-co-transaction-header-relation-content-empty-color: #1a73e8 !default;
 $tp-co-transaction-header-relation-content-padding-empty: 0 !default;
 $tp-co-transaction-header-relation-content-icon-left: 0 !default;
 $tp-co-transaction-header-relation-content-icon-top: 0 !default;

package/lib/component/transaction-header/transaction-header-relation/style/_layout.scss

@@ -84,6 +84,13 @@
       .no-relation-yet {
         position: relative;
         left: $tp-co-transaction-header-relation-content-empty;
+        .co-button {
+          border-style: solid;
+          border-width: 1px;
+          border-color: $tp-co-transaction-header-relation-content-empty-color;
+          color: $tp-co-transaction-header-relation-content-empty-color;
+          background-color: transparent;
+        }
       }
       .transaction-relation-icon {
         position: absolute;

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

@@ -99,6 +99,7 @@
         display: flex;
         align-items: center;
         width: 100%;
+        justify-content: end;
         .input-text-wrapper, .input-wrapper {
           max-width: 100%;
         }

package/lib/component/transaction-line/transaction-planning-line/components/transaction-planning-line-planned-resource/style/_layout.scss

@@ -1,13 +1,14 @@
 @include export-module('cc-transaction-planning-line-planned-resource-layout') {
   .co-transaction-planning-line-planned-resource {
-    .row{
-      align-items: center;
-      justify-content: center;
-      border: 1px solid rgba(black, 0.4);
-      border-radius: 8px;
-      display: flex;
-      flex-direction: row;
-      padding: 0.25em 0.5em;
+    height: 100%;
+    width: 100%;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+
+    span {
+      font-size: 10px;
+      font-weight: bold;
     }
   }
 }

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

@@ -1,9 +1,12 @@
 @include export-module('co-transaction-planning-line-layout') {
   .co-transaction-planning-line {
-    .row {
+    .planning-line-planned-resource-wrapper {
       display: flex;
-      flex-direction: row;
-      gap: 0.1em;
+      flex-direction: column;
+      height: 100%;
+      width: 100%;
+      justify-content: center;
+      align-items: center;
     }
 
     .transaction-line-section {

package/lib/component/transaction-lines-side-panel/transaction-lines-side-panel-cash-desk/style/_layout.scss

@@ -1,8 +1,11 @@
 @include export-module('co-transaction-lines-side-panel-cash-desk-layout') {
   .co-transaction-lines-side-panel-cash-desk {
     display: flex;
-    flex-direction: column;
+    flex-direction: column-reverse;
     align-items: center;
+    width: 300px;
+    max-width: 100%;
+    gap: 10px;
     //.co-key-pad {
     //  width: 80%;
     //}
@@ -30,11 +33,12 @@
     .cash-register-payment-methods-wrapper {
       display: flex;
       flex-wrap: wrap;
-      padding: 10px 0 0 0;
+      padding: 0;
       gap: 10px;
     }
     .co-payment-tile {
       width: calc(50% - 10px);
+      max-width: 150px;
       .co-tile-wrapper {
         padding: 5px;
         height: 75px;