Please cherry-pick:

- having legal status and company separated was no good idea anyway, so let's
  get rid of it here, too

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

diff --git a/src/java/org/mxchange/jfinancials/beans/businessdata/FinancialsAdminBusinessDataWebRequestBean.java b/src/java/org/mxchange/jfinancials/beans/businessdata/FinancialsAdminBusinessDataWebRequestBean.java
index c18465e10cc5ac1fea0178d83b9a8d4b8beadd96..3572dfe5e273a5999dea1ced434672deab86c497 100644 (file)
--- a/src/java/org/mxchange/jfinancials/beans/businessdata/FinancialsAdminBusinessDataWebRequestBean.java
+++ b/src/java/org/mxchange/jfinancials/beans/businessdata/FinancialsAdminBusinessDataWebRequestBean.java
@@ -56,11 +56,6 @@ public class FinancialsAdminBusinessDataWebRequestBean extends BaseFinancialsCon
         */
        private String companyEmailAddress;
 
-       /**
-        * Company legal status (example: Incorporated, GmbH)
-        */
-       private String companyLegalStatus;
-
        /**
         * Company name
         */
@@ -140,24 +135,6 @@ public class FinancialsAdminBusinessDataWebRequestBean extends BaseFinancialsCon
                this.companyEmailAddress = companyEmailAddress;
        }
 
-       /**
-        * Getter for company's legal status
-        * <p>
-        * @return Company's legal status
-        */
-       public String getCompanyLegalStatus () {
-               return this.companyLegalStatus;
-       }
-
-       /**
-        * Setter for company's legal status
-        * <p>
-        * @param companyLegalStatus Company's legal status
-        */
-       public void setCompanyLegalStatus (final String companyLegalStatus) {
-               this.companyLegalStatus = companyLegalStatus;
-       }
-
        /**
         * Getter for company name
         * <p>

diff --git a/src/java/org/mxchange/jfinancials/beans/businessdata/FinancialsBusinessDataWebSessionBean.java b/src/java/org/mxchange/jfinancials/beans/businessdata/FinancialsBusinessDataWebSessionBean.java
index 06a3e1683ed6fc053be6094fcffe8947afad5545..02adbd7df5db3bb969bec3b4c856cbf8c5e31228 100644 (file)
--- a/src/java/org/mxchange/jfinancials/beans/businessdata/FinancialsBusinessDataWebSessionBean.java
+++ b/src/java/org/mxchange/jfinancials/beans/businessdata/FinancialsBusinessDataWebSessionBean.java
@@ -71,11 +71,6 @@ public class FinancialsBusinessDataWebSessionBean extends BaseFinancialsControll
         */
        private String companyEmailAddress;
 
-       /**
-        * Company legal status (example: Incorporated, GmbH)
-        */
-       private String companyLegalStatus;
-
        /**
         * Company name
         */
@@ -167,24 +162,6 @@ public class FinancialsBusinessDataWebSessionBean extends BaseFinancialsControll
                this.companyEmailAddress = companyEmailAddress;
        }
 
-       /**
-        * Getter for company's legal status
-        * <p>
-        * @return Company's legal status
-        */
-       public String getCompanyLegalStatus () {
-               return this.companyLegalStatus;
-       }
-
-       /**
-        * Setter for company's legal status
-        * <p>
-        * @param companyLegalStatus Company's legal status
-        */
-       public void setCompanyLegalStatus (final String companyLegalStatus) {
-               this.companyLegalStatus = companyLegalStatus;
-       }
-
        /**
         * Getter for company name
         * <p>

diff --git a/src/java/org/mxchange/localization/bundle_de_DE.properties b/src/java/org/mxchange/localization/bundle_de_DE.properties
index eedf9d20867ac420b0996e545137beb24a8482c2..b503fa8066db4792fa3145df0ef856e74f2bfd52 100644 (file)
--- a/src/java/org/mxchange/localization/bundle_de_DE.properties
+++ b/src/java/org/mxchange/localization/bundle_de_DE.properties
@@ -850,7 +850,7 @@ ADMIN_BUSINESS_DATA_PHONE_NUMBER=Haupttelefonnummer:
 ADMIN_BUSINESS_DATA_FAX_NUMBER=Hauptfaxnummer:
 #@TODO Please fix German umlauts!
 ADMIN_ADD_CONTACT_BUSINESS_TITLE=Neuen geschaeftlichen Kontakt hinzufuegen
-ADMIN_ADD_CONTACT_BUSINESS_MINIMUM_DATA=Bitte mindestens Firmennamen mit Rechtsform ein.
+ADMIN_ADD_CONTACT_BUSINESS_MINIMUM_DATA=Bitte mindestens Firmennamen inklusive Rechtsform ein.
 #@TODO Please fix German umlauts!
 ENTERED_EMAIL_ADDRESS_IS_INVALID=Die eingegebene Email-Addresse entspricht nicht dem gueltigen Format.
 #@TODO Please fix German umlauts!

diff --git a/src/java/org/mxchange/localization/bundle_en_US.properties b/src/java/org/mxchange/localization/bundle_en_US.properties
index 4118bf176f9149f9bc56d2f3c7745d66afe0b3d1..5c2afc048787da2a4aa455ce175459831f557041 100644 (file)
--- a/src/java/org/mxchange/localization/bundle_en_US.properties
+++ b/src/java/org/mxchange/localization/bundle_en_US.properties
@@ -819,7 +819,7 @@ ADMIN_BUSINESS_DATA_COMPANY_COMMENTS=Comments:
 ADMIN_BUSINESS_DATA_PHONE_NUMBER=Main phone number:
 ADMIN_BUSINESS_DATA_FAX_NUMBER=Main fax number:
 ADMIN_ADD_CONTACT_BUSINESS_TITLE=Add new business contact
-ADMIN_ADD_CONTACT_BUSINESS_MINIMUM_DATA=Please enter at least company name and legal status.
+ADMIN_ADD_CONTACT_BUSINESS_MINIMUM_DATA=Please enter at least company name including legal status.
 ENTERED_EMAIL_ADDRESS_IS_INVALID=Your entered email address is not valid.
 ADMIN_CONTACT_BUSINESS_DATA_LEGEND=Basic data for business contact:
 #Geben Sie die Basisdaten fuer einen geschaeftlichen Kontakt ein.

diff --git a/web/WEB-INF/templates/admin/business_data/admin_form_business_data.tpl b/web/WEB-INF/templates/admin/business_data/admin_form_business_data.tpl
index 2d8e5eb97bfcbb65de262bb915c30e697f3983b8..652610d265af3b0e7bb0f88891f2324e20759434 100644 (file)
--- a/web/WEB-INF/templates/admin/business_data/admin_form_business_data.tpl
+++ b/web/WEB-INF/templates/admin/business_data/admin_form_business_data.tpl
@@ -27,22 +27,6 @@
                                <h:message for="companyName" errorClass="errors" fatalClass="errors" warnClass="errors" />
                        </h:panelGroup>
 
-                       <h:panelGroup styleClass="table_row" layout="block">
-                               <div class="table_left_medium">
-                                       <h:outputLabel for="companyLegalStatus" value="#{msg.ADMIN_BUSINESS_DATA_COMPANY_LEGAL_STATUS}" />
-                               </div>
-
-                               <div class="table_right_medium">
-                                       <h:inputText styleClass="input" id="companyLegalStatus" size="5" maxlength="10" value="#{adminBusinessDataController.companyLegalStatus}" />
-                               </div>
-
-                               <div class="clear"></div>
-                       </h:panelGroup>
-
-                       <h:panelGroup styleClass="error_container" layout="block">
-                               <h:message for="companyLegalStatus" errorClass="errors" fatalClass="errors" warnClass="errors" />
-                       </h:panelGroup>
-
                        <h:panelGroup styleClass="table_row" layout="block">
                                <div class="table_left_medium">
                                        <h:outputLabel for="companyEmailAddress" value="#{msg.ADMIN_BUSINESS_DATA_COMPANY_EMAIL_ADDRESS}" />

diff --git a/web/admin/business_data/admin_business_data_list.xhtml b/web/admin/business_data/admin_business_data_list.xhtml
index 605db6b00a350b2d7dc06cf09d3e783acd8e6e31..3527e775868c840469cc5fefb954a10cf94dd8c7 100644 (file)
--- a/web/admin/business_data/admin_business_data_list.xhtml
+++ b/web/admin/business_data/admin_business_data_list.xhtml
@@ -47,7 +47,7 @@
                                        <h:outputText value="#{msg.ADMIN_CONTACT_BUSINESS_COMPANY_NAME}" />
                                </f:facet>
 
-                               <h:outputText value="#{businessContact.companyName} #{businessContact.companyLegalStatus}" />
+                               <h:outputText value="#{businessContact.companyName}" />
                        </h:column>
 
                        <h:column>