@colijnit/transaction 12.1.98 → 12.1.99

package/lib/component/add-product/style/_layout.scss

@@ -1,14 +1,4 @@
 @include export-module('co-add-product-layout') {
   .co-add-product {
-    &.return {
-      .input-text-left-icon {
-        svg { // for fontawesome icons
-          fill: $tp-add-product-return-color;
-        }
-        & [fill] { // for own icons
-          fill: $tp-add-product-return-color;
-        }
-      }
-    }
   }
 }

package/lib/component/add-product/style/_theme.scss

@@ -1,4 +1,14 @@
 @include export-module('co-add-product-theme') {
   .co-add-product {
+    &.return {
+      .input-text-left-icon {
+        svg { // for fontawesome icons
+          fill: $tp-add-product-return-color;
+        }
+        & [fill] { // for own icons
+          fill: $tp-add-product-return-color;
+        }
+      }
+    }
   }
 }

package/lib/component/core/base/transaction-base.component.d.ts

@@ -52,6 +52,7 @@ export declare abstract class TransactionBaseComponent {
     private _selected;
     constructor(dictionaryService: DictionaryService, transactionService: TransactionService);
     handleCommit(value: any): Promise<boolean>;
+    deleteTransactionLineClick(event: MouseEvent): Promise<void>;
     protected commit(value: any): Promise<boolean>;
     protected transactionSet(): void;
     protected relationSet(): void;

package/lib/component/dialog/transaction-header/dialog-transaction-header-branch/dialog-transaction-header-branch.component.d.ts

@@ -0,0 +1,8 @@
+import { AppPopupButtonType } from '../../../core/enum/app-popup-button-type.enum';
+import { DialogTransactionBaseComponent } from '../../../core/base/dialog-transaction-base.component';
+export declare class DialogTransactionHeaderBranchComponent extends DialogTransactionBaseComponent {
+    readonly buttonType: typeof AppPopupButtonType;
+    showClass(): boolean;
+    handleValueChange(value: any): void;
+    handleOkClick(): void;
+}

package/lib/component/dialog/transaction-header/dialog-transaction-header-branch/dialog-transaction-header-branch.module.d.ts

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

package/lib/component/dialog/transaction-header/dialog-transaction-header-branch/style/_layout.scss

@@ -1,4 +1,11 @@
 @include export-module('co-dialog-transaction-header-branch-layout') {
   .co-dialog-transaction-header-branch {
+    .co-dialog:not(.is-mobile) .co-dialog-wrapper {
+      min-width: $tp-dialog-transaction-header-branch-min-width;
+    }
+    .co-dialog .dialog-content {
+      max-height: $tp-dialog-transaction-header-branch-height;
+      height: $tp-dialog-transaction-header-branch-height;
+    }
   }
 }

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

@@ -0,0 +1,2 @@
+$tp-dialog-transaction-header-branch-min-width: 410px !default;
+$tp-dialog-transaction-header-branch-height: 400px !default;

package/lib/component/dialog/transaction-line/dialog-transaction-line-warehouse-cc/dialog-transaction-line-warehouse-cc.component.d.ts

@@ -1,12 +1,13 @@
 import { DialogTransactionBaseComponent } from "../../../core/base/dialog-transaction-base.component";
 export declare class DialogTransactionLineWarehouseCcComponent extends DialogTransactionBaseComponent {
+    showClass(): boolean;
     quantity: number;
     commissionCode: string;
-    warehouse: string;
-    showClass(): boolean;
+    warehouse: number;
     handleQuantityChange(value: any): void;
     handleCommissionCodeChange(value: any): void;
     handleWarehouseChange(value: any): void;
     handleOkClick(): void;
     handleDialogClose(): void;
+    protected transactionLineSet(): void;
 }

package/lib/component/payment/payment.component.d.ts

@@ -1,12 +1,12 @@
-import { EventEmitter, OnDestroy, OnInit } from "@angular/core";
-import { Icon } from "../../enum/icon.enum";
-import { TransactionService } from "../../service/transaction.service";
-import { CashRegister } from "@colijnit/transactionapi/build/model/cash-register";
-import { PaymentService } from "../../service/payment.service";
-import { SharedService } from "../../service/shared.service";
-import { PaymentMethod } from "@colijnit/transactionapi/build/model/payment-method.bo";
-import { PaymentViewmodel } from "../../model/payment.viewmodel";
-import { DepositPaymentViewModel } from "../../model/deposit-payment-view-model";
+import { EventEmitter, OnDestroy, OnInit } from '@angular/core';
+import { Icon } from '../../enum/icon.enum';
+import { TransactionService } from '../../service/transaction.service';
+import { CashRegister } from '@colijnit/transactionapi/build/model/cash-register';
+import { PaymentService } from '../../service/payment.service';
+import { SharedService } from '../../service/shared.service';
+import { PaymentMethod } from '@colijnit/transactionapi/build/model/payment-method.bo';
+import { PaymentViewmodel } from '../../model/payment.viewmodel';
+import { DepositPaymentViewModel } from '../../model/deposit-payment-view-model';
 export declare class PaymentComponent implements OnInit, OnDestroy {
     private _transactionService;
     private _sharedService;

package/lib/component/transaction/style/material.scss

@@ -9,5 +9,6 @@
 @import "../../transaction-button-bar/style/material";
 @import "../../transaction-line-side-panel/style/material";
 @import "../../dialog/transaction-header/dialog-transaction-header-delivery-method/style/material";
+@import "../../dialog/transaction-header/dialog-transaction-header-branch/style/material";
 @import "../../transaction-line-checkbox-list/style/material";
 @import "../../transaction-card/transaction-card/style/material";

package/lib/component/transaction-button-bar/transaction-button-bar.component.d.ts

@@ -4,7 +4,9 @@ import { TransactionBarButton } from "../../model/transaction-bar-button";
 import { TransactionMappingService } from "../../service/transaction-mapping.service";
 import { TransactionTypeCategory } from "../../enum/transaction-type-category.enum";
 import { TransactionInfoResponse } from "@colijnit/transactionapi/build/model/transaction-info-response.bo";
+import { TransactionService } from '../../service/transaction.service';
 export declare class TransactionButtonBarComponent {
+    private _transactionService;
     private _mappingService;
     set transactionType(value: TransactionKind);
     get transactionType(): TransactionKind;
@@ -14,6 +16,6 @@ export declare class TransactionButtonBarComponent {
     showClass(): boolean;
     buttons: TransactionBarButton[];
     private _transactionType;
-    constructor(_mappingService: TransactionMappingService);
+    constructor(_transactionService: TransactionService, _mappingService: TransactionMappingService);
     selectCategory(idx: number): void;
 }

package/lib/component/transaction-card/transaction-card-header/transaction-card-header.component.d.ts

@@ -19,6 +19,5 @@ export declare class TransactionCardHeaderComponent extends TransactionBaseCompo
     showClass(): boolean;
     constructor(dictionaryService: DictionaryService, iconCacheService: IconCacheService, transactionService: TransactionService, _imageService: TransactionImageService);
     ngAfterViewInit(): void;
-    deleteTransactionLineClick(): void;
     private _loadLineImage;
 }

package/lib/component/transaction-header-fields/transaction-header-branch.component.d.ts

@@ -1,9 +1,9 @@
-import { OnInit } from "@angular/core";
-import { TransactionService } from "../../service/transaction.service";
-import { BranchLov } from "@colijnit/relationapi/build/model/branch-lov.bo";
-import { RelationSmallObject } from "@colijnit/relationapi/build/model/relation-small-object.bo";
-import { RelationService } from "../../service/relation.service";
-import { TransactionFilterPopupBaseComponent } from "../core/base/transaction-filter-popup-base.component";
+import { OnInit } from '@angular/core';
+import { TransactionService } from '../../service/transaction.service';
+import { BranchLov } from '@colijnit/relationapi/build/model/branch-lov.bo';
+import { RelationSmallObject } from '@colijnit/relationapi/build/model/relation-small-object.bo';
+import { RelationService } from '../../service/relation.service';
+import { TransactionFilterPopupBaseComponent } from '../core/base/transaction-filter-popup-base.component';
 import { DictionaryService } from '../../service/dictionary.service';
 export declare class TransactionHeaderBranchComponent extends TransactionFilterPopupBaseComponent<BranchLov> implements OnInit {
     protected dictionaryService: DictionaryService;
@@ -12,8 +12,12 @@ export declare class TransactionHeaderBranchComponent extends TransactionFilterP
     simple: boolean;
     fields: Object;
     branchModel: number;
+    protected codeField: string;
+    protected checkField: string;
+    protected propsForLabel: string[];
     constructor(dictionaryService: DictionaryService, transactionService: TransactionService, _relationService: RelationService);
     ngOnInit(): void;
     commit(branch: number | RelationSmallObject): Promise<boolean>;
+    protected transactionSet(): void;
     protected transactionInfoSet(): void;
 }

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

@@ -8,16 +8,6 @@
       display: flex;
       flex-direction: row;
     }
-    .transaction-line-delete {
-      display: flex;
-      flex-basis: 50px;
-      .delete-wrapper {
-        cursor: pointer;
-        display: flex;
-        flex-direction: row;
-        align-items: center;
-      }
-    }
     .transaction-line-checkbox {
       place-self: center;
     }

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

@@ -20,7 +20,6 @@ export declare class TransactionBaseLineComponent extends TransactionBaseCompone
     showClass(): boolean;
     constructor(dictionaryService: DictionaryService, iconCacheService: IconCacheService, transactionService: TransactionService, _transactionEventService: TransactionEventService);
     ngOnDestroy(): void;
-    deleteTransactionLineClick(event: MouseEvent): Promise<void>;
     handleShowSidePanel(line: TransactionLineInfo): void;
     onDescriptionDblClick(): void;
 }

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

@@ -0,0 +1,22 @@
+@include export-module('co-transaction-text-line-layout') {
+  .co-transaction-text-line {
+    display: flex;
+    flex-direction: row;
+    column-gap: $tp-transaction-text-line-column-gap;
+    .transaction-line-delete {
+      display: flex;
+      flex-basis: 50px;
+      .delete-wrapper {
+        cursor: pointer;
+        display: flex;
+        flex-direction: row;
+        align-items: center;
+      }
+    }
+    .delete-icon {
+      cursor: pointer;
+      height: $tp-transaction-text-line-delete-icon-size;
+      width: $tp-transaction-text-line-delete-icon-size;
+    }
+  }
+}

package/lib/component/transaction-line/transaction-text-line/style/_material-definition.scss

@@ -0,0 +1,2 @@
+$tp-transaction-text-line-delete-icon-size: 15px !default;
+$tp-transaction-text-line-column-gap: 15px !default;

package/lib/component/transaction-line/transaction-text-line/style/_theme.scss

@@ -0,0 +1,4 @@
+@include export-module('co-transaction-text-line-theme') {
+  .co-transaction-text-line {
+  }
+}

package/lib/component/transaction-line/transaction-text-line/style/material.scss

@@ -0,0 +1,4 @@
+@import "../../../../style/mixin";
+@import "./_material-definition";
+@import "./_layout";
+@import "./_theme";

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

@@ -0,0 +1,11 @@
+import { TransactionBaseComponent } from '../../core/base/transaction-base.component';
+import { DictionaryService } from '../../../service/dictionary.service';
+import { TransactionService } from '../../../service/transaction.service';
+import { IconCacheService } from '../../../service/icon-cache.service';
+export declare class TransactionTextLineComponent extends TransactionBaseComponent {
+    protected dictionaryService: DictionaryService;
+    protected transactionService: TransactionService;
+    iconCacheService: IconCacheService;
+    showClass(): boolean;
+    constructor(dictionaryService: DictionaryService, transactionService: TransactionService, iconCacheService: IconCacheService);
+}

package/lib/component/transaction-line/transaction-text-line/transaction-text-line.module.d.ts

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

package/lib/component/transaction-line-fields/transaction-line-commission-code.component.d.ts

@@ -9,9 +9,11 @@ export declare class TransactionLineCommissionCodeComponent extends TransactionF
     protected codeField: string;
     protected checkField: string;
     protected propsForLabel: string[];
+    private _tooltipMessages;
     constructor(dictionaryService: DictionaryService, transactionService: TransactionService);
     ngOnInit(): void;
     commit(code: string): Promise<boolean>;
     protected transactionLineSet(): void;
     protected transactionInfoSet(): void;
+    private _setTooltip;
 }

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

@@ -1,6 +1,6 @@
-import { TransactionService } from "../../service/transaction.service";
-import { DictionaryService } from "../../service/dictionary.service";
-import { TransactionBaseComponent } from "../core/base/transaction-base.component";
+import { TransactionService } from '../../service/transaction.service';
+import { DictionaryService } from '../../service/dictionary.service';
+import { TransactionBaseComponent } from '../core/base/transaction-base.component';
 export declare class TransactionLineVatButtonComponent extends TransactionBaseComponent {
     protected dictionaryService: DictionaryService;
     protected transactionService: TransactionService;
@@ -9,5 +9,7 @@ export declare class TransactionLineVatButtonComponent extends TransactionBaseCo
     showDialogVat: boolean;
     constructor(dictionaryService: DictionaryService, transactionService: TransactionService, _dictionaryService: DictionaryService);
     handleShowDialog(event: MouseEvent): Promise<void>;
+    protected transactionInfoSet(): void;
     transactionLineSet(): Promise<void>;
+    private _getVatDescription;
 }

package/lib/component/transaction-line-fields/transaction-line-vat.component.d.ts

@@ -12,4 +12,5 @@ export declare class TransactionLineVatComponent extends TransactionFilterPopupB
     constructor(dictionaryService: DictionaryService, transactionService: TransactionService);
     ngOnInit(): void;
     commit(id: number): Promise<boolean>;
+    protected transactionInfoSet(): void;
 }

package/lib/component/transaction-line-fields/transaction-line-warehouse.component.d.ts

@@ -1,12 +1,11 @@
-import { OnInit } from "@angular/core";
-import { TransactionService } from "../../service/transaction.service";
-import { Warehouse } from "@colijnit/transactionapi/build/model/warehouse.bo";
-import { TransactionFilterPopupBaseComponent } from "../core/base/transaction-filter-popup-base.component";
+import { OnInit } from '@angular/core';
+import { TransactionService } from '../../service/transaction.service';
+import { Warehouse } from '@colijnit/transactionapi/build/model/warehouse.bo';
+import { TransactionFilterPopupBaseComponent } from '../core/base/transaction-filter-popup-base.component';
 import { DictionaryService } from '../../service/dictionary.service';
 export declare class TransactionLineWarehouseComponent extends TransactionFilterPopupBaseComponent<Warehouse> implements OnInit {
     protected dictionaryService: DictionaryService;
     protected transactionService: TransactionService;
-    branch: string;
     protected codeField: string;
     protected checkField: string;
     protected propsForLabel: string[];

package/lib/component/transaction-lines/style/material.scss

@@ -2,6 +2,7 @@
 @import "./layout";
 @import "./theme";
 @import "../../../component/transaction-line/transaction-overview-line/style/material";
+@import "../../../component/transaction-line/transaction-text-line/style/material";
 @import "../../../component/transaction-line/transaction-base-line/style/material";
 @import "../../../component/transaction-line-image-and-description/style/material";
 @import "../../../component/editable-label/style/material";

package/lib/component/transaction-quick-access/transaction-quick-access-overview/style/_layout.scss

@@ -11,15 +11,6 @@
       display: block;
       width: $tp-transaction-quick-access-search-width;
       height: $tp-transaction-quick-access-search-height;
-      .co-input-text {
-        height: $tp-transaction-quick-access-search-height;
-        //label {
-        //  top: math.div($tp-transaction-quick-access-search-height, 2);
-        //}
-      }
-      .co-input-text:not(.no-style).has-left-icon .input-text-left-icon {
-        height: 60%;
-      }
     }
     .co-quick-send-button {
       margin-left: auto;

package/lib/component/transaction-quick-access/transaction-quick-access-overview/style/_material-definition.scss

@@ -1,2 +1,2 @@
 $tp-transaction-quick-access-search-width: 300px !default;
-$tp-transaction-quick-access-search-height: 26px !default;
+$tp-transaction-quick-access-search-height: 32px !default;

package/lib/component/transaction-quick-access/transaction-quick-access-overview/transaction-quick-access-overview.component.d.ts

@@ -15,8 +15,7 @@ export declare class TransactionQuickAccessOverviewComponent extends Transaction
     reportDocumentPrintRequest: PrintOrderConfirmationRequest;
     reportDocumentPdfRequest: PdfOrderConfirmationRequest;
     constructor(dictionaryService: DictionaryService, service: TransactionService);
-    handleAddArticle(sku: string): Promise<boolean>;
-    handleReturnArticle(sku: string): Promise<boolean>;
+    handleAddArticle(sku: string, quantity?: number): Promise<boolean>;
     protected emailDocument(request: EmailOrderConfirmationRequest): Promise<void>;
     protected getDefaultEmailAddressList(): Promise<string[]>;
     protected getEmailLayouts(): Promise<ReportLayoutSelectionEmail[]>;

package/lib/component/transaction-quick-access/transaction-quick-access-purchase-order-overview/style/_layout.scss

@@ -8,15 +8,6 @@
       display: block;
       width: $tp-transaction-quick-access-purchase-order-overview-search-width;
       height: $tp-transaction-quick-access-purchase-order-overview-search-height;
-      .co-input-text {
-        height: $tp-transaction-quick-access-purchase-order-overview-search-height;
-        //label {
-        //  top: math.div($tp-transaction-quick-access-search-height, 2);
-        //}
-      }
-      .co-input-text:not(.no-style).has-left-icon .input-text-left-icon {
-        height: 60%;
-      }
     }
     .co-quick-send-button {
       margin-left: auto;

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

@@ -3386,6 +3386,7 @@ export declare class Dictionaries {
         DELETE_PURCHASE_ORDERS: string;
         DELETE_PURCHASE_ORDERS_WARNING_ACCEPTED: string;
         DELETE_QUESTION_QUESTION: string;
+        DELETE_WAREHOUSE_QUESTION: string;
         DELETE_REMARK_QUESTION: string;
         DELETE_SHOPPING_CART_QUESTION: string;
         DELETE_STATE_AND_TRANSITIONS_QUESTION: string;
@@ -5967,6 +5968,7 @@ export declare class Dictionaries {
         PIN_RESULT_FILE_FORMAT_ERROR: string;
         PIN_TERMINAL: string;
         PIN_TERMINAL_NR: string;
+        Pin_TERMINALS: string;
         PINNER_ID: string;
         PIT_SYMBOLS: string;
         PLACE_COLUMNS_HERE_TO_GROUP: string;
@@ -6020,6 +6022,8 @@ export declare class Dictionaries {
         POSTAL_CODE_CITY: string;
         POSTAL_CODE_END: string;
         POSTING_EMPLOYMENT_CONTRACT: string;
+        POSTING_NUMBER: string;
+        POSTING: string;
         POS_GROUP: string;
         POS_GROUPS: string;
         POS_GROUP_LOCATION: string;
@@ -10089,6 +10093,7 @@ export declare class Dictionaries {
         ALREADY_EXISTS: string;
         ALREADY_INVOICED: string;
         ALREADY_PICKED: string;
+        ALREADY_SENT: string;
         ALREADY_TO_PICK: string;
         ALREADY_USED_ARTICLENR: string;
         ALSO_COPY: string;
@@ -11503,6 +11508,7 @@ export declare class Dictionaries {
         DELETE_PURCHASE_ORDERS: string;
         DELETE_PURCHASE_ORDERS_WARNING_ACCEPTED: string;
         DELETE_QUESTION_QUESTION: string;
+        DELETE_WAREHOUSE_QUESTION: string;
         DELETE_REMARK_QUESTION: string;
         DELETE_SHOPPING_CART_QUESTION: string;
         DELETE_STATE_AND_TRANSITIONS_QUESTION: string;
@@ -12908,8 +12914,10 @@ export declare class Dictionaries {
         LEDGER_ACCOUNT_DESCRIPTION: string;
         LEDGER_ACCOUNT_ID: string;
         LEDGER_ACCOUNT_NUMBER: string;
+        LEDGER_CLASSIFICATION: string;
         LEDGER_DESCRIPTION: string;
         LEDGER_INITIAL_PAYMENT: string;
+        LEDGER_MAIN_CLASSIFICATION: string;
         LEDGER_VAT: string;
         LEDGER_WAREHOUSES: string;
         LEFT_JOIN: string;
@@ -13776,6 +13784,7 @@ export declare class Dictionaries {
         NO_EXCEPTIONS_ON_BASE_ARTICLE: string;
         NO_EXCEPTIONS_ON_THIRD_ARTICLE: string;
         NO_FINANCIAL_LINK_FOR_THIS_SOURCE_WAREHOUSE: string;
+        NO_FREE_COMMISSION_CODE: string;
         NO_FREE_EAN_CODES: string;
         NO_FULL_RECOVERY_EXPECTED: string;
         NO_GIFTCARDS_ALLOWED: string;
@@ -14087,6 +14096,7 @@ export declare class Dictionaries {
         ORDER_KIND: string;
         ORDER_LINES: string;
         ORDER_LINES_ALLOCATED_NOT_FOUND: string;
+        ORDER_LINES_EXIST: string;
         ORDER_LINES_INTERBRANCH: string;
         ORDER_LINES_POS: string;
         ORDER_LINES_PURCHASE: string;
@@ -14366,6 +14376,7 @@ export declare class Dictionaries {
         PIN_RESULT_FILE_FORMAT_ERROR: string;
         PIN_TERMINAL: string;
         PIN_TERMINAL_NR: string;
+        PIN_TERMINALS: string;
         PINNER_ID: string;
         PIT_SYMBOLS: string;
         PLACE_COLUMNS_HERE_TO_GROUP: string;
@@ -14425,6 +14436,7 @@ export declare class Dictionaries {
         POSTING_EMPLOYMENT_CONTRACT: string;
         POSTING_NUMBER2: string;
         POSTING_NUMBER: string;
+        POSTING: string;
         POS_GROUP: string;
         POS_GROUPS: string;
         POS_GROUP_LOCATION: string;
@@ -16317,6 +16329,7 @@ export declare class Dictionaries {
         TRANSACTION_DISCOUNT_PERC: string;
         TRANSACTION_DISCOUNT_PERCENTAGE: string;
         TRANSACTION_IN_USE: string;
+        TRANSACTION_IS_DEFINITIVE: string;
         TRANSACTION_LINES: string;
         TRANSACTION_LINE_PRICE_DECLARATION: string;
         TRANSACTION_MESSAGE_INCORRECT: string;

package/lib/service/dialog.service.d.ts

@@ -1,11 +1,10 @@
-import { ApplicationRef, ComponentFactoryResolver, ComponentRef, Injector, Type } from "@angular/core";
-import { TransactionLineCharacteristicChoice } from "@colijnit/transactionapi/build/model/transactionLineCharacteristicChoice.bo";
-import { DynamicComponentService } from "./dynamic-component.service";
-import { TransactionInfo } from "@colijnit/transactionapi/build/model/transaction-info.bo";
-import { DialogBaseComponent } from "../component/core/base/dialog-base.component";
-import { TransactionLineInfo } from "@colijnit/transactionapi/build/model/transaction-line-info.bo";
-import { DialogResponseInterface } from "../interface/dialog-response.interface";
-import { ToastComponent } from "../component/toast/toast.component";
+import { ApplicationRef, ComponentFactoryResolver, ComponentRef, Injector } from '@angular/core';
+import { TransactionLineCharacteristicChoice } from '@colijnit/transactionapi/build/model/transactionLineCharacteristicChoice.bo';
+import { DynamicComponentService } from './dynamic-component.service';
+import { TransactionLineInfo } from '@colijnit/transactionapi/build/model/transaction-line-info.bo';
+import { DialogResponseInterface } from '../interface/dialog-response.interface';
+import { ToastComponent } from '../component/toast/toast.component';
+import { TransactionInfoResponse } from '@colijnit/transactionapi/build/model/transaction-info-response.bo';
 export declare class DialogService {
     private _compFactoryResolver;
     private appRef;
@@ -17,12 +16,9 @@ export declare class DialogService {
     showYesNo(title: string, text: string, showRememberChoice?: boolean): Promise<DialogResponseInterface>;
     showError(message: string, details?: string): Promise<any>;
     showInformation(message: string): Promise<any>;
-    showTransactionLineComponent(comp: Type<DialogBaseComponent>, transLine: TransactionLineInfo): Promise<DialogResponseInterface>;
-    showTransactionHeaderComponent(comp: Type<DialogBaseComponent>, transactionInfo: TransactionInfo): Promise<DialogResponseInterface>;
     showCharacteristics(title: string, choices: TransactionLineCharacteristicChoice[], value: string): Promise<DialogResponseInterface>;
-    showWarehouseCC(quantity: number, commissionCode: string, warehouseNr: number): Promise<DialogResponseInterface>;
-    showWarehouse(): Promise<DialogResponseInterface>;
-    showCommissionCode(): Promise<DialogResponseInterface>;
+    showWarehouseCC(transactionLine: TransactionLineInfo): Promise<DialogResponseInterface>;
+    showBranch(transaction: TransactionInfoResponse): Promise<DialogResponseInterface>;
     showWarehouseLocation(warehouseNr: number, useModel?: boolean, autoClose?: boolean, showClose?: boolean, transactionLine?: TransactionLineInfo): Promise<DialogResponseInterface>;
     showToast(text: string): Promise<void>;
     hideToastAfterMs(ms?: number): void;

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

@@ -1,22 +1,23 @@
-import { OptionsService } from "./options.service";
-import { DialogService } from "./dialog.service";
-import { TransactionConnectorService } from "./transaction-connector.service";
-import { SharedService } from "@colijnit/sharedcomponents";
-import { ArticleConnectorService } from "./article-connector.service";
-import { DictionaryService } from "./dictionary.service";
-import { TransactionEventService } from "./transaction-event.service";
-import { RelationService } from "./relation.service";
-import { TransactionInfoResponse } from "@colijnit/transactionapi/build/model/transaction-info-response.bo";
-import { TransactionKind } from "@colijnit/transactionapi/build/enum/transaction-kind.enum";
-import { Relation } from "@colijnit/relationapi/build/model/relation.bo";
-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 { 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 { OptionsService } from './options.service';
+import { DialogService } from './dialog.service';
+import { TransactionConnectorService } from './transaction-connector.service';
+import { SharedService } from '@colijnit/sharedcomponents';
+import { ArticleConnectorService } from './article-connector.service';
+import { DictionaryService } from './dictionary.service';
+import { TransactionEventService } from './transaction-event.service';
+import { RelationService } from './relation.service';
+import { TransactionInfoResponse } from '@colijnit/transactionapi/build/model/transaction-info-response.bo';
+import { TransactionKind } from '@colijnit/transactionapi/build/enum/transaction-kind.enum';
+import { Relation } from '@colijnit/relationapi/build/model/relation.bo';
+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 { 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 { TransactionTypeCategory } from '../enum/transaction-type-category.enum';
 export declare class TransactionBaseService {
     optionsService: OptionsService;
     protected dialogService: DialogService;
@@ -30,10 +31,13 @@ export declare class TransactionBaseService {
     logout: Subject<void>;
     transactionUpdated: BehaviorSubject<TransactionInfoResponse>;
     relationUpdated: BehaviorSubject<Relation>;
+    currentBranch: string;
     autoSave: boolean;
     applicationUser: boolean;
     invoiceAddressSameAsDelivery: boolean;
-    transactionKind: TransactionKind;
+    activeRubric: TransactionTypeCategory;
+    set transactionKind(value: TransactionKind);
+    get transactionKind(): TransactionKind;
     currentTransaction: TransactionInfoResponse;
     set purchaseOrdersCompleted(value: boolean);
     get purchaseOrdersCompleted(): boolean;
@@ -53,6 +57,7 @@ export declare class TransactionBaseService {
     docDeliveryBatch: DocDeliveryBatch;
     articleAmount: number;
     protected warehouseLocationPopupShown: boolean;
+    private _transactionKind;
     private _relation;
     private _purchaseOrdersCompleted;
     private _receiveGoodsCompleted;

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

@@ -6,7 +6,6 @@ import { SequenceName } from "@colijnit/transactionapi/build/enum/sequence-name.
 import { DeliveryMethod } from "@colijnit/transactionapi/build/model/delivery-method.bo";
 import { DeliveryOption } from "@colijnit/transactionapi/build/model/delivery-option.bo";
 import { GetPostalCodeRetrievalOutputParams } from "@colijnit/transactionapi/build/model/get-postal-code-retrieval-output-params";
-import { TransactionLineType } from "@colijnit/transactionapi/build/enum/transaction-line-type.enum";
 import { TransactionArticleWarehouse } from "@colijnit/transactionapi/build/model/transaction-article-warehouse.bo";
 import { ArticleFullObject } from "@colijnit/transactionapi/build/model/article-full-object";
 import { Transaction } from "@colijnit/transactionapi/build/transaction";
@@ -110,6 +109,7 @@ export declare class TransactionConnectorAdapterService {
     getCashRegisters(branch?: string, group?: number): Promise<CashRegister[]>;
     getPriceLists(code?: string): Promise<PriceList[]>;
     getVatList(onlyValid?: boolean): Promise<Vat[]>;
+    getTransVatCodes(type: string, date: Date): Promise<Vat[]>;
     searchTransactions(request: TransactionSearchViewRequest): Promise<TransactionSearchResult>;
     getSequenceValue(sequenceName: SequenceName): Promise<number>;
     getDeliveryMethods(): Promise<DeliveryMethod[]>;
@@ -138,7 +138,7 @@ export declare class TransactionConnectorAdapterService {
     setRelationByUser(uuid: string, username: string, password: string): Promise<boolean>;
     resolvePendingHeaderReason(pendingHeaderValues: ResolveHeaderPendingReasonRequest): Promise<TransactionInfoResponse>;
     resolvePendingLineReason(pendingLineValues: ResolveLinePendingReasonRequest): Promise<TransactionInfoResponse>;
-    addTransactionLine(uuid: string, articleLine: TransactionLineType, articleNo: string, amount: number, isReturn: boolean, aboveLineNr: number, belowLineNr: number): Promise<TransactionInfoResponse>;
+    addTransactionLine(uuid: string, articleNo: string, quantity: number, aboveLineNr: number, belowLineNr: number): Promise<TransactionInfoResponse>;
     addTextLineToTransaction(uuid: string, showOnDocuments: number, text: string, amount: number, articleBound: boolean, refArticleLineNr: number, aboveLineNr?: number, belowLineNr?: number): Promise<TransactionInfoResponse>;
     addRelationToTransaction(uuid: string, relationId: number): Promise<TransactionInfoResponse>;
     changeLineSequence(uuid: string, lineUuid: string, aboveLineNr?: number, belowLineNr?: number): Promise<TransactionInfoResponse>;

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

@@ -6,7 +6,6 @@ import { SequenceName } from "@colijnit/transactionapi/build/enum/sequence-name.
 import { DeliveryMethod } from "@colijnit/transactionapi/build/model/delivery-method.bo";
 import { DeliveryOption } from "@colijnit/transactionapi/build/model/delivery-option.bo";
 import { GetPostalCodeRetrievalOutputParams } from "@colijnit/transactionapi/build/model/get-postal-code-retrieval-output-params";
-import { TransactionLineType } from "@colijnit/transactionapi/build/enum/transaction-line-type.enum";
 import { TransactionArticleWarehouse } from "@colijnit/transactionapi/build/model/transaction-article-warehouse.bo";
 import { ArticleFullObject } from "@colijnit/transactionapi/build/model/article-full-object";
 import { StandardText } from "../model/standard-text";
@@ -110,13 +109,14 @@ export declare class TransactionConnectorService {
     getCashRegisters(branch?: string, group?: number): Promise<CashRegister[]>;
     getPriceLists(code?: string): Promise<PriceList[]>;
     getVatList(onlyValid?: boolean): Promise<Vat[]>;
+    getTransVatCodes(type: string, date: Date): Promise<Vat[]>;
     searchTransactions(request: TransactionSearchViewRequest): Promise<TransactionSearchResult>;
     getSequenceValue(sequenceName: SequenceName): Promise<number>;
     getDeliveryMethods(): Promise<DeliveryMethod[]>;
     getDeliveryOptions(): Promise<DeliveryOption[]>;
     addRelationToTransaction(uuid: string, relationId: number): Promise<TransactionInfoResponse>;
     getPostalCodeRetrieval(postcalCode: string, houseNo: string): Promise<GetPostalCodeRetrievalOutputParams>;
-    addTransactionLine(uuid: string, articleLine: TransactionLineType, articleNo: string, amount: number, isReturn: boolean, aboveLineNr: number, belowLineNr: number): Promise<TransactionInfoResponse>;
+    addTransactionLine(uuid: string, articleNo: string, quantity: number, aboveLineNr: number, belowLineNr: number): Promise<TransactionInfoResponse>;
     addTextLineToTransaction(uuid: string, showOnDocuments: number, text: string, amount: number, articleBound: boolean, refArticleLineNr: number, aboveLineNr?: number, belowLineNr?: number): Promise<TransactionInfoResponse>;
     changeLineSequence(uuid: string, lineUuid: string, aboveLineNr?: number, belowLineNr?: number): Promise<TransactionInfoResponse>;
     cancelAddTransactionLine(lineUuid: string): Promise<TransactionInfoResponse>;