You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by ch...@apache.org on 2013/06/28 17:35:59 UTC
svn commit: r1497817 - in /ofbiz/trunk/applications/product:
servicedef/services_facility.xml
src/org/ofbiz/product/inventory/InventoryServices.java
webapp/facility/WEB-INF/actions/facility/ViewFacilityInventoryByProduct.groovy
Author: chrisg
Date: Fri Jun 28 15:35:58 2013
New Revision: 1497817
URL: http://svn.apache.org/r1497817
Log:
Fixed problem with default price on inventory report (parameter name typo)
Modified:
ofbiz/trunk/applications/product/servicedef/services_facility.xml
ofbiz/trunk/applications/product/src/org/ofbiz/product/inventory/InventoryServices.java
ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/facility/ViewFacilityInventoryByProduct.groovy
Modified: ofbiz/trunk/applications/product/servicedef/services_facility.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/servicedef/services_facility.xml?rev=1497817&r1=1497816&r2=1497817&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/servicedef/services_facility.xml (original)
+++ ofbiz/trunk/applications/product/servicedef/services_facility.xml Fri Jun 28 15:35:58 2013
@@ -264,7 +264,7 @@ under the License.
<attribute name="quantityOnOrder" mode="OUT" type="BigDecimal" optional="true"/>
<attribute name="offsetQOHQtyAvailable" mode="OUT" type="BigDecimal" optional="true"/>
<attribute name="offsetATPQtyAvailable" mode="OUT" type="BigDecimal" optional="true"/>
- <attribute name="defultPrice" mode="OUT" type="BigDecimal" optional="true"/>
+ <attribute name="defaultPrice" mode="OUT" type="BigDecimal" optional="true"/>
<attribute name="listPrice" mode="OUT" type="BigDecimal" optional="true"/>
<attribute name="wholeSalePrice" mode="OUT" type="BigDecimal" optional="true"/>
<attribute name="usageQuantity" mode="OUT" type="BigDecimal" optional="true"/>
Modified: ofbiz/trunk/applications/product/src/org/ofbiz/product/inventory/InventoryServices.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/src/org/ofbiz/product/inventory/InventoryServices.java?rev=1497817&r1=1497816&r2=1497817&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/src/org/ofbiz/product/inventory/InventoryServices.java (original)
+++ ofbiz/trunk/applications/product/src/org/ofbiz/product/inventory/InventoryServices.java Fri Jun 28 15:35:58 2013
@@ -929,13 +929,13 @@ public class InventoryServices {
//change this for product price
for (GenericValue onePrice: productPrices) {
if (onePrice.getString("productPriceTypeId").equals("DEFAULT_PRICE")) { //defaultPrice
- result.put("defultPrice", onePrice.getBigDecimal("price"));
+ result.put("defaultPrice", onePrice.getBigDecimal("price"));
} else if (onePrice.getString("productPriceTypeId").equals("WHOLESALE_PRICE")) {//
result.put("wholeSalePrice", onePrice.getBigDecimal("price"));
} else if (onePrice.getString("productPriceTypeId").equals("LIST_PRICE")) {//listPrice
result.put("listPrice", onePrice.getBigDecimal("price"));
} else {
- result.put("defultPrice", onePrice.getBigDecimal("price"));
+ result.put("defaultPrice", onePrice.getBigDecimal("price"));
result.put("listPrice", onePrice.getBigDecimal("price"));
result.put("wholeSalePrice", onePrice.getBigDecimal("price"));
}
Modified: ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/facility/ViewFacilityInventoryByProduct.groovy
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/facility/ViewFacilityInventoryByProduct.groovy?rev=1497817&r1=1497816&r2=1497817&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/facility/ViewFacilityInventoryByProduct.groovy (original)
+++ ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/facility/ViewFacilityInventoryByProduct.groovy Fri Jun 28 15:35:58 2013
@@ -181,7 +181,7 @@ if (action) {
oneInventory.offsetQOHQtyAvailable = resultMap.offsetQOHQtyAvailable;
oneInventory.offsetATPQtyAvailable = resultMap.offsetATPQtyAvailable;
oneInventory.usageQuantity = resultMap.usageQuantity;
- oneInventory.defultPrice = resultMap.defultPrice;
+ oneInventory.defaultPrice = resultMap.defaultPrice;
oneInventory.listPrice = resultMap.listPrice;
oneInventory.wholeSalePrice = resultMap.wholeSalePrice;
if (offsetQOHQty && offsetATPQty) {
Re: svn commit: r1497817 - in /ofbiz/trunk/applications/product:
servicedef/services_facility.xml
src/org/ofbiz/product/inventory/InventoryServices.java
webapp/facility/WEB-INF/actions/facility/ViewFacilityInventoryByProduct.gro
ovy
Posted by Jacques Le Roux <ja...@les7arts.com>.
OK, thanks Christian
Jacques
From: "Christian Geisert" <ch...@isu-gmbh.de>
> Hmmh, I'm not sure about this one - I think changing an api is bad
> (even if it's probably not widely used), but within a minor release it's
> even worser. I'll change the (wrong) field name on the form for the
> release branches.
>
> Christian
>
> Am 28.06.2013 22:33, schrieb Jacques Le Roux:
>> Should we not backport those fixes?
>>
>> Jacques
>>
>> From: <ch...@apache.org>
>>> Author: chrisg
>>> Date: Fri Jun 28 15:35:58 2013
>>> New Revision: 1497817
>>>
>>> URL: http://svn.apache.org/r1497817
>>> Log:
>>> Fixed problem with default price on inventory report (parameter name typo)
>>>
>>> Modified:
>>> ofbiz/trunk/applications/product/servicedef/services_facility.xml
>>> ofbiz/trunk/applications/product/src/org/ofbiz/product/inventory/InventoryServices.java
>>> ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/facility/ViewFacilityInventoryByProduct.groovy
Re: svn commit: r1497817 - in /ofbiz/trunk/applications/product:
servicedef/services_facility.xml src/org/ofbiz/product/inventory/InventoryServices.java
webapp/facility/WEB-INF/actions/facility/ViewFacilityInventoryByProduct.gro
ovy
Posted by Christian Geisert <ch...@isu-gmbh.de>.
Hmmh, I'm not sure about this one - I think changing an api is bad
(even if it's probably not widely used), but within a minor release it's
even worser. I'll change the (wrong) field name on the form for the
release branches.
Christian
Am 28.06.2013 22:33, schrieb Jacques Le Roux:
> Should we not backport those fixes?
>
> Jacques
>
> From: <ch...@apache.org>
>> Author: chrisg
>> Date: Fri Jun 28 15:35:58 2013
>> New Revision: 1497817
>>
>> URL: http://svn.apache.org/r1497817
>> Log:
>> Fixed problem with default price on inventory report (parameter name typo)
>>
>> Modified:
>> ofbiz/trunk/applications/product/servicedef/services_facility.xml
>> ofbiz/trunk/applications/product/src/org/ofbiz/product/inventory/InventoryServices.java
>> ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/facility/ViewFacilityInventoryByProduct.groovy
Re: svn commit: r1497817 - in /ofbiz/trunk/applications/product:
servicedef/services_facility.xml
src/org/ofbiz/product/inventory/InventoryServices.java
webapp/facility/WEB-INF/actions/facility/ViewFacilityInventoryByProduct.gro
ovy
Posted by Jacques Le Roux <ja...@les7arts.com>.
Should we not backport those fixes?
Jacques
From: <ch...@apache.org>
> Author: chrisg
> Date: Fri Jun 28 15:35:58 2013
> New Revision: 1497817
>
> URL: http://svn.apache.org/r1497817
> Log:
> Fixed problem with default price on inventory report (parameter name typo)
>
> Modified:
> ofbiz/trunk/applications/product/servicedef/services_facility.xml
> ofbiz/trunk/applications/product/src/org/ofbiz/product/inventory/InventoryServices.java
> ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/facility/ViewFacilityInventoryByProduct.groovy
>
> Modified: ofbiz/trunk/applications/product/servicedef/services_facility.xml
> URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/servicedef/services_facility.xml?rev=1497817&r1=1497816&r2=1497817&view=diff
> ==============================================================================
> --- ofbiz/trunk/applications/product/servicedef/services_facility.xml (original)
> +++ ofbiz/trunk/applications/product/servicedef/services_facility.xml Fri Jun 28 15:35:58 2013
> @@ -264,7 +264,7 @@ under the License.
> <attribute name="quantityOnOrder" mode="OUT" type="BigDecimal" optional="true"/>
> <attribute name="offsetQOHQtyAvailable" mode="OUT" type="BigDecimal" optional="true"/>
> <attribute name="offsetATPQtyAvailable" mode="OUT" type="BigDecimal" optional="true"/>
> - <attribute name="defultPrice" mode="OUT" type="BigDecimal" optional="true"/>
> + <attribute name="defaultPrice" mode="OUT" type="BigDecimal" optional="true"/>
> <attribute name="listPrice" mode="OUT" type="BigDecimal" optional="true"/>
> <attribute name="wholeSalePrice" mode="OUT" type="BigDecimal" optional="true"/>
> <attribute name="usageQuantity" mode="OUT" type="BigDecimal" optional="true"/>
>
> Modified: ofbiz/trunk/applications/product/src/org/ofbiz/product/inventory/InventoryServices.java
> URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/src/org/ofbiz/product/inventory/InventoryServices.java?rev=1497817&r1=1497816&r2=1497817&view=diff
> ==============================================================================
> --- ofbiz/trunk/applications/product/src/org/ofbiz/product/inventory/InventoryServices.java (original)
> +++ ofbiz/trunk/applications/product/src/org/ofbiz/product/inventory/InventoryServices.java Fri Jun 28 15:35:58 2013
> @@ -929,13 +929,13 @@ public class InventoryServices {
> //change this for product price
> for (GenericValue onePrice: productPrices) {
> if (onePrice.getString("productPriceTypeId").equals("DEFAULT_PRICE")) { //defaultPrice
> - result.put("defultPrice", onePrice.getBigDecimal("price"));
> + result.put("defaultPrice", onePrice.getBigDecimal("price"));
> } else if (onePrice.getString("productPriceTypeId").equals("WHOLESALE_PRICE")) {//
> result.put("wholeSalePrice", onePrice.getBigDecimal("price"));
> } else if (onePrice.getString("productPriceTypeId").equals("LIST_PRICE")) {//listPrice
> result.put("listPrice", onePrice.getBigDecimal("price"));
> } else {
> - result.put("defultPrice", onePrice.getBigDecimal("price"));
> + result.put("defaultPrice", onePrice.getBigDecimal("price"));
> result.put("listPrice", onePrice.getBigDecimal("price"));
> result.put("wholeSalePrice", onePrice.getBigDecimal("price"));
> }
>
> Modified: ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/facility/ViewFacilityInventoryByProduct.groovy
> URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/facility/ViewFacilityInventoryByProduct.groovy?rev=1497817&r1=1497816&r2=1497817&view=diff
> ==============================================================================
> --- ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/facility/ViewFacilityInventoryByProduct.groovy (original)
> +++ ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/facility/ViewFacilityInventoryByProduct.groovy Fri Jun 28 15:35:58 2013
> @@ -181,7 +181,7 @@ if (action) {
> oneInventory.offsetQOHQtyAvailable = resultMap.offsetQOHQtyAvailable;
> oneInventory.offsetATPQtyAvailable = resultMap.offsetATPQtyAvailable;
> oneInventory.usageQuantity = resultMap.usageQuantity;
> - oneInventory.defultPrice = resultMap.defultPrice;
> + oneInventory.defaultPrice = resultMap.defaultPrice;
> oneInventory.listPrice = resultMap.listPrice;
> oneInventory.wholeSalePrice = resultMap.wholeSalePrice;
> if (offsetQOHQty && offsetATPQty) {
>
>