Author: jleroux
Date: Sat Sep 17 12:58:02 2016
New Revision: 1761213

URL: http://svn.apache.org/viewvc?rev=1761213&view=rev
Log:
Fixes a bug introduced while backporting 1760406
------------------------------------------------------------------------
r1760406 | jleroux | 2016-09-12 18:47:53 +0200 (lun. 12 sept. 2016) | 10 lignes

Fixes: Display of State/Province for non US entities in the customer's profile 
of ecommerce 
(OFBIZ-8231)

When I access url https://localhost:8443/ecommerce/control/viewprofile for my 
profile, State/Province display in addresses shows the geo-id, which is fine 
for US entities where the GeoID is the state code, but for non-us entities, the 
GeoID is often something like CountryCode-StateCode, which isn't very nice.

Thanks: fumiyoshi.to for report and patch

jleroux: I have slightly changed the patch for 2 reasons:
* check for null exceptions
* use not deprecated version of getRelatedOne()
------------------------------------------------------------------------

Modified:
    
ofbiz/branches/release13.07/applications/accounting/servicedef/services_rate.xml
    
ofbiz/branches/release14.12/applications/accounting/servicedef/services_rate.xml
    
ofbiz/branches/release15.12/applications/accounting/servicedef/services_rate.xml

Modified: 
ofbiz/branches/release13.07/applications/accounting/servicedef/services_rate.xml
URL: 
http://svn.apache.org/viewvc/ofbiz/branches/release13.07/applications/accounting/servicedef/services_rate.xml?rev=1761213&r1=1761212&r2=1761213&view=diff
==============================================================================
--- 
ofbiz/branches/release13.07/applications/accounting/servicedef/services_rate.xml
 (original)
+++ 
ofbiz/branches/release13.07/applications/accounting/servicedef/services_rate.xml
 Sat Sep 17 12:58:02 2016
@@ -50,7 +50,7 @@ under the License.
         <override name="rateTypeId" optional="false"/>
     </service>
     <service name="getRatesAmountsFromWorkEffortId" 
default-entity-name="RateAmount" engine="simple" auth="true"
-             location="component://accounting/minilang/rate/RateServices.xml" 
invoke="getRatesAmountsFromWorkEffortId">
+             
location="component://accounting/script/org/ofbiz/accounting/rate/RateServices.xml"
 invoke="getRatesAmountsFromWorkEffortId">
         <description>Get all Rates Amounts for a given 
workEffortId</description>
         <auto-attributes include="pk" mode="IN" optional="true"/>
         <attribute name="periodTypeId" type="String" mode="INOUT" 
optional="true"/>
@@ -60,7 +60,7 @@ under the License.
         <override name="workEffortId" optional="false"/>
     </service>
     <service name="getRatesAmountsFromPartyId" 
default-entity-name="RateAmount" engine="simple" auth="true"
-             location="component://accounting/minilang/rate/RateServices.xml" 
invoke="getRatesAmountsFromPartyId">
+             
location="component://accounting/script/org/ofbiz/accounting/rate/RateServices.xml"
 invoke="getRatesAmountsFromPartyId">
         <description>Get all Rates Amounts for a given partyId</description>
         <auto-attributes include="pk" mode="IN" optional="true"/>
         <attribute name="periodTypeId" type="String" mode="INOUT" 
optional="true"/>
@@ -70,7 +70,7 @@ under the License.
         <override name="partyId" optional="false"/>
     </service>
     <service name="getRatesAmountsFromEmplPositionTypeId" 
default-entity-name="RateAmount" engine="simple" auth="true"
-             location="component://accounting/minilang/rate/RateServices.xml" 
invoke="getRatesAmountsFromEmplPositionTypeId">
+             
location="component://accounting/script/org/ofbiz/accounting/rate/RateServices.xml"
 invoke="getRatesAmountsFromEmplPositionTypeId">
         <description>Get all Rates Amounts for a given 
emplPositionTypeId</description>
         <auto-attributes include="pk" mode="IN" optional="true"/>
         <attribute name="periodTypeId" type="String" mode="INOUT" 
optional="true"/>
@@ -80,7 +80,7 @@ under the License.
         <override name="emplPositionTypeId" optional="false"/>
     </service>
     <service name="filterRateAmountList" default-entity-name="RateAmount" 
engine="simple" auth="true"
-             location="component://accounting/minilang/rate/RateServices.xml" 
invoke="filterRateAmountList">
+             
location="component://accounting/script/org/ofbiz/accounting/rate/RateServices.xml"
 invoke="filterRateAmountList">
         <description>Get the most specific non-empty Rate Amount list from a 
list of Rate Amount, given the input parameters :
         workEffortId, partyId, emplPositionTypeId and rateTypeId</description>
         <auto-attributes include="pk" mode="IN" optional="true"/>

Modified: 
ofbiz/branches/release14.12/applications/accounting/servicedef/services_rate.xml
URL: 
http://svn.apache.org/viewvc/ofbiz/branches/release14.12/applications/accounting/servicedef/services_rate.xml?rev=1761213&r1=1761212&r2=1761213&view=diff
==============================================================================
--- 
ofbiz/branches/release14.12/applications/accounting/servicedef/services_rate.xml
 (original)
+++ 
ofbiz/branches/release14.12/applications/accounting/servicedef/services_rate.xml
 Sat Sep 17 12:58:02 2016
@@ -50,7 +50,7 @@ under the License.
         <override name="rateTypeId" optional="false"/>
     </service>
     <service name="getRatesAmountsFromWorkEffortId" 
default-entity-name="RateAmount" engine="simple" auth="true"
-             location="component://accounting/minilang/rate/RateServices.xml" 
invoke="getRatesAmountsFromWorkEffortId">
+             
location="component://accounting/script/org/ofbiz/accounting/rate/RateServices.xml"
 invoke="getRatesAmountsFromWorkEffortId">
         <description>Get all Rates Amounts for a given 
workEffortId</description>
         <auto-attributes include="pk" mode="IN" optional="true"/>
         <attribute name="periodTypeId" type="String" mode="INOUT" 
optional="true"/>
@@ -60,7 +60,7 @@ under the License.
         <override name="workEffortId" optional="false"/>
     </service>
     <service name="getRatesAmountsFromPartyId" 
default-entity-name="RateAmount" engine="simple" auth="true"
-             location="component://accounting/minilang/rate/RateServices.xml" 
invoke="getRatesAmountsFromPartyId">
+             
location="component://accounting/script/org/ofbiz/accounting/rate/RateServices.xml"
 invoke="getRatesAmountsFromPartyId">
         <description>Get all Rates Amounts for a given partyId</description>
         <auto-attributes include="pk" mode="IN" optional="true"/>
         <attribute name="periodTypeId" type="String" mode="INOUT" 
optional="true"/>
@@ -70,7 +70,7 @@ under the License.
         <override name="partyId" optional="false"/>
     </service>
     <service name="getRatesAmountsFromEmplPositionTypeId" 
default-entity-name="RateAmount" engine="simple" auth="true"
-             location="component://accounting/minilang/rate/RateServices.xml" 
invoke="getRatesAmountsFromEmplPositionTypeId">
+             
location="component://accounting/script/org/ofbiz/accounting/rate/RateServices.xml"
 invoke="getRatesAmountsFromEmplPositionTypeId">
         <description>Get all Rates Amounts for a given 
emplPositionTypeId</description>
         <auto-attributes include="pk" mode="IN" optional="true"/>
         <attribute name="periodTypeId" type="String" mode="INOUT" 
optional="true"/>
@@ -80,7 +80,7 @@ under the License.
         <override name="emplPositionTypeId" optional="false"/>
     </service>
     <service name="filterRateAmountList" default-entity-name="RateAmount" 
engine="simple" auth="true"
-             location="component://accounting/minilang/rate/RateServices.xml" 
invoke="filterRateAmountList">
+             
location="component://accounting/script/org/ofbiz/accounting/rate/RateServices.xml"
 invoke="filterRateAmountList">
         <description>Get the most specific non-empty Rate Amount list from a 
list of Rate Amount, given the input parameters :
         workEffortId, partyId, emplPositionTypeId and rateTypeId</description>
         <auto-attributes include="pk" mode="IN" optional="true"/>

Modified: 
ofbiz/branches/release15.12/applications/accounting/servicedef/services_rate.xml
URL: 
http://svn.apache.org/viewvc/ofbiz/branches/release15.12/applications/accounting/servicedef/services_rate.xml?rev=1761213&r1=1761212&r2=1761213&view=diff
==============================================================================
--- 
ofbiz/branches/release15.12/applications/accounting/servicedef/services_rate.xml
 (original)
+++ 
ofbiz/branches/release15.12/applications/accounting/servicedef/services_rate.xml
 Sat Sep 17 12:58:02 2016
@@ -50,7 +50,7 @@ under the License.
         <override name="rateTypeId" optional="false"/>
     </service>
     <service name="getRatesAmountsFromWorkEffortId" 
default-entity-name="RateAmount" engine="simple" auth="true"
-             location="component://accounting/minilang/rate/RateServices.xml" 
invoke="getRatesAmountsFromWorkEffortId">
+             
location="component://accounting/script/org/ofbiz/accounting/rate/RateServices.xml"
 invoke="getRatesAmountsFromWorkEffortId">
         <description>Get all Rates Amounts for a given 
workEffortId</description>
         <auto-attributes include="pk" mode="IN" optional="true"/>
         <attribute name="periodTypeId" type="String" mode="INOUT" 
optional="true"/>
@@ -60,7 +60,7 @@ under the License.
         <override name="workEffortId" optional="false"/>
     </service>
     <service name="getRatesAmountsFromPartyId" 
default-entity-name="RateAmount" engine="simple" auth="true"
-             location="component://accounting/minilang/rate/RateServices.xml" 
invoke="getRatesAmountsFromPartyId">
+             
location="component://accounting/script/org/ofbiz/accounting/rate/RateServices.xml"
 invoke="getRatesAmountsFromPartyId">
         <description>Get all Rates Amounts for a given partyId</description>
         <auto-attributes include="pk" mode="IN" optional="true"/>
         <attribute name="periodTypeId" type="String" mode="INOUT" 
optional="true"/>
@@ -70,7 +70,7 @@ under the License.
         <override name="partyId" optional="false"/>
     </service>
     <service name="getRatesAmountsFromEmplPositionTypeId" 
default-entity-name="RateAmount" engine="simple" auth="true"
-             location="component://accounting/minilang/rate/RateServices.xml" 
invoke="getRatesAmountsFromEmplPositionTypeId">
+             
location="component://accounting/script/org/ofbiz/accounting/rate/RateServices.xml"
 invoke="getRatesAmountsFromEmplPositionTypeId">
         <description>Get all Rates Amounts for a given 
emplPositionTypeId</description>
         <auto-attributes include="pk" mode="IN" optional="true"/>
         <attribute name="periodTypeId" type="String" mode="INOUT" 
optional="true"/>
@@ -80,7 +80,7 @@ under the License.
         <override name="emplPositionTypeId" optional="false"/>
     </service>
     <service name="filterRateAmountList" default-entity-name="RateAmount" 
engine="simple" auth="true"
-             location="component://accounting/minilang/rate/RateServices.xml" 
invoke="filterRateAmountList">
+             
location="component://accounting/script/org/ofbiz/accounting/rate/RateServices.xml"
 invoke="filterRateAmountList">
         <description>Get the most specific non-empty Rate Amount list from a 
list of Rate Amount, given the input parameters :
         workEffortId, partyId, emplPositionTypeId and rateTypeId</description>
         <auto-attributes include="pk" mode="IN" optional="true"/>


Reply via email to