@colijnit/transaction 12.1.125 → 12.1.126

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

@@ -1,6 +1,7 @@
 import { EventEmitter } from '@angular/core';
 import { BusinessObject } from '@colijnit/ioneconnector/build/model/business-object';
 import { TransactionBaseComponent } from './transaction-base.component';
+import { CheckboxListPropertyInterface } from '../../../interface/checkbox-list-property.interface';
 export declare abstract class TransactionFilterPopupBaseComponent<T extends BusinessObject | number | string> extends TransactionBaseComponent {
     autoClose: boolean;
     useModel: boolean;
@@ -13,17 +14,17 @@ export declare abstract class TransactionFilterPopupBaseComponent<T extends Busi
     get collection(): T[];
     viewModels: {
         value: any;
-        propsForLabel: string[];
+        propsForLabel: CheckboxListPropertyInterface[];
         checked: boolean;
     }[];
     viewModelsFiltered: {
         value: any;
-        propsForLabel: string[];
+        propsForLabel: CheckboxListPropertyInterface[];
         checked: boolean;
     }[];
     protected codeField: string;
     protected checkField: string;
-    protected propsForLabel: string[];
+    protected propsForLabel: CheckboxListPropertyInterface[];
     private _collection;
     private _searchText;
     commit(value: any): Promise<boolean>;

package/lib/component/payment/style/_layout.scss

@@ -52,6 +52,26 @@
       row-gap: 10px;
       column-gap: 10px;
     }
+    .payment-to-pay {
+      display: flex;
+      flex-direction: column;
+      align-items: flex-start;
+      row-gap: $tp-payment-row-gap;
+      grid-column: 1 / 1;
+      grid-row: 1 / 1;
+    }
+    .payment-amount {
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      height: $tp-payment-amount-height;
+      border: $tp-payment-amount-border;
+      font-family: $tp-payment-amount-font-family;
+      font-size: $tp-payment-amount-font-size;
+      font-weight: $tp-payment-amount-font-weight;
+      border-radius: 5px;
+      width: 100%;
+    }
 
     .payment-deposit {
       grid-column: 1 / 1;

package/lib/component/payment/style/_material-definition.scss

@@ -10,7 +10,14 @@ $tp-payment-header-extra-font-color: $tp-color-colijn-orange !default;
 $tp-payment-row-gap: 20px !default;
 $tp-payment-methods-column-gap: 5px !default;
 $tp-payment-methods-row-gap: 5px !default;
+$tp-payment-amount-height: 60px !default;
+$tp-payment-amount-font-family: $tp-font-family !default;
+$tp-payment-amount-font-size: 32px !default;
+$tp-payment-amount-font-weight: bold !default;
+$tp-payment-amount-color: rgba(0, 0, 0, 0.5) !default;
 $tp-payment-amount-border: 1px solid !default;
+$tp-payment-amount-border-color: $tp-color-border !default;
+$tp-payment-amount-background-color: #dedede5c !default;
 $tp-payment-error-margin: 5px 0 !default;
 $tp-payment-error-font-family: $tp-font-family !default;
 $tp-payment-error-font-size: $tp-font-size !default;

package/lib/component/payment/style/_theme.scss

@@ -7,6 +7,11 @@
         color: $tp-color-colijn-orange;
       }
     }
+    .payment-amount {
+      color: $tp-payment-amount-color;
+      border-color: $tp-payment-amount-border-color;
+      background-color: $tp-payment-amount-background-color;
+    }
     .payment-to-pay-button {
       .payment-error-message {
         color: $tp-payment-error-font-color;
@@ -15,5 +20,24 @@
         background-color: $tp-color-colijn-orange;
       }
     }
+    .payment-to-pay-keypad {
+      .key-pad-wrapper {
+        background: transparent;
+        border-color: $tp-payment-amount-border-color;
+      }
+      .key-pad-button {
+        background-color: $tp-payment-amount-background-color;
+        color: $tp-payment-amount-color;
+        font-weight: bold;
+        .co-icon {
+          svg { // for fontawesome icons
+            fill: $tp-payment-amount-color;
+          }
+          & [fill] { // for own icons
+            fill: $tp-payment-amount-color;
+          }
+        }
+      }
+    }
   }
 }

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

@@ -4,4 +4,3 @@
 @import "../../payment-tile/style/material";
 @import "../../payment-qr-code/style/material";
 @import "../../deposit-payment/style/material";
-@import "../../payment-to-pay/style/material";

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

@@ -43,7 +43,7 @@ export declare class TransactionArticleTextComponent implements OnInit {
     ngOnInit(): Promise<void>;
     onOkClick(event: MouseEvent): void;
     onCancelClick(event: MouseEvent): void;
-    onSelectStandardText(value: any): void;
+    onSelectStandardText(value: StandardText): void;
     handleDocumentsChange(codes: number[]): void;
     handleSelectAll(select: boolean): void;
     private _setShowOnDocuments;

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

@@ -18,13 +18,19 @@
     font-size: $tp-transaction-article-text-overview-font-size;
     display: flex;
     flex-direction: row;
-    align-items: $tp-transaction-article-text-overview-align-items;
     background-color: white;
-    column-gap: $tp-transaction-article-text-overview-column-gap;
     border: $tp-transaction-article-text-overview-text-border;
     border-width: $tp-transaction-article-text-overview-text-border-width;
     box-shadow: $tp-transaction-article-text-overview-text-shadow-box;
     border-radius: $tp-transaction-article-text-overview-border-radius;
+    justify-content: $tp-transaction-article-text-overview-justify-content;
+    align-items: center;
+    padding-right: 10px;
+    .article-text-description-wrapper {
+      display: flex;
+      align-items: $tp-transaction-article-text-overview-align-items;
+      column-gap: $tp-transaction-article-text-overview-column-gap;
+    }
     .index {
       padding: 10px;
       background-color: $tp-transaction-article-text-overview-index-background-color;
@@ -34,6 +40,11 @@
       max-height: 150px;
       overflow: hidden;
     }
+    .delete-icon {
+      cursor: pointer;
+      width: $tp-transaction-article-text-overview-delete-icon-size;
+      height: $tp-transaction-article-text-overview-delete-icon-size;
+    }
     &.selected {
       background-color: $tp-transaction-article-text-overview-selected-background-color;
     }

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

@@ -1,6 +1,7 @@
 $tp-transaction-article-text-overview-font-family: $tp-font-family !default;
 $tp-transaction-article-text-overview-font-size: $tp-font-size !default;
 $tp-transaction-article-text-overview-align-items: baseline !default;
+$tp-transaction-article-text-overview-justify-content: space-between !default;
 $tp-transaction-article-text-overview-column-gap: 5px !default;
 $tp-transaction-article-text-overview-border-radius: 10px !default;
 $tp-transaction-article-text-overview-hover-background-color: $tp-color-hover !default;
@@ -11,3 +12,4 @@ $tp-transaction-article-text-overview-text-border-color: $tp-color-border !defau
 $tp-transaction-article-text-overview-text-shadow-box: none !default;
 $tp-transaction-article-text-overview-index-background-color: transparent !default;
 $tp-transaction-article-text-overview-buttons-column-gap: 5px !default;
+$tp-transaction-article-text-overview-delete-icon-size: 15px !default;

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

@@ -3,9 +3,15 @@ import { TransactionEventService } from '../../../service/transaction-event.serv
 import { TransactionService } from '../../../service/transaction.service';
 import { TransactionLineInfo } from '@colijnit/transactionapi/build/model/transaction-line-info.bo';
 import { CdkDrag, CdkDragDrop, CdkDropList } from '@angular/cdk/drag-drop';
+import { Icon } from '../../../enum/icon.enum';
+import { IconCacheService } from '../../../service/icon-cache.service';
+import { TransactionInfo } from '@colijnit/transactionapi/build/model/transaction-info.bo';
 export declare class TransactionArticleTextOverviewComponent {
     service: TransactionService;
+    iconCacheService: IconCacheService;
     private _transactionEventService;
+    readonly icons: typeof Icon;
+    transactionInfo: TransactionInfo;
     set transactionLine(value: TransactionLineInfo);
     closeClick: EventEmitter<MouseEvent>;
     cancelClick: EventEmitter<MouseEvent>;
@@ -17,13 +23,14 @@ export declare class TransactionArticleTextOverviewComponent {
     header: string;
     selectedIndex: number;
     private _boFactory;
-    constructor(service: TransactionService, _transactionEventService: TransactionEventService);
+    constructor(service: TransactionService, iconCacheService: IconCacheService, _transactionEventService: TransactionEventService);
     onCancelClick(event: MouseEvent): Promise<void>;
     handleCanDragDrop(drag: CdkDrag, drop: CdkDropList): boolean;
     handleDrop(event: CdkDragDrop<TransactionLineInfo[]>): void;
     handleOpenArticleText(transLine: TransactionLineInfo): void;
     closeArticleText(): void;
     handleSelect(index: number): void;
+    deleteArticleTextClick(transLine: TransactionLineInfo): Promise<void>;
     private _hideArticleTextDialog;
     private _getArticleTexts;
 }

package/lib/component/tile/style/_layout.scss

@@ -4,8 +4,6 @@
   .co-tile {
     display: flex;
     position: relative;
-    width: 100%;
-    height: 100%;
     &.selected {
       transform: scale($tp-tile-selected-zoom);
     }
@@ -19,8 +17,6 @@
       padding: $tp-tile-padding;
       width: $tp-tile-min-width;
       height: $tp-tile-min-height;
-      min-height: $tp-tile-min-height;
-      width: 100%;
     }
     .co-tile-select-wrapper {
       //position: absolute;

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

@@ -12,6 +12,7 @@ import { DynamicComponentService } from '../../service/dynamic-component.service
 import { TransactionLineSidePanelComponent } from '../transaction-line-side-panel/transaction-line-side-panel.component';
 import { RelationAnyType } from '../../model/relation-any-type';
 import { TransactionEventService } from '../../service/transaction-event.service';
+import { TransactionKind } from '@colijnit/transactionapi/build/enum/transaction-kind.enum';
 export declare class TransactionComponent implements OnDestroy {
     iconCacheService: IconCacheService;
     service: TransactionService;
@@ -24,8 +25,10 @@ export declare class TransactionComponent implements OnDestroy {
     relation: RelationAnyType;
     set transaction(value: TransactionInfoResponse);
     get transaction(): TransactionInfoResponse;
-    set transactionId(value: number);
-    get transactionId(): number;
+    set transactionKind(value: TransactionKind);
+    get transactionKind(): TransactionKind;
+    set transactionNr(value: number);
+    get transactionNr(): number;
     showHeader: boolean;
     showQuickAccess: boolean;
     showButtonBar: boolean;
@@ -42,7 +45,8 @@ export declare class TransactionComponent implements OnDestroy {
     historicTransactionLines: TransactionLineInfo[] | null;
     private _subs;
     private _transaction;
-    private _transactionId;
+    private _transactionKind;
+    private _transactionNr;
     constructor(iconCacheService: IconCacheService, service: TransactionService, _appRef: ApplicationRef, _dynamicComponentService: DynamicComponentService, _transactionEventService: TransactionEventService);
     ngOnDestroy(): void;
     handleButtonBarButtonClicked(button: TransactionBarButton): void;
@@ -66,6 +70,7 @@ export declare class TransactionComponent implements OnDestroy {
     showTransactionTextDialog(): void;
     showArticleTextDialog(): void;
     showArticleTextOverviewDialog(): void;
+    private _getTransaction;
     private _hideArticleTextDialog;
     private _hideTransactionTextDialog;
     private _hideArticleTextOverviewDialog;

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

@@ -8,6 +8,7 @@ import { DictionaryService } from '../../service/dictionary.service';
 import { TransactionEventService } from '../../service/transaction-event.service';
 import { IconCacheService } from '../../service/icon-cache.service';
 import { TransactionImageService } from '../../service/transaction-image.service';
+import { CheckboxListPropertyInterface } from '../../interface/checkbox-list-property.interface';
 export declare class TransactionHeaderBranchComponent extends TransactionFilterPopupBaseComponent<BranchLov> {
     transactionEventService: TransactionEventService;
     service: TransactionService;
@@ -21,7 +22,7 @@ export declare class TransactionHeaderBranchComponent extends TransactionFilterP
     branchModel: BranchLov;
     protected codeField: string;
     protected checkField: string;
-    protected propsForLabel: string[];
+    protected propsForLabel: CheckboxListPropertyInterface[];
     constructor(transactionEventService: TransactionEventService, service: TransactionService, iconCacheService: IconCacheService, dictionaryService: DictionaryService, imageService: TransactionImageService, changeDetector: ChangeDetectorRef, _relationService: RelationService);
     commit(branch: number | RelationSmallObject): Promise<boolean>;
     protected transactionInfoSet(): void;

package/lib/component/transaction-header-fields/transaction-header-delivery-method.component.d.ts

@@ -3,6 +3,7 @@ import { DeliveryMethod } from '@colijnit/transactionapi/build/model/delivery-me
 import { TransactionFilterPopupBaseComponent } from '../core/base/transaction-filter-popup-base.component';
 import { TransactionLineInfo } from '@colijnit/transactionapi/build/model/transaction-line-info.bo';
 import { TransactionInfo } from '@colijnit/transactionapi/build/model/transaction-info.bo';
+import { CheckboxListPropertyInterface } from '../../interface/checkbox-list-property.interface';
 export declare class TransactionHeaderDeliveryMethodComponent extends TransactionFilterPopupBaseComponent<DeliveryMethod> implements OnInit {
     showAsCarousel: boolean;
     filterOnWizard: boolean;
@@ -11,7 +12,7 @@ export declare class TransactionHeaderDeliveryMethodComponent extends Transactio
     get model(): TransactionLineInfo | TransactionInfo;
     protected codeField: string;
     protected checkField: string;
-    protected propsForLabel: string[];
+    protected propsForLabel: CheckboxListPropertyInterface[];
     ngOnInit(): void;
     commit(method: string): Promise<boolean>;
     setIndexDeliveryType(idx: number): Promise<void>;

package/lib/component/transaction-header-fields/transaction-header-hold-codes.component.d.ts

@@ -1,10 +1,11 @@
 import { TransactionFilterPopupBaseComponent } from '../core/base/transaction-filter-popup-base.component';
 import { OnHoldCode } from '@colijnit/transactionapi/build/model/on-hold-code.bo';
+import { CheckboxListPropertyInterface } from '../../interface/checkbox-list-property.interface';
 export declare class TransactionHeaderHoldCodesComponent extends TransactionFilterPopupBaseComponent<OnHoldCode> {
     onHoldCodesModel: OnHoldCode[];
     protected codeField: string;
     protected checkField: string;
-    protected propsForLabel: string[];
+    protected propsForLabel: CheckboxListPropertyInterface[];
     commit(codes: OnHoldCode[]): Promise<boolean>;
     protected transactionInfoSet(): void;
     private _setOnHoldCodesModel;

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

@@ -1,10 +1,11 @@
 import { OnInit } from '@angular/core';
 import { Marketing } from '@colijnit/transactionapi/build/model/marketing.bo';
 import { TransactionFilterPopupBaseComponent } from '../core/base/transaction-filter-popup-base.component';
+import { CheckboxListPropertyInterface } from '../../interface/checkbox-list-property.interface';
 export declare class TransactionHeaderMarketingComponent extends TransactionFilterPopupBaseComponent<Marketing> implements OnInit {
     protected codeField: string;
     protected checkField: string;
-    protected propsForLabel: string[];
+    protected propsForLabel: CheckboxListPropertyInterface[];
     ngOnInit(): void;
     commit(code: string): Promise<boolean>;
 }

package/lib/component/transaction-labeled-warehouse-location-button/style/_layout.scss

@@ -4,10 +4,6 @@
     .co-transaction-button {
       height: 45px;
       min-width: 100px;
-
-      .co-icon {
-        padding: 10px;
-      }
     }
   }
 }

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

@@ -41,13 +41,15 @@
       display: flex;
       flex-wrap: wrap;
       align-content: flex-start;
+      row-gap: $tp-transaction-line-row-gap;
       .column1 {
-        max-width: calc((#{$tp-transaction-default-button-width} * 2) + #{$tp-transaction-line-column-gap});
+        //max-width: calc((#{$tp-transaction-default-button-width} * 2) + #{$tp-transaction-line-column-gap});
         margin-right: $tp-transaction-line-column-gap;
         display: flex;
         flex-wrap: wrap;
         align-content: flex-start;
         row-gap: $tp-transaction-line-row-gap;
+        column-gap: $tp-transaction-line-column-gap;
         co-transaction-line-commission-button {
           margin-right: $tp-transaction-line-column-gap;
         }
@@ -56,10 +58,14 @@
         display: flex;
         flex-direction: column;
         row-gap: $tp-transaction-line-row-gap;
+        column-gap: $tp-transaction-line-column-gap;
         margin-right: $tp-transaction-line-column-gap;
         max-width: $tp-transaction-default-button-width-big;
       }
       .column3 {
+        display: flex;
+        row-gap: $tp-transaction-line-row-gap;
+        column-gap: $tp-transaction-line-column-gap;
         margin-right: $tp-transaction-line-column-gap;
 
         co-transaction-line-drop-shipment-button {

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

@@ -42,6 +42,7 @@
         display: flex;
         width: 100%;
         align-items: center;
+        padding: $tp-transaction-line-checkbox-list-label-padding;
       }
 
       .label {
@@ -54,6 +55,12 @@
           width: $tp-transaction-line-checkbox-list-item-first-column-width;
           flex-shrink: 0;
         }
+        &.right {
+          text-align: right;
+        }
+        &.center {
+          text-align: center;
+        }
       }
     }
 

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

@@ -9,3 +9,4 @@ $tp-transaction-line-checkbox-list-item-hightlight-font-style: italic !default;
 $tp-transaction-line-checkbox-list-item-hightlight-font-color: green !default;
 $tp-transaction-line-checkbox-list-item-hightlight-text-decoration: underline !default;
 $tp-transaction-line-checkbox-list-item-first-column-width: 70px !default;
+$tp-transaction-line-checkbox-list-label-padding: 0 10px !default;

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

@@ -1,10 +1,11 @@
 import { OnInit } from '@angular/core';
 import { CoDomainValue } from '@colijnit/mainapi/build/model/co-domain-value.bo';
 import { TransactionFilterPopupBaseComponent } from '../core/base/transaction-filter-popup-base.component';
+import { CheckboxListPropertyInterface } from '../../interface/checkbox-list-property.interface';
 export declare class TransactionLineCommissionCodeComponent extends TransactionFilterPopupBaseComponent<CoDomainValue> implements OnInit {
     protected codeField: string;
     protected checkField: string;
-    protected propsForLabel: string[];
+    protected propsForLabel: CheckboxListPropertyInterface[];
     ngOnInit(): void;
     commit(code: string): Promise<boolean>;
     protected transactionLineSet(): void;

package/lib/component/transaction-line-fields/transaction-line-delivery-method.component.d.ts

@@ -1,10 +1,11 @@
 import { OnInit } from '@angular/core';
 import { DeliveryMethod } from '@colijnit/transactionapi/build/model/delivery-method.bo';
 import { TransactionFilterPopupBaseComponent } from '../core/base/transaction-filter-popup-base.component';
+import { CheckboxListPropertyInterface } from '../../interface/checkbox-list-property.interface';
 export declare class TransactionLineDeliveryMethodComponent extends TransactionFilterPopupBaseComponent<DeliveryMethod> implements OnInit {
     protected codeField: string;
     protected checkField: string;
-    protected propsForLabel: string[];
+    protected propsForLabel: CheckboxListPropertyInterface[];
     ngOnInit(): void;
     commit(method: string): Promise<boolean>;
     protected transactionInfoSet(): void;

package/lib/component/transaction-line-fields/transaction-line-price-list.component.d.ts

@@ -1,10 +1,11 @@
-import { OnInit } from "@angular/core";
-import { PriceList } from "@colijnit/transactionapi/build/model/price-list";
-import { TransactionFilterPopupBaseComponent } from "../core/base/transaction-filter-popup-base.component";
+import { OnInit } from '@angular/core';
+import { PriceList } from '@colijnit/transactionapi/build/model/price-list';
+import { TransactionFilterPopupBaseComponent } from '../core/base/transaction-filter-popup-base.component';
+import { CheckboxListPropertyInterface } from '../../interface/checkbox-list-property.interface';
 export declare class TransactionLinePriceListComponent extends TransactionFilterPopupBaseComponent<PriceList> implements OnInit {
     protected codeField: string;
     protected checkField: string;
-    protected propsForLabel: string[];
+    protected propsForLabel: CheckboxListPropertyInterface[];
     ngOnInit(): void;
     commit(priceList: string): Promise<boolean>;
 }

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

@@ -1,12 +1,13 @@
 import { ChangeDetectorRef, OnInit } from '@angular/core';
-import { TransactionService } from "../../service/transaction.service";
-import { TransactionFilterPopupBaseComponent } from "../core/base/transaction-filter-popup-base.component";
-import { RelationListObject } from "@colijnit/relationapi/build/model/relation-list-object.bo";
-import { RelationService } from "../../service/relation.service";
+import { TransactionService } from '../../service/transaction.service';
+import { TransactionFilterPopupBaseComponent } from '../core/base/transaction-filter-popup-base.component';
+import { RelationListObject } from '@colijnit/relationapi/build/model/relation-list-object.bo';
+import { RelationService } from '../../service/relation.service';
 import { DictionaryService } from '../../service/dictionary.service';
 import { TransactionEventService } from '../../service/transaction-event.service';
 import { IconCacheService } from '../../service/icon-cache.service';
 import { TransactionImageService } from '../../service/transaction-image.service';
+import { CheckboxListPropertyInterface } from '../../interface/checkbox-list-property.interface';
 export declare class TransactionLineSupplierComponent extends TransactionFilterPopupBaseComponent<RelationListObject> implements OnInit {
     transactionEventService: TransactionEventService;
     service: TransactionService;
@@ -17,7 +18,7 @@ export declare class TransactionLineSupplierComponent extends TransactionFilterP
     private _relationService;
     protected codeField: string;
     protected checkField: string;
-    protected propsForLabel: string[];
+    protected propsForLabel: CheckboxListPropertyInterface[];
     constructor(transactionEventService: TransactionEventService, service: TransactionService, iconCacheService: IconCacheService, dictionaryService: DictionaryService, imageService: TransactionImageService, changeDetector: ChangeDetectorRef, _relationService: RelationService);
     ngOnInit(): void;
     commit(id: number): Promise<boolean>;

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

@@ -1,10 +1,11 @@
 import { OnInit } from '@angular/core';
 import { Vat } from '@colijnit/transactionapi/build/model/vat';
 import { TransactionFilterPopupBaseComponent } from '../core/base/transaction-filter-popup-base.component';
+import { CheckboxListPropertyInterface } from '../../interface/checkbox-list-property.interface';
 export declare class TransactionLineVatComponent extends TransactionFilterPopupBaseComponent<Vat> implements OnInit {
     protected codeField: string;
     protected checkField: string;
-    protected propsForLabel: string[];
+    protected propsForLabel: CheckboxListPropertyInterface[];
     ngOnInit(): void;
     commit(id: number): Promise<boolean>;
     protected transactionInfoSet(): void;

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

@@ -1,12 +1,13 @@
 import { ChangeDetectorRef, OnInit } from '@angular/core';
-import { StockLocation } from "@colijnit/articleapi/build/model/stock-location.bo";
-import { ArticleService } from "../../service/article.service";
-import { TransactionFilterPopupBaseComponent } from "../core/base/transaction-filter-popup-base.component";
-import { TransactionService } from "../../service/transaction.service";
+import { StockLocation } from '@colijnit/articleapi/build/model/stock-location.bo';
+import { ArticleService } from '../../service/article.service';
+import { TransactionFilterPopupBaseComponent } from '../core/base/transaction-filter-popup-base.component';
+import { TransactionService } from '../../service/transaction.service';
 import { DictionaryService } from '../../service/dictionary.service';
 import { TransactionEventService } from '../../service/transaction-event.service';
 import { IconCacheService } from '../../service/icon-cache.service';
 import { TransactionImageService } from '../../service/transaction-image.service';
+import { CheckboxListPropertyInterface } from '../../interface/checkbox-list-property.interface';
 export declare class TransactionLineWarehouseLocationComponent extends TransactionFilterPopupBaseComponent<StockLocation> implements OnInit {
     transactionEventService: TransactionEventService;
     service: TransactionService;
@@ -17,7 +18,7 @@ export declare class TransactionLineWarehouseLocationComponent extends Transacti
     private _articleService;
     warehouseNr: number;
     protected codeField: string;
-    protected propsForLabel: string[];
+    protected propsForLabel: CheckboxListPropertyInterface[];
     constructor(transactionEventService: TransactionEventService, service: TransactionService, iconCacheService: IconCacheService, dictionaryService: DictionaryService, imageService: TransactionImageService, changeDetector: ChangeDetectorRef, _articleService: ArticleService);
     ngOnInit(): void;
     commit(locationNr: string): Promise<boolean>;

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

@@ -1,10 +1,11 @@
 import { OnInit } from '@angular/core';
-import { Warehouse } from '@colijnit/transactionapi/build/model/warehouse.bo';
 import { TransactionFilterPopupBaseComponent } from '../core/base/transaction-filter-popup-base.component';
-export declare class TransactionLineWarehouseComponent extends TransactionFilterPopupBaseComponent<Warehouse> implements OnInit {
+import { WarehouseStockInfo } from '@colijnit/transactionapi/build/model/warehouse-stock-info.bo';
+import { CheckboxListPropertyInterface } from '../../interface/checkbox-list-property.interface';
+export declare class TransactionLineWarehouseComponent extends TransactionFilterPopupBaseComponent<WarehouseStockInfo> implements OnInit {
     protected codeField: string;
     protected checkField: string;
-    protected propsForLabel: string[];
+    protected propsForLabel: CheckboxListPropertyInterface[];
     ngOnInit(): void;
     commit(warehouse: number): Promise<boolean>;
     protected transactionLineSet(): void;

package/lib/component/transaction-line-purchase-receive-goods/style/_layout.scss

@@ -13,10 +13,6 @@
         margin: 5px;
       }
 
-      .icon-wrapper .co-icon {
-        padding: 13px;
-      }
-
       //.amount-number-picker {
       //  height: 40px;
       //  margin: 5px;

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

@@ -33,16 +33,6 @@
         min-width: 100px;
       }
 
-      .co-transaction-line-warehouse-location-button {
-        .transaction-line-button {
-          height: 45px;
-          width: 100px;
-          .co-icon {
-            padding: 13px;
-          }
-        }
-      }
-
       .button-wrapper {
         background: $tp-default-background-accent;
         border-radius: $tp-default-border-radius;

package/lib/enum/transaction-type-category.enum.d.ts

@@ -11,6 +11,5 @@ export declare enum TransactionTypeCategory {
     SalesOrderLogistics = "salesOrderLogistics",
     SalesOrderPlanning = "salesOrderPlanning",
     SalesOrderDeliveryNote = "salesOrderDeliveryNote",
-    SalesOrderInvoice = "salesOrderInvoice",
-    SalesOrderCashRegister = "salesOrderCashRegister"
+    SalesOrderInvoice = "salesOrderInvoice"
 }

package/lib/interface/checkbox-list-property.interface.d.ts

@@ -0,0 +1,5 @@
+export interface CheckboxListPropertyInterface {
+    width?: string;
+    label: string;
+    alignment?: AlignSetting;
+}

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

@@ -3338,6 +3338,7 @@ export declare class Dictionaries {
         DEACTIVATED: string;
         DEBET: string;
         DEBETCREDIT: string;
+        DEBIT_CREDIT_ERROR_MESSAGE: string;
         DEBIT_CREDIT_SHORT: string;
         DEBTOR_NUMBER: string;
         DEBUG_LEVEL: string;
@@ -6871,6 +6872,7 @@ export declare class Dictionaries {
         SCHEDULED_PROCESSING: string;
         SCHEDULE_EXPLANATION: string;
         SCENARIO: string;
+        SCENARIO_AMOUNT: string;
         SCENARIO_BOOKINGS: string;
         SCENARIO_DESCRIPTION: string;
         SCHEMA: string;
@@ -11489,6 +11491,7 @@ export declare class Dictionaries {
         DEACTIVATED: string;
         DEBET: string;
         DEBETCREDIT: string;
+        DEBIT_CREDIT_ERROR_MESSAGE: string;
         DEBIT_CREDIT: string;
         DEBIT_CREDIT_SHORT: string;
         DEBTOR_NUMBER: string;
@@ -15459,6 +15462,7 @@ export declare class Dictionaries {
         SCHEDULED_PROCESSING: string;
         SCHEDULE_EXPLANATION: string;
         SCENARIO: string;
+        SCENARIO_AMOUNT: string;
         SCENARIO_BOOKINGS: string;
         SCENARIO_DESCRIPTION: string;
         SCHEMA: string;

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

@@ -87,6 +87,7 @@ export declare class TransactionBaseService {
     rollback(): Promise<boolean>;
     searchTransactions(request: TransactionSearchViewRequest): Promise<TransactionSearchResult>;
     getTransactionById(transactionId: number): Promise<void>;
+    getTransactionByNrAndKind(transactionNr: number, transactionKind: TransactionKind): Promise<void>;
     getRefreshedTransactionFromDatabase(transactionId: number): Promise<void>;
     tryToLockTransaction(id: number, version: number, secondAttempt?: boolean): Promise<boolean>;
     getTransactionInfo(transId: number, lineId: number): Promise<TransactionInfoHistory[]>;
@@ -99,6 +100,7 @@ export declare class TransactionBaseService {
     protected _handleAfterRememberCurrentTransaction(transactionInfoResponse: TransactionInfoResponse): Promise<void>;
     protected initializeTransaction(): void;
     protected _isValidTransaction(): boolean;
+    private _resetLockTransaction;
     private _lockTransaction;
     private _getRelationClass;
     private _getRelation;