Don't cherry-pick:

- added transaction number as some receipts contain it

Signed-off-by: Roland Häder <roland@mxchange.org>

diff --git a/src/java/org/mxchange/jfinancials/beans/financial/model/receipt/FinancialAdminReceiptWebRequestBean.java b/src/java/org/mxchange/jfinancials/beans/financial/model/receipt/FinancialAdminReceiptWebRequestBean.java
index 30621c301ccad528b49c491ce4d82e0fdaf9a65a..479029aaeece4c45635f7cccce032cfbeb3bd533 100644 (file)
--- a/src/java/org/mxchange/jfinancials/beans/financial/model/receipt/FinancialAdminReceiptWebRequestBean.java
+++ b/src/java/org/mxchange/jfinancials/beans/financial/model/receipt/FinancialAdminReceiptWebRequestBean.java
@@ -117,6 +117,11 @@ public class FinancialAdminReceiptWebRequestBean extends BaseFinancialsBean impl
         */
        private Long receiptSequenceNumber;
 
+       /**
+        * Transaction number
+        */
+       private Long receiptTransactionNumber;
+
        /**
         * User who "owns" this receipt
         */
@@ -328,6 +333,24 @@ public class FinancialAdminReceiptWebRequestBean extends BaseFinancialsBean impl
                this.receiptSequenceNumber = receiptSequenceNumber;
        }
 
+       /**
+        * Getter for receipt transaction number
+        * <p>
+        * @return Receipt transaction number
+        */
+       public Long getReceiptTransactionNumber () {
+               return this.receiptTransactionNumber;
+       }
+
+       /**
+        * Setter for receipt transaction number
+        * <p>
+        * @param receiptTransactionNumber Receipt transaction number
+        */
+       public void setReceiptTransactionNumber (final Long receiptTransactionNumber) {
+               this.receiptTransactionNumber = receiptTransactionNumber;
+       }
+
        /**
         * Getter for user instance
         * <p>
@@ -359,6 +382,7 @@ public class FinancialAdminReceiptWebRequestBean extends BaseFinancialsBean impl
                this.setReceiptRegisterNumber(null);
                this.setReceiptSellerEmployee(null);
                this.setReceiptSequenceNumber(null);
+               this.setReceiptTransactionNumber(null);
                this.setReceiptUser(null);
        }
 
@@ -378,6 +402,7 @@ public class FinancialAdminReceiptWebRequestBean extends BaseFinancialsBean impl
                receipt.setReceiptRegisterNumber(this.getReceiptRegisterNumber());
                receipt.setReceiptSellerEmployee(this.getReceiptSellerEmployee());
                receipt.setReceiptSequenceNumber(this.getReceiptSequenceNumber());
+               receipt.setReceiptTransactionNumber(this.getReceiptTransactionNumber());
 
                // Return prepared instance
                return receipt;

diff --git a/src/java/org/mxchange/localization/project_de_DE.properties b/src/java/org/mxchange/localization/project_de_DE.properties
index b0531713d9593ab629276d891ca56f14ef85c4a2..fa67bafed9f42f54b2b85a61a1ceb6c984fd26d1 100644 (file)
--- a/src/java/org/mxchange/localization/project_de_DE.properties
+++ b/src/java/org/mxchange/localization/project_de_DE.properties
@@ -364,3 +364,4 @@ ADMIN_EDIT_GENERIC_PRODUCT_TITLE=Produkt-Id {0} editieren
 ADMIN_EDIT_GENERIC_PRODUCT_MINIMUM_DATA=Sie koennen hier alle Werte aendern aber geben oder waehlen Sie mindestens die markierten (*) ein/aus.
 #@TODO Please fix German umlauts!
 BUTTON_ADMIN_EDIT_GENERIC_PRODUCT=Allgemeines Produkt aendern
+ENTER_RECEIPT_TRANSACTION_NUMBER=Transaktionsnummer eingeben:

diff --git a/src/java/org/mxchange/localization/project_en_US.properties b/src/java/org/mxchange/localization/project_en_US.properties
index 4e26cf27410cc2a96a9db47c31cbe589f1a8941a..72e9526725cad16a0ed123d8c00afb65546e5848 100644 (file)
--- a/src/java/org/mxchange/localization/project_en_US.properties
+++ b/src/java/org/mxchange/localization/project_en_US.properties
@@ -270,3 +270,4 @@ RECEIPT_ENTRY_CREATED_TITLE=When this receipt entry has been added to database.
 ADMIN_EDIT_GENERIC_PRODUCT_TITLE=Edit product id {0}
 ADMIN_EDIT_GENERIC_PRODUCT_MINIMUM_DATA=You can edit all values here but enter or select at least all marked (*) values.
 BUTTON_ADMIN_EDIT_GENERIC_PRODUCT=Change generic product
+ENTER_RECEIPT_TRANSACTION_NUMBER=Enter transaction Number:

diff --git a/web/WEB-INF/templates/admin/financial/receipt/admin_form_financial_receipt.tpl b/web/WEB-INF/templates/admin/financial/receipt/admin_form_financial_receipt.tpl
index c25e5c0a898fc43a5dca1955bb37f6abd16378db..26e8772739da18a8b4449df62b3d73d75d5b0918 100644 (file)
--- a/web/WEB-INF/templates/admin/financial/receipt/admin_form_financial_receipt.tpl
+++ b/web/WEB-INF/templates/admin/financial/receipt/admin_form_financial_receipt.tpl
@@ -112,6 +112,9 @@
 
                        <p:outputLabel for="receiptSequenceNumber" value="#{project.ENTER_RECEIPT_SEQUENCE_NUMBER}" />
                        <p:inputText id="receiptSequenceNumber" size="10" maxlength="20" value="#{adminReceiptController.receiptSequenceNumber}" />
+
+                       <p:outputLabel for="receiptTransactionNumber" value="#{project.ENTER_RECEIPT_TRANSACTION_NUMBER}" />
+                       <p:inputText id="receiptTransactionNumber" size="10" maxlength="20" value="#{adminReceiptController.receiptTransactionNumber}" />
                </p:panelGrid>
        </p:fieldset>
 </ui:composition>