svn commit: r1770442 - in /ofbiz/branches: release13.07/applications/commonext/script/org/ofbiz/setup/ release13.07/applications/marketing/script/org/ofbiz/sfa/ release13.07/applications/order/script/org/ofbiz/order/customer/ release13.07/applications/...

Author: jleroux
Date: Fri Nov 18 22:07:48 2016
New Revision: 1770442

URL: http://svn.apache.org/viewvc?rev=1770442&view=rev
Log:
Fixed: Wrong label definition from PartyUiLabels.xml
(OFBIZ-9120)

In PartyUiLabels.xml are the following labels deleted but still in use in some files:
PartyCountryMissing
PartyCountryCode
PartyCountryCodeMissing

Fix:
Use the labels from CommonUiLabels:
CommonCountryMissing
CommonCountryCode
CommonCountryCodeMissing

Thanks: Heiko Elberg

Modified:
    ofbiz/branches/release13.07/applications/commonext/script/org/ofbiz/setup/SetupEvents.xml
    ofbiz/branches/release13.07/applications/marketing/script/org/ofbiz/sfa/ContactMechMapProcs.xml
    ofbiz/branches/release13.07/applications/order/script/org/ofbiz/order/customer/CheckoutMapProcs.xml
    ofbiz/branches/release13.07/applications/order/script/org/ofbiz/order/customer/CustomerEvents.xml
    ofbiz/branches/release13.07/applications/party/script/org/ofbiz/party/customer/CustomerEvents.xml
    ofbiz/branches/release13.07/applications/party/script/org/ofbiz/party/user/UserEvents.xml
    ofbiz/branches/release13.07/specialpurpose/ecommerce/script/org/ofbiz/ecommerce/customer/CustomerEvents.xml
    ofbiz/branches/release13.07/specialpurpose/ecommerce/script/org/ofbiz/ecommerce/customer/QuickAnonCustomerEvents.xml
    ofbiz/branches/release14.12/applications/commonext/script/org/ofbiz/setup/SetupEvents.xml
    ofbiz/branches/release14.12/applications/marketing/script/org/ofbiz/sfa/ContactMechMapProcs.xml
    ofbiz/branches/release14.12/applications/order/script/org/ofbiz/order/customer/CheckoutMapProcs.xml
    ofbiz/branches/release14.12/applications/order/script/org/ofbiz/order/customer/CustomerEvents.xml
    ofbiz/branches/release14.12/applications/party/script/org/ofbiz/party/customer/CustomerEvents.xml
    ofbiz/branches/release14.12/applications/party/script/org/ofbiz/party/user/UserEvents.xml
    ofbiz/branches/release14.12/specialpurpose/ecommerce/script/org/ofbiz/ecommerce/customer/CustomerEvents.xml
    ofbiz/branches/release14.12/specialpurpose/ecommerce/script/org/ofbiz/ecommerce/customer/QuickAnonCustomerEvents.xml
    ofbiz/branches/release15.12/applications/commonext/script/org/ofbiz/setup/SetupEvents.xml
    ofbiz/branches/release15.12/applications/marketing/script/org/ofbiz/sfa/ContactMechMapProcs.xml
    ofbiz/branches/release15.12/applications/order/script/org/ofbiz/order/customer/CheckoutMapProcs.xml
    ofbiz/branches/release15.12/applications/order/script/org/ofbiz/order/customer/CustomerEvents.xml
    ofbiz/branches/release15.12/applications/party/script/org/ofbiz/party/customer/CustomerEvents.xml
    ofbiz/branches/release15.12/applications/party/script/org/ofbiz/party/user/UserEvents.xml
    ofbiz/branches/release15.12/specialpurpose/ecommerce/script/org/ofbiz/ecommerce/customer/CustomerEvents.xml
    ofbiz/branches/release15.12/specialpurpose/ecommerce/script/org/ofbiz/ecommerce/customer/QuickAnonCustomerEvents.xml

Modified: ofbiz/branches/release13.07/applications/commonext/script/org/ofbiz/setup/SetupEvents.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release13.07/applications/commonext/script/org/ofbiz/setup/SetupEvents.xml?rev=1770442&r1=1770441&r2=1770442&view=diff
==============================================================================
--- ofbiz/branches/release13.07/applications/commonext/script/org/ofbiz/setup/SetupEvents.xml (original)
+++ ofbiz/branches/release13.07/applications/commonext/script/org/ofbiz/setup/SetupEvents.xml Fri Nov 18 22:07:48 2016
@@ -55,7 +55,7 @@
                         <process field="USER_CITY"><copy to-field="city"/><not-empty><fail-property resource="PartyUiLabels" property="PartyCityMissing"/></not-empty></process>
                         <process field="USER_STATE"><copy to-field="stateProvinceGeoId"/></process>
                         <process field="USER_POSTAL_CODE"><copy to-field="postalCode"/><not-empty><fail-property resource="PartyUiLabels" property="PartyPostalCodeMissing"/></not-empty></process>
-                        <process field="USER_COUNTRY"><copy to-field="countryGeoId"/><not-empty><fail-property resource="PartyUiLabels" property="PartyCountryMissing"/></not-empty></process>
+                        <process field="USER_COUNTRY"><copy to-field="countryGeoId"/><not-empty><fail-property resource="CommonUiLabels" property="CommonCountryMissing"/></not-empty></process>
                         <process field="USER_ADDRESS_ALLOW_SOL"><copy to-field="allowSolicitation"/></process>
                     </simple-map-processor>
                 </call-map-processor>

Modified: ofbiz/branches/release13.07/applications/marketing/script/org/ofbiz/sfa/ContactMechMapProcs.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release13.07/applications/marketing/script/org/ofbiz/sfa/ContactMechMapProcs.xml?rev=1770442&r1=1770441&r2=1770442&view=diff
==============================================================================
--- ofbiz/branches/release13.07/applications/marketing/script/org/ofbiz/sfa/ContactMechMapProcs.xml (original)
+++ ofbiz/branches/release13.07/applications/marketing/script/org/ofbiz/sfa/ContactMechMapProcs.xml Fri Nov 18 22:07:48 2016
@@ -43,7 +43,7 @@ under the License.
         <process field="city"><copy/><not-empty><fail-property resource="PartyUiLabels" property="PartyCityMissing"/></not-empty></process>
         <process field="state"><copy to-field="stateProvinceGeoId"/></process>
         <process field="postalCode"><copy/><not-empty><fail-property resource="PartyUiLabels" property="PartyPostalCodeMissing"/></not-empty></process>
-        <process field="country"><copy to-field="countryGeoId"/><not-empty><fail-property resource="PartyUiLabels" property="PartyCountryMissing"/></not-empty></process>
+        <process field="country"><copy to-field="countryGeoId"/><not-empty><fail-property resource="CommonUiLabels" property="CommonCountryMissing"/></not-empty></process>
         <process field="addressAllowSol"><copy to-field="allowSolicitation"/></process>
     </simple-map-processor>
 

Modified: ofbiz/branches/release13.07/applications/order/script/org/ofbiz/order/customer/CheckoutMapProcs.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release13.07/applications/order/script/org/ofbiz/order/customer/CheckoutMapProcs.xml?rev=1770442&r1=1770441&r2=1770442&view=diff
==============================================================================
--- ofbiz/branches/release13.07/applications/order/script/org/ofbiz/order/customer/CheckoutMapProcs.xml (original)
+++ ofbiz/branches/release13.07/applications/order/script/org/ofbiz/order/customer/CheckoutMapProcs.xml Fri Nov 18 22:07:48 2016
@@ -28,7 +28,7 @@ under the License.
         <process field="countryCode">
             <copy/>
             <not-empty>
-                <fail-property resource="PartyUiLabels" property="PartyCountryCodeMissing"/>
+                <fail-property resource="CommonUiLabels" property="CommonCountryCodeMissing"/>
             </not-empty>
         </process>
         <process field="areaCode">
@@ -88,7 +88,7 @@ under the License.
         <process field="shipToCountryGeoId">
             <copy to-field="countryGeoId"/>
             <not-empty>
-                <fail-property resource="PartyUiLabels" property="PartyCountryMissing"/>
+                <fail-property resource="CommonUiLabels" property="CommonCountryMissing"/>
             </not-empty>
         </process>
     </simple-map-processor>
@@ -133,7 +133,7 @@ under the License.
         <process field="billToCountryGeoId">
             <copy to-field="countryGeoId"/>
             <not-empty>
-                <fail-property resource="PartyUiLabels" property="PartyCountryMissing"/>
+                <fail-property resource="CommonUiLabels" property="CommonCountryMissing"/>
             </not-empty>
         </process>
     </simple-map-processor>
@@ -141,7 +141,7 @@ under the License.
     <simple-map-processor name="shipToPhone">
         <process field="shipToCountryCode">
             <copy to-field="countryCode"/>
-            <not-empty><fail-property resource="PartyUiLabels" property="PartyCountryCodeMissing"/></not-empty>
+            <not-empty><fail-property resource="CommonUiLabels" property="CommonCountryCodeMissing"/></not-empty>
         </process>
         <process field="shipToAreaCode">
             <copy to-field="areaCode"/>
@@ -157,7 +157,7 @@ under the License.
     <simple-map-processor name="billToPhone">
         <process field="billToCountryCode">
             <copy to-field="countryCode"/>
-            <not-empty><fail-property resource="PartyUiLabels" property="PartyCountryCodeMissing"/></not-empty>
+            <not-empty><fail-property resource="CommonUiLabels" property="CommonCountryCodeMissing"/></not-empty>
         </process>
         <process field="billToAreaCode">
             <copy to-field="areaCode"/>

Modified: ofbiz/branches/release13.07/applications/order/script/org/ofbiz/order/customer/CustomerEvents.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release13.07/applications/order/script/org/ofbiz/order/customer/CustomerEvents.xml?rev=1770442&r1=1770441&r2=1770442&view=diff
==============================================================================
--- ofbiz/branches/release13.07/applications/order/script/org/ofbiz/order/customer/CustomerEvents.xml (original)
+++ ofbiz/branches/release13.07/applications/order/script/org/ofbiz/order/customer/CustomerEvents.xml Fri Nov 18 22:07:48 2016
@@ -86,7 +86,7 @@ under the License.
                     </process>
                     <process field="countryGeoId">
                         <copy/>
-                        <not-empty><fail-property resource="PartyUiLabels" property="PartyCountryMissing"/></not-empty>
+                        <not-empty><fail-property resource="CommonUiLabels" property="CommonCountryMissing"/></not-empty>
                     </process>
                     <process field="allowSolicitation"><copy/></process>
                 </simple-map-processor>

Modified: ofbiz/branches/release13.07/applications/party/script/org/ofbiz/party/customer/CustomerEvents.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release13.07/applications/party/script/org/ofbiz/party/customer/CustomerEvents.xml?rev=1770442&r1=1770441&r2=1770442&view=diff
==============================================================================
--- ofbiz/branches/release13.07/applications/party/script/org/ofbiz/party/customer/CustomerEvents.xml (original)
+++ ofbiz/branches/release13.07/applications/party/script/org/ofbiz/party/customer/CustomerEvents.xml Fri Nov 18 22:07:48 2016
@@ -118,7 +118,7 @@ under the License.
                         <process field="CUSTOMER_CITY"><copy to-field="city"/><not-empty><fail-property resource="PartyUiLabels" property="PartyCityMissing"/></not-empty></process>
                         <process field="CUSTOMER_STATE"><copy to-field="stateProvinceGeoId"/></process>
                         <process field="CUSTOMER_POSTAL_CODE"><copy to-field="postalCode"/><not-empty><fail-property resource="PartyUiLabels" property="PartyPostalCodeMissing"/></not-empty></process>
-                        <process field="CUSTOMER_COUNTRY"><copy to-field="countryGeoId"/><not-empty><fail-property resource="PartyUiLabels" property="PartyCountryMissing"/></not-empty></process>
+                        <process field="CUSTOMER_COUNTRY"><copy to-field="countryGeoId"/><not-empty><fail-property resource="CommonUiLabels" property="CommonCountryMissing"/></not-empty></process>
                         <process field="CUSTOMER_ADDRESS_ALLOW_SOL"><copy to-field="allowSolicitation"/></process>
                     </simple-map-processor>
                 </call-map-processor>

Modified: ofbiz/branches/release13.07/applications/party/script/org/ofbiz/party/user/UserEvents.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release13.07/applications/party/script/org/ofbiz/party/user/UserEvents.xml?rev=1770442&r1=1770441&r2=1770442&view=diff
==============================================================================
--- ofbiz/branches/release13.07/applications/party/script/org/ofbiz/party/user/UserEvents.xml (original)
+++ ofbiz/branches/release13.07/applications/party/script/org/ofbiz/party/user/UserEvents.xml Fri Nov 18 22:07:48 2016
@@ -156,7 +156,7 @@ under the License.
                         <process field="USER_CITY"><copy to-field="city"/><not-empty><fail-property resource="PartyUiLabels" property="PartyCityMissing"/></not-empty></process>
                         <process field="USER_STATE"><copy to-field="stateProvinceGeoId"/></process>
                         <process field="USER_POSTAL_CODE"><copy to-field="postalCode"/><not-empty><fail-property resource="PartyUiLabels" property="PartyPostalCodeMissing"/></not-empty></process>
-                        <process field="USER_COUNTRY"><copy to-field="countryGeoId"/><not-empty><fail-property resource="PartyUiLabels" property="PartyCountryMissing"/></not-empty></process>
+                        <process field="USER_COUNTRY"><copy to-field="countryGeoId"/><not-empty><fail-property resource="CommonUiLabels" property="CommonCountryMissing"/></not-empty></process>
                         <process field="USER_ADDRESS_ALLOW_SOL"><copy to-field="allowSolicitation"/></process>
                     </simple-map-processor>
                 </call-map-processor>

Modified: ofbiz/branches/release13.07/specialpurpose/ecommerce/script/org/ofbiz/ecommerce/customer/CustomerEvents.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release13.07/specialpurpose/ecommerce/script/org/ofbiz/ecommerce/customer/CustomerEvents.xml?rev=1770442&r1=1770441&r2=1770442&view=diff
==============================================================================
--- ofbiz/branches/release13.07/specialpurpose/ecommerce/script/org/ofbiz/ecommerce/customer/CustomerEvents.xml (original)
+++ ofbiz/branches/release13.07/specialpurpose/ecommerce/script/org/ofbiz/ecommerce/customer/CustomerEvents.xml Fri Nov 18 22:07:48 2016
@@ -149,7 +149,7 @@ under the License.
                         </process>
                         <process field="CUSTOMER_COUNTRY">
                             <copy to-field="countryGeoId"/>
-                            <not-empty><fail-property resource="PartyUiLabels" property="PartyCountryMissing"/></not-empty>
+                            <not-empty><fail-property resource="CommonUiLabels" property="CommonCountryMissing"/></not-empty>
                         </process>
                         <process field="CUSTOMER_ADDRESS_ALLOW_SOL"><copy to-field="allowSolicitation"/></process>
                     </simple-map-processor>
@@ -749,7 +749,7 @@ under the License.
                 </process>
                 <process field="countryGeoId">
                     <copy/>
-                    <not-empty><fail-property resource="PartyUiLabels" property="PartyCountryMissing"/></not-empty>
+                    <not-empty><fail-property resource="CommonUiLabels" property="CommonCountryMissing"/></not-empty>
                 </process>
                 <process field="allowSolicitation"><copy/></process>
                 <process field="yearsAtAddress"><convert type="Long" to-field="yearsWithContactMech"><fail-property resource="EcommerceUiLabels" property="EcommerceYearsAtAddressNotValid"/></convert></process>

Modified: ofbiz/branches/release13.07/specialpurpose/ecommerce/script/org/ofbiz/ecommerce/customer/QuickAnonCustomerEvents.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release13.07/specialpurpose/ecommerce/script/org/ofbiz/ecommerce/customer/QuickAnonCustomerEvents.xml?rev=1770442&r1=1770441&r2=1770442&view=diff
==============================================================================
--- ofbiz/branches/release13.07/specialpurpose/ecommerce/script/org/ofbiz/ecommerce/customer/QuickAnonCustomerEvents.xml (original)
+++ ofbiz/branches/release13.07/specialpurpose/ecommerce/script/org/ofbiz/ecommerce/customer/QuickAnonCustomerEvents.xml Fri Nov 18 22:07:48 2016
@@ -227,7 +227,7 @@ under the License.
                     <process field="shipToCity"><copy to-field="city"/><not-empty><fail-property resource="PartyUiLabels" property="PartyCityMissing"/></not-empty></process>
                     <process field="shipToStateProvinceGeoId"><copy to-field="stateProvinceGeoId"/></process>
                     <process field="shipToPostalCode"><copy to-field="postalCode"/><not-empty><fail-property resource="PartyUiLabels"  property="PartyPostalCodeMissing"/></not-empty></process>
-                    <process field="shipToCountryGeoId"><copy to-field="countryGeoId"/><not-empty><fail-property resource="PartyUiLabels" property="PartyCountryMissing"/></not-empty></process>
+                    <process field="shipToCountryGeoId"><copy to-field="countryGeoId"/><not-empty><fail-property resource="CommonUiLabels" property="CommonCountryMissing"/></not-empty></process>
                     <process field="shipToPostalAddressAllowSol"><copy to-field="allowSolicitation"/></process>
                 </simple-map-processor>
             </call-map-processor>
@@ -261,7 +261,7 @@ under the License.
                         <process field="billToCity"><copy to-field="city"/><not-empty><fail-property resource="PartyUiLabels" property="PartyCityMissing"/></not-empty></process>
                         <process field="billToStateProvinceGeoId"><copy to-field="stateProvinceGeoId"/></process>
                         <process field="billToPostalCode"><copy to-field="postalCode"/><not-empty><fail-property resource="PartyUiLabels"  property="PartyPostalCodeMissing"/></not-empty></process>
-                        <process field="billToCountryGeoId"><copy to-field="countryGeoId"/><not-empty><fail-property resource="PartyUiLabels" property="PartyCountryMissing"/></not-empty></process>
+                        <process field="billToCountryGeoId"><copy to-field="countryGeoId"/><not-empty><fail-property resource="CommonUiLabels" property="CommonCountryMissing"/></not-empty></process>
                         <process field="billToPostalAddressAllowSol"><copy to-field="allowSolicitation"/></process>
                     </simple-map-processor>
                 </call-map-processor>

Modified: ofbiz/branches/release14.12/applications/commonext/script/org/ofbiz/setup/SetupEvents.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release14.12/applications/commonext/script/org/ofbiz/setup/SetupEvents.xml?rev=1770442&r1=1770441&r2=1770442&view=diff
==============================================================================
--- ofbiz/branches/release14.12/applications/commonext/script/org/ofbiz/setup/SetupEvents.xml (original)
+++ ofbiz/branches/release14.12/applications/commonext/script/org/ofbiz/setup/SetupEvents.xml Fri Nov 18 22:07:48 2016
@@ -55,7 +55,7 @@
                         <process field="USER_CITY"><copy to-field="city"/><not-empty><fail-property resource="PartyUiLabels" property="PartyCityMissing"/></not-empty></process>
                         <process field="USER_STATE"><copy to-field="stateProvinceGeoId"/></process>
                         <process field="USER_POSTAL_CODE"><copy to-field="postalCode"/><not-empty><fail-property resource="PartyUiLabels" property="PartyPostalCodeMissing"/></not-empty></process>
-                        <process field="USER_COUNTRY"><copy to-field="countryGeoId"/><not-empty><fail-property resource="PartyUiLabels" property="PartyCountryMissing"/></not-empty></process>
+                        <process field="USER_COUNTRY"><copy to-field="countryGeoId"/><not-empty><fail-property resource="CommonUiLabels" property="CommonCountryMissing"/></not-empty></process>
                         <process field="USER_ADDRESS_ALLOW_SOL"><copy to-field="allowSolicitation"/></process>
                     </simple-map-processor>
                 </call-map-processor>

Modified: ofbiz/branches/release14.12/applications/marketing/script/org/ofbiz/sfa/ContactMechMapProcs.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release14.12/applications/marketing/script/org/ofbiz/sfa/ContactMechMapProcs.xml?rev=1770442&r1=1770441&r2=1770442&view=diff
==============================================================================
--- ofbiz/branches/release14.12/applications/marketing/script/org/ofbiz/sfa/ContactMechMapProcs.xml (original)
+++ ofbiz/branches/release14.12/applications/marketing/script/org/ofbiz/sfa/ContactMechMapProcs.xml Fri Nov 18 22:07:48 2016
@@ -43,7 +43,7 @@ under the License.
         <process field="city"><copy/><not-empty><fail-property resource="PartyUiLabels" property="PartyCityMissing"/></not-empty></process>
         <process field="state"><copy to-field="stateProvinceGeoId"/></process>
         <process field="postalCode"><copy/><not-empty><fail-property resource="PartyUiLabels" property="PartyPostalCodeMissing"/></not-empty></process>
-        <process field="country"><copy to-field="countryGeoId"/><not-empty><fail-property resource="PartyUiLabels" property="PartyCountryMissing"/></not-empty></process>
+        <process field="country"><copy to-field="countryGeoId"/><not-empty><fail-property resource="CommonUiLabels" property="CommonCountryMissing"/></not-empty></process>
         <process field="addressAllowSol"><copy to-field="allowSolicitation"/></process>
     </simple-map-processor>
 

Modified: ofbiz/branches/release14.12/applications/order/script/org/ofbiz/order/customer/CheckoutMapProcs.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release14.12/applications/order/script/org/ofbiz/order/customer/CheckoutMapProcs.xml?rev=1770442&r1=1770441&r2=1770442&view=diff
==============================================================================
--- ofbiz/branches/release14.12/applications/order/script/org/ofbiz/order/customer/CheckoutMapProcs.xml (original)
+++ ofbiz/branches/release14.12/applications/order/script/org/ofbiz/order/customer/CheckoutMapProcs.xml Fri Nov 18 22:07:48 2016
@@ -28,7 +28,7 @@ under the License.
         <process field="countryCode">
             <copy/>
             <not-empty>
-                <fail-property resource="PartyUiLabels" property="PartyCountryCodeMissing"/>
+                <fail-property resource="CommonUiLabels" property="CommonCountryCodeMissing"/>
             </not-empty>
         </process>
         <process field="areaCode">
@@ -88,7 +88,7 @@ under the License.
         <process field="shipToCountryGeoId">
             <copy to-field="countryGeoId"/>
             <not-empty>
-                <fail-property resource="PartyUiLabels" property="PartyCountryMissing"/>
+                <fail-property resource="CommonUiLabels" property="CommonCountryMissing"/>
             </not-empty>
         </process>
     </simple-map-processor>
@@ -133,7 +133,7 @@ under the License.
         <process field="billToCountryGeoId">
             <copy to-field="countryGeoId"/>
             <not-empty>
-                <fail-property resource="PartyUiLabels" property="PartyCountryMissing"/>
+                <fail-property resource="CommonUiLabels" property="CommonCountryMissing"/>
             </not-empty>
         </process>
     </simple-map-processor>
@@ -141,7 +141,7 @@ under the License.
     <simple-map-processor name="shipToPhone">
         <process field="shipToCountryCode">
             <copy to-field="countryCode"/>
-            <not-empty><fail-property resource="PartyUiLabels" property="PartyCountryCodeMissing"/></not-empty>
+            <not-empty><fail-property resource="CommonUiLabels" property="CommonCountryCodeMissing"/></not-empty>
         </process>
         <process field="shipToAreaCode">
             <copy to-field="areaCode"/>
@@ -157,7 +157,7 @@ under the License.
     <simple-map-processor name="billToPhone">
         <process field="billToCountryCode">
             <copy to-field="countryCode"/>
-            <not-empty><fail-property resource="PartyUiLabels" property="PartyCountryCodeMissing"/></not-empty>
+            <not-empty><fail-property resource="CommonUiLabels" property="CommonCountryCodeMissing"/></not-empty>
         </process>
         <process field="billToAreaCode">
             <copy to-field="areaCode"/>

Modified: ofbiz/branches/release14.12/applications/order/script/org/ofbiz/order/customer/CustomerEvents.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release14.12/applications/order/script/org/ofbiz/order/customer/CustomerEvents.xml?rev=1770442&r1=1770441&r2=1770442&view=diff
==============================================================================
--- ofbiz/branches/release14.12/applications/order/script/org/ofbiz/order/customer/CustomerEvents.xml (original)
+++ ofbiz/branches/release14.12/applications/order/script/org/ofbiz/order/customer/CustomerEvents.xml Fri Nov 18 22:07:48 2016
@@ -86,7 +86,7 @@ under the License.
                     </process>
                     <process field="countryGeoId">
                         <copy/>
-                        <not-empty><fail-property resource="PartyUiLabels" property="PartyCountryMissing"/></not-empty>
+                        <not-empty><fail-property resource="CommonUiLabels" property="CommonCountryMissing"/></not-empty>
                     </process>
                     <process field="allowSolicitation"><copy/></process>
                 </simple-map-processor>

Modified: ofbiz/branches/release14.12/applications/party/script/org/ofbiz/party/customer/CustomerEvents.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release14.12/applications/party/script/org/ofbiz/party/customer/CustomerEvents.xml?rev=1770442&r1=1770441&r2=1770442&view=diff
==============================================================================
--- ofbiz/branches/release14.12/applications/party/script/org/ofbiz/party/customer/CustomerEvents.xml (original)
+++ ofbiz/branches/release14.12/applications/party/script/org/ofbiz/party/customer/CustomerEvents.xml Fri Nov 18 22:07:48 2016
@@ -118,7 +118,7 @@ under the License.
                         <process field="CUSTOMER_CITY"><copy to-field="city"/><not-empty><fail-property resource="PartyUiLabels" property="PartyCityMissing"/></not-empty></process>
                         <process field="CUSTOMER_STATE"><copy to-field="stateProvinceGeoId"/></process>
                         <process field="CUSTOMER_POSTAL_CODE"><copy to-field="postalCode"/><not-empty><fail-property resource="PartyUiLabels" property="PartyPostalCodeMissing"/></not-empty></process>
-                        <process field="CUSTOMER_COUNTRY"><copy to-field="countryGeoId"/><not-empty><fail-property resource="PartyUiLabels" property="PartyCountryMissing"/></not-empty></process>
+                        <process field="CUSTOMER_COUNTRY"><copy to-field="countryGeoId"/><not-empty><fail-property resource="CommonUiLabels" property="CommonCountryMissing"/></not-empty></process>
                         <process field="CUSTOMER_ADDRESS_ALLOW_SOL"><copy to-field="allowSolicitation"/></process>
                     </simple-map-processor>
                 </call-map-processor>

Modified: ofbiz/branches/release14.12/applications/party/script/org/ofbiz/party/user/UserEvents.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release14.12/applications/party/script/org/ofbiz/party/user/UserEvents.xml?rev=1770442&r1=1770441&r2=1770442&view=diff
==============================================================================
--- ofbiz/branches/release14.12/applications/party/script/org/ofbiz/party/user/UserEvents.xml (original)
+++ ofbiz/branches/release14.12/applications/party/script/org/ofbiz/party/user/UserEvents.xml Fri Nov 18 22:07:48 2016
@@ -156,7 +156,7 @@ under the License.
                         <process field="USER_CITY"><copy to-field="city"/><not-empty><fail-property resource="PartyUiLabels" property="PartyCityMissing"/></not-empty></process>
                         <process field="USER_STATE"><copy to-field="stateProvinceGeoId"/></process>
                         <process field="USER_POSTAL_CODE"><copy to-field="postalCode"/><not-empty><fail-property resource="PartyUiLabels" property="PartyPostalCodeMissing"/></not-empty></process>
-                        <process field="USER_COUNTRY"><copy to-field="countryGeoId"/><not-empty><fail-property resource="PartyUiLabels" property="PartyCountryMissing"/></not-empty></process>
+                        <process field="USER_COUNTRY"><copy to-field="countryGeoId"/><not-empty><fail-property resource="CommonUiLabels" property="CommonCountryMissing"/></not-empty></process>
                         <process field="USER_ADDRESS_ALLOW_SOL"><copy to-field="allowSolicitation"/></process>
                     </simple-map-processor>
                 </call-map-processor>

Modified: ofbiz/branches/release14.12/specialpurpose/ecommerce/script/org/ofbiz/ecommerce/customer/CustomerEvents.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release14.12/specialpurpose/ecommerce/script/org/ofbiz/ecommerce/customer/CustomerEvents.xml?rev=1770442&r1=1770441&r2=1770442&view=diff
==============================================================================
--- ofbiz/branches/release14.12/specialpurpose/ecommerce/script/org/ofbiz/ecommerce/customer/CustomerEvents.xml (original)
+++ ofbiz/branches/release14.12/specialpurpose/ecommerce/script/org/ofbiz/ecommerce/customer/CustomerEvents.xml Fri Nov 18 22:07:48 2016
@@ -149,7 +149,7 @@ under the License.
                         </process>
                         <process field="CUSTOMER_COUNTRY">
                             <copy to-field="countryGeoId"/>
-                            <not-empty><fail-property resource="PartyUiLabels" property="PartyCountryMissing"/></not-empty>
+                            <not-empty><fail-property resource="CommonUiLabels" property="CommonCountryMissing"/></not-empty>
                         </process>
                         <process field="CUSTOMER_ADDRESS_ALLOW_SOL"><copy to-field="allowSolicitation"/></process>
                     </simple-map-processor>
@@ -749,7 +749,7 @@ under the License.
                 </process>
                 <process field="countryGeoId">
                     <copy/>
-                    <not-empty><fail-property resource="PartyUiLabels" property="PartyCountryMissing"/></not-empty>
+                    <not-empty><fail-property resource="CommonUiLabels" property="CommonCountryMissing"/></not-empty>
                 </process>
                 <process field="allowSolicitation"><copy/></process>
                 <process field="yearsAtAddress"><convert type="Long" to-field="yearsWithContactMech"><fail-property resource="EcommerceUiLabels" property="EcommerceYearsAtAddressNotValid"/></convert></process>

Modified: ofbiz/branches/release14.12/specialpurpose/ecommerce/script/org/ofbiz/ecommerce/customer/QuickAnonCustomerEvents.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release14.12/specialpurpose/ecommerce/script/org/ofbiz/ecommerce/customer/QuickAnonCustomerEvents.xml?rev=1770442&r1=1770441&r2=1770442&view=diff
==============================================================================
--- ofbiz/branches/release14.12/specialpurpose/ecommerce/script/org/ofbiz/ecommerce/customer/QuickAnonCustomerEvents.xml (original)
+++ ofbiz/branches/release14.12/specialpurpose/ecommerce/script/org/ofbiz/ecommerce/customer/QuickAnonCustomerEvents.xml Fri Nov 18 22:07:48 2016
@@ -236,7 +236,7 @@ under the License.
                     <process field="shipToCity"><copy to-field="city"/><not-empty><fail-property resource="PartyUiLabels" property="PartyCityMissing"/></not-empty></process>
                     <process field="shipToStateProvinceGeoId"><copy to-field="stateProvinceGeoId"/></process>
                     <process field="shipToPostalCode"><copy to-field="postalCode"/><not-empty><fail-property resource="PartyUiLabels"  property="PartyPostalCodeMissing"/></not-empty></process>
-                    <process field="shipToCountryGeoId"><copy to-field="countryGeoId"/><not-empty><fail-property resource="PartyUiLabels" property="PartyCountryMissing"/></not-empty></process>
+                    <process field="shipToCountryGeoId"><copy to-field="countryGeoId"/><not-empty><fail-property resource="CommonUiLabels" property="CommonCountryMissing"/></not-empty></process>
                     <process field="shipToPostalAddressAllowSol"><copy to-field="allowSolicitation"/></process>
                 </simple-map-processor>
             </call-map-processor>
@@ -270,7 +270,7 @@ under the License.
                         <process field="billToCity"><copy to-field="city"/><not-empty><fail-property resource="PartyUiLabels" property="PartyCityMissing"/></not-empty></process>
                         <process field="billToStateProvinceGeoId"><copy to-field="stateProvinceGeoId"/></process>
                         <process field="billToPostalCode"><copy to-field="postalCode"/><not-empty><fail-property resource="PartyUiLabels"  property="PartyPostalCodeMissing"/></not-empty></process>
-                        <process field="billToCountryGeoId"><copy to-field="countryGeoId"/><not-empty><fail-property resource="PartyUiLabels" property="PartyCountryMissing"/></not-empty></process>
+                        <process field="billToCountryGeoId"><copy to-field="countryGeoId"/><not-empty><fail-property resource="CommonUiLabels" property="CommonCountryMissing"/></not-empty></process>
                         <process field="billToPostalAddressAllowSol"><copy to-field="allowSolicitation"/></process>
                     </simple-map-processor>
                 </call-map-processor>

Modified: ofbiz/branches/release15.12/applications/commonext/script/org/ofbiz/setup/SetupEvents.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release15.12/applications/commonext/script/org/ofbiz/setup/SetupEvents.xml?rev=1770442&r1=1770441&r2=1770442&view=diff
==============================================================================
--- ofbiz/branches/release15.12/applications/commonext/script/org/ofbiz/setup/SetupEvents.xml (original)
+++ ofbiz/branches/release15.12/applications/commonext/script/org/ofbiz/setup/SetupEvents.xml Fri Nov 18 22:07:48 2016
@@ -55,7 +55,7 @@
                         <process field="USER_CITY"><copy to-field="city"/><not-empty><fail-property resource="PartyUiLabels" property="PartyCityMissing"/></not-empty></process>
                         <process field="USER_STATE"><copy to-field="stateProvinceGeoId"/></process>
                         <process field="USER_POSTAL_CODE"><copy to-field="postalCode"/><not-empty><fail-property resource="PartyUiLabels" property="PartyPostalCodeMissing"/></not-empty></process>
-                        <process field="USER_COUNTRY"><copy to-field="countryGeoId"/><not-empty><fail-property resource="PartyUiLabels" property="PartyCountryMissing"/></not-empty></process>
+                        <process field="USER_COUNTRY"><copy to-field="countryGeoId"/><not-empty><fail-property resource="CommonUiLabels" property="CommonCountryMissing"/></not-empty></process>
                         <process field="USER_ADDRESS_ALLOW_SOL"><copy to-field="allowSolicitation"/></process>
                     </simple-map-processor>
                 </call-map-processor>

Modified: ofbiz/branches/release15.12/applications/marketing/script/org/ofbiz/sfa/ContactMechMapProcs.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release15.12/applications/marketing/script/org/ofbiz/sfa/ContactMechMapProcs.xml?rev=1770442&r1=1770441&r2=1770442&view=diff
==============================================================================
--- ofbiz/branches/release15.12/applications/marketing/script/org/ofbiz/sfa/ContactMechMapProcs.xml (original)
+++ ofbiz/branches/release15.12/applications/marketing/script/org/ofbiz/sfa/ContactMechMapProcs.xml Fri Nov 18 22:07:48 2016
@@ -43,7 +43,7 @@ under the License.
         <process field="city"><copy/><not-empty><fail-property resource="PartyUiLabels" property="PartyCityMissing"/></not-empty></process>
         <process field="state"><copy to-field="stateProvinceGeoId"/></process>
         <process field="postalCode"><copy/><not-empty><fail-property resource="PartyUiLabels" property="PartyPostalCodeMissing"/></not-empty></process>
-        <process field="country"><copy to-field="countryGeoId"/><not-empty><fail-property resource="PartyUiLabels" property="PartyCountryMissing"/></not-empty></process>
+        <process field="country"><copy to-field="countryGeoId"/><not-empty><fail-property resource="CommonUiLabels" property="CommonCountryMissing"/></not-empty></process>
         <process field="addressAllowSol"><copy to-field="allowSolicitation"/></process>
     </simple-map-processor>
 

Modified: ofbiz/branches/release15.12/applications/order/script/org/ofbiz/order/customer/CheckoutMapProcs.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release15.12/applications/order/script/org/ofbiz/order/customer/CheckoutMapProcs.xml?rev=1770442&r1=1770441&r2=1770442&view=diff
==============================================================================
--- ofbiz/branches/release15.12/applications/order/script/org/ofbiz/order/customer/CheckoutMapProcs.xml (original)
+++ ofbiz/branches/release15.12/applications/order/script/org/ofbiz/order/customer/CheckoutMapProcs.xml Fri Nov 18 22:07:48 2016
@@ -28,7 +28,7 @@ under the License.
         <process field="countryCode">
             <copy/>
             <not-empty>
-                <fail-property resource="PartyUiLabels" property="PartyCountryCodeMissing"/>
+                <fail-property resource="CommonUiLabels" property="CommonCountryCodeMissing"/>
             </not-empty>
         </process>
         <process field="areaCode">
@@ -88,7 +88,7 @@ under the License.
         <process field="shipToCountryGeoId">
             <copy to-field="countryGeoId"/>
             <not-empty>
-                <fail-property resource="PartyUiLabels" property="PartyCountryMissing"/>
+                <fail-property resource="CommonUiLabels" property="CommonCountryMissing"/>
             </not-empty>
         </process>
     </simple-map-processor>
@@ -133,7 +133,7 @@ under the License.
         <process field="billToCountryGeoId">
             <copy to-field="countryGeoId"/>
             <not-empty>
-                <fail-property resource="PartyUiLabels" property="PartyCountryMissing"/>
+                <fail-property resource="CommonUiLabels" property="CommonCountryMissing"/>
             </not-empty>
         </process>
     </simple-map-processor>
@@ -141,7 +141,7 @@ under the License.
     <simple-map-processor name="shipToPhone">
         <process field="shipToCountryCode">
             <copy to-field="countryCode"/>
-            <not-empty><fail-property resource="PartyUiLabels" property="PartyCountryCodeMissing"/></not-empty>
+            <not-empty><fail-property resource="CommonUiLabels" property="CommonCountryCodeMissing"/></not-empty>
         </process>
         <process field="shipToAreaCode">
             <copy to-field="areaCode"/>
@@ -157,7 +157,7 @@ under the License.
     <simple-map-processor name="billToPhone">
         <process field="billToCountryCode">
             <copy to-field="countryCode"/>
-            <not-empty><fail-property resource="PartyUiLabels" property="PartyCountryCodeMissing"/></not-empty>
+            <not-empty><fail-property resource="CommonUiLabels" property="CommonCountryCodeMissing"/></not-empty>
         </process>
         <process field="billToAreaCode">
             <copy to-field="areaCode"/>

Modified: ofbiz/branches/release15.12/applications/order/script/org/ofbiz/order/customer/CustomerEvents.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release15.12/applications/order/script/org/ofbiz/order/customer/CustomerEvents.xml?rev=1770442&r1=1770441&r2=1770442&view=diff
==============================================================================
--- ofbiz/branches/release15.12/applications/order/script/org/ofbiz/order/customer/CustomerEvents.xml (original)
+++ ofbiz/branches/release15.12/applications/order/script/org/ofbiz/order/customer/CustomerEvents.xml Fri Nov 18 22:07:48 2016
@@ -86,7 +86,7 @@ under the License.
                     </process>
                     <process field="countryGeoId">
                         <copy/>
-                        <not-empty><fail-property resource="PartyUiLabels" property="PartyCountryMissing"/></not-empty>
+                        <not-empty><fail-property resource="CommonUiLabels" property="CommonCountryMissing"/></not-empty>
                     </process>
                     <process field="allowSolicitation"><copy/></process>
                 </simple-map-processor>

Modified: ofbiz/branches/release15.12/applications/party/script/org/ofbiz/party/customer/CustomerEvents.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release15.12/applications/party/script/org/ofbiz/party/customer/CustomerEvents.xml?rev=1770442&r1=1770441&r2=1770442&view=diff
==============================================================================
--- ofbiz/branches/release15.12/applications/party/script/org/ofbiz/party/customer/CustomerEvents.xml (original)
+++ ofbiz/branches/release15.12/applications/party/script/org/ofbiz/party/customer/CustomerEvents.xml Fri Nov 18 22:07:48 2016
@@ -118,7 +118,7 @@ under the License.
                         <process field="CUSTOMER_CITY"><copy to-field="city"/><not-empty><fail-property resource="PartyUiLabels" property="PartyCityMissing"/></not-empty></process>
                         <process field="CUSTOMER_STATE"><copy to-field="stateProvinceGeoId"/></process>
                         <process field="CUSTOMER_POSTAL_CODE"><copy to-field="postalCode"/><not-empty><fail-property resource="PartyUiLabels" property="PartyPostalCodeMissing"/></not-empty></process>
-                        <process field="CUSTOMER_COUNTRY"><copy to-field="countryGeoId"/><not-empty><fail-property resource="PartyUiLabels" property="PartyCountryMissing"/></not-empty></process>
+                        <process field="CUSTOMER_COUNTRY"><copy to-field="countryGeoId"/><not-empty><fail-property resource="CommonUiLabels" property="CommonCountryMissing"/></not-empty></process>
                         <process field="CUSTOMER_ADDRESS_ALLOW_SOL"><copy to-field="allowSolicitation"/></process>
                     </simple-map-processor>
                 </call-map-processor>

Modified: ofbiz/branches/release15.12/applications/party/script/org/ofbiz/party/user/UserEvents.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release15.12/applications/party/script/org/ofbiz/party/user/UserEvents.xml?rev=1770442&r1=1770441&r2=1770442&view=diff
==============================================================================
--- ofbiz/branches/release15.12/applications/party/script/org/ofbiz/party/user/UserEvents.xml (original)
+++ ofbiz/branches/release15.12/applications/party/script/org/ofbiz/party/user/UserEvents.xml Fri Nov 18 22:07:48 2016
@@ -157,7 +157,7 @@ under the License.
                         <process field="USER_CITY"><copy to-field="city"/><not-empty><fail-property resource="PartyUiLabels" property="PartyCityMissing"/></not-empty></process>
                         <process field="USER_STATE"><copy to-field="stateProvinceGeoId"/></process>
                         <process field="USER_POSTAL_CODE"><copy to-field="postalCode"/><not-empty><fail-property resource="PartyUiLabels" property="PartyPostalCodeMissing"/></not-empty></process>
-                        <process field="USER_COUNTRY"><copy to-field="countryGeoId"/><not-empty><fail-property resource="PartyUiLabels" property="PartyCountryMissing"/></not-empty></process>
+                        <process field="USER_COUNTRY"><copy to-field="countryGeoId"/><not-empty><fail-property resource="CommonUiLabels" property="CommonCountryMissing"/></not-empty></process>
                         <process field="USER_ADDRESS_ALLOW_SOL"><copy to-field="allowSolicitation"/></process>
                     </simple-map-processor>
                 </call-map-processor>

Modified: ofbiz/branches/release15.12/specialpurpose/ecommerce/script/org/ofbiz/ecommerce/customer/CustomerEvents.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release15.12/specialpurpose/ecommerce/script/org/ofbiz/ecommerce/customer/CustomerEvents.xml?rev=1770442&r1=1770441&r2=1770442&view=diff
==============================================================================
--- ofbiz/branches/release15.12/specialpurpose/ecommerce/script/org/ofbiz/ecommerce/customer/CustomerEvents.xml (original)
+++ ofbiz/branches/release15.12/specialpurpose/ecommerce/script/org/ofbiz/ecommerce/customer/CustomerEvents.xml Fri Nov 18 22:07:48 2016
@@ -149,7 +149,7 @@ under the License.
                         </process>
                         <process field="CUSTOMER_COUNTRY">
                             <copy to-field="countryGeoId"/>
-                            <not-empty><fail-property resource="PartyUiLabels" property="PartyCountryMissing"/></not-empty>
+                            <not-empty><fail-property resource="CommonUiLabels" property="CommonCountryMissing"/></not-empty>
                         </process>
                         <process field="CUSTOMER_ADDRESS_ALLOW_SOL"><copy to-field="allowSolicitation"/></process>
                     </simple-map-processor>
@@ -757,7 +757,7 @@ under the License.
                 </process>
                 <process field="countryGeoId">
                     <copy/>
-                    <not-empty><fail-property resource="PartyUiLabels" property="PartyCountryMissing"/></not-empty>
+                    <not-empty><fail-property resource="CommonUiLabels" property="CommonCountryMissing"/></not-empty>
                 </process>
                 <process field="allowSolicitation"><copy/></process>
                 <process field="yearsAtAddress"><convert type="Long" to-field="yearsWithContactMech"><fail-property resource="EcommerceUiLabels" property="EcommerceYearsAtAddressNotValid"/></convert></process>

Modified: ofbiz/branches/release15.12/specialpurpose/ecommerce/script/org/ofbiz/ecommerce/customer/QuickAnonCustomerEvents.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release15.12/specialpurpose/ecommerce/script/org/ofbiz/ecommerce/customer/QuickAnonCustomerEvents.xml?rev=1770442&r1=1770441&r2=1770442&view=diff
==============================================================================
--- ofbiz/branches/release15.12/specialpurpose/ecommerce/script/org/ofbiz/ecommerce/customer/QuickAnonCustomerEvents.xml (original)
+++ ofbiz/branches/release15.12/specialpurpose/ecommerce/script/org/ofbiz/ecommerce/customer/QuickAnonCustomerEvents.xml Fri Nov 18 22:07:48 2016
@@ -236,7 +236,7 @@ under the License.
                     <process field="shipToCity"><copy to-field="city"/><not-empty><fail-property resource="PartyUiLabels" property="PartyCityMissing"/></not-empty></process>
                     <process field="shipToStateProvinceGeoId"><copy to-field="stateProvinceGeoId"/></process>
                     <process field="shipToPostalCode"><copy to-field="postalCode"/><not-empty><fail-property resource="PartyUiLabels"  property="PartyPostalCodeMissing"/></not-empty></process>
-                    <process field="shipToCountryGeoId"><copy to-field="countryGeoId"/><not-empty><fail-property resource="PartyUiLabels" property="PartyCountryMissing"/></not-empty></process>
+                    <process field="shipToCountryGeoId"><copy to-field="countryGeoId"/><not-empty><fail-property resource="CommonUiLabels" property="CommonCountryMissing"/></not-empty></process>
                     <process field="shipToPostalAddressAllowSol"><copy to-field="allowSolicitation"/></process>
                 </simple-map-processor>
             </call-map-processor>
@@ -270,7 +270,7 @@ under the License.
                         <process field="billToCity"><copy to-field="city"/><not-empty><fail-property resource="PartyUiLabels" property="PartyCityMissing"/></not-empty></process>
                         <process field="billToStateProvinceGeoId"><copy to-field="stateProvinceGeoId"/></process>
                         <process field="billToPostalCode"><copy to-field="postalCode"/><not-empty><fail-property resource="PartyUiLabels"  property="PartyPostalCodeMissing"/></not-empty></process>
-                        <process field="billToCountryGeoId"><copy to-field="countryGeoId"/><not-empty><fail-property resource="PartyUiLabels" property="PartyCountryMissing"/></not-empty></process>
+                        <process field="billToCountryGeoId"><copy to-field="countryGeoId"/><not-empty><fail-property resource="CommonUiLabels" property="CommonCountryMissing"/></not-empty></process>
                         <process field="billToPostalAddressAllowSol"><copy to-field="allowSolicitation"/></process>
                     </simple-map-processor>
                 </call-map-processor>