Re: svn commit: r603423 - in /ofbiz/trunk/applications/product/src/org/ofbiz: product/price/PriceServices.java shipment/thirdparty/usps/UspsServices.java

[Jacopo Cappellato]

Bilgin,

this is a good catch, thanks.

Jacopo

[hidden email] wrote:

> Author: bibryam
> Date: Tue Dec 11 16:21:27 2007
> New Revision: 603423
>
> URL: http://svn.apache.org/viewvc?rev=603423&view=rev
> Log:
> Fixed a bug in calculateProductPrice service when called for products with agreement.
> Removed non UTF character causing warnings.
>
> Modified:
>     ofbiz/trunk/applications/product/src/org/ofbiz/product/price/PriceServices.java
>     ofbiz/trunk/applications/product/src/org/ofbiz/shipment/thirdparty/usps/UspsServices.java
>
> Modified: ofbiz/trunk/applications/product/src/org/ofbiz/product/price/PriceServices.java
> URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/src/org/ofbiz/product/price/PriceServices.java?rev=603423&r1=603422&r2=603423&view=diff
> ==============================================================================
> --- ofbiz/trunk/applications/product/src/org/ofbiz/product/price/PriceServices.java (original)
> +++ ofbiz/trunk/applications/product/src/org/ofbiz/product/price/PriceServices.java Tue Dec 11 16:21:27 2007
> @@ -485,7 +485,7 @@
>          List orderItemPriceInfos = FastList.newInstance();
>          if (defaultPriceValue != null) {
>              // If a price calc formula (service) is specified, then use it to get the unit price
> -            if (UtilValidate.isNotEmpty(defaultPriceValue.getString("customPriceCalcService"))) {
> +            if ("ProductPrice".equals(defaultPriceValue.getEntityName()) && UtilValidate.isNotEmpty(defaultPriceValue.getString("customPriceCalcService"))) {
>                  GenericValue customMethod = null;
>                  try {
>                      customMethod = defaultPriceValue.getRelatedOne("CustomMethod");