You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by di...@apache.org on 2015/06/20 18:30:45 UTC
svn commit: r1686652 - in /ofbiz/branches/release14.12: ./
applications/order/entitydef/entitymodel_view.xml
Author: diveshdutta
Date: Sat Jun 20 16:30:45 2015
New Revision: 1686652
URL: http://svn.apache.org/r1686652
Log:
Applied fix from trunk for revision: 1686651
===
[OFBIZ-4559] Fixed issue: InventoryWorker.getOutstandingProductQuantities returns inaccurate results when there are multiple ItemIssuances for an order, created new view entity called ItemIssuanceQuantitySum. This view entity will have sum of issued item grouped by orderItem of Order. Then this view entity is used in OrderItemQuantityReportGroupByProduct view entity instead of ItemIssuance entity. By doing this, we get accurate results.
Modified:
ofbiz/branches/release14.12/ (props changed)
ofbiz/branches/release14.12/applications/order/entitydef/entitymodel_view.xml
Propchange: ofbiz/branches/release14.12/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Jun 20 16:30:45 2015
@@ -8,4 +8,4 @@
/ofbiz/branches/json-integration-refactoring:1634077-1635900
/ofbiz/branches/multitenant20100310:921280-927264
/ofbiz/branches/release13.07:1547657
-/ofbiz/trunk:1649072,1649083-1649084,1649086,1649090,1649096,1649230,1649238-1649239,1649248,1649272,1649275,1649280-1649281,1649283,1649285-1649286,1649291,1649329,1649331,1649384,1649393,1649666,1649742,1650240,1650348,1650357,1650583,1650642,1650678,1650821,1650882,1650887,1650938,1651593,1652312,1652361,1652638,1652641,1652672,1652688,1652706,1652725,1652731,1652739,1652852,1653248,1653296,1653456,1653597,1653614,1654175,1654273,1654509,1654670,1654672-1654673,1654683-1654684,1654824,1655046,1655668,1655979,1656014,1656185,1656198,1656445,1656983,1657323,1657506-1657507,1657514,1657714,1657790,1657848,1658364,1658662,1658882,1659224,1659965,1660031,1660053,1660389,1660444,1660579,1661303,1661328,1661760,1661778,1661853,1661862,1661873,1661940,1661951,1661977,1662119-1662120,1662361,1662500,1662812,1662919,1663202,1663912,1663979,1664602,1664604,1664696,1665154,1665162,1665535,1666404,1666511,1666633,1666836,1666939,1666949,1666958,1667055,1667253,1667483,1667492,1667774,1668207,
1668214,1668236,1668246,1668258,1668263,1668265,1668270,1668277,1668314,1668657,1669317,1669588,1672427,1672430,1672846,1672853,1672856,1672862,1672873,1673764,1674447,1674464,1674491,1674496,1674908,1676674,1677123,1677597,1677769-1677770,1678294,1678882,1678911,1679689,1679697,1679709,1679720,1679728,1679732,1679957,1680155,1680288,1680304,1680671,1680675,1680733,1680840,1680881,1682272,1682295,1682415,1682633,1683998,1684094,1686360,1686536,1686545,1686566,1686569,1686574,1686583,1686635
+/ofbiz/trunk:1649072,1649083-1649084,1649086,1649090,1649096,1649230,1649238-1649239,1649248,1649272,1649275,1649280-1649281,1649283,1649285-1649286,1649291,1649329,1649331,1649384,1649393,1649666,1649742,1650240,1650348,1650357,1650583,1650642,1650678,1650821,1650882,1650887,1650938,1651593,1652312,1652361,1652638,1652641,1652672,1652688,1652706,1652725,1652731,1652739,1652852,1653248,1653296,1653456,1653597,1653614,1654175,1654273,1654509,1654670,1654672-1654673,1654683-1654684,1654824,1655046,1655668,1655979,1656014,1656185,1656198,1656445,1656983,1657323,1657506-1657507,1657514,1657714,1657790,1657848,1658364,1658662,1658882,1659224,1659965,1660031,1660053,1660389,1660444,1660579,1661303,1661328,1661760,1661778,1661853,1661862,1661873,1661940,1661951,1661977,1662119-1662120,1662361,1662500,1662812,1662919,1663202,1663912,1663979,1664602,1664604,1664696,1665154,1665162,1665535,1666404,1666511,1666633,1666836,1666939,1666949,1666958,1667055,1667253,1667483,1667492,1667774,1668207,
1668214,1668236,1668246,1668258,1668263,1668265,1668270,1668277,1668314,1668657,1669317,1669588,1672427,1672430,1672846,1672853,1672856,1672862,1672873,1673764,1674447,1674464,1674491,1674496,1674908,1676674,1677123,1677597,1677769-1677770,1678294,1678882,1678911,1679689,1679697,1679709,1679720,1679728,1679732,1679957,1680155,1680288,1680304,1680671,1680675,1680733,1680840,1680881,1682272,1682295,1682415,1682633,1683998,1684094,1686360,1686536,1686545,1686566,1686569,1686574,1686583,1686635,1686651
Modified: ofbiz/branches/release14.12/applications/order/entitydef/entitymodel_view.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release14.12/applications/order/entitydef/entitymodel_view.xml?rev=1686652&r1=1686651&r2=1686652&view=diff
==============================================================================
--- ofbiz/branches/release14.12/applications/order/entitydef/entitymodel_view.xml (original)
+++ ofbiz/branches/release14.12/applications/order/entitydef/entitymodel_view.xml Sat Jun 20 16:30:45 2015
@@ -836,13 +836,22 @@ under the License.
<key-map field-name="inventoryItemId"/>
</relation>
</view-entity>
+ <view-entity entity-name="ItemIssuanceQuantitySum"
+ package-name="org.ofbiz.order.order"
+ never-cache="true"
+ title="Sum item issuance quantity to use directly in OrderItemQuantityReportGroupByItem and OrderItemQuantityReportGroupByProduct entities">
+ <member-entity entity-alias="II" entity-name="ItemIssuance"/>
+ <alias entity-alias="II" name="issuedQuantitySum" field="quantity" function="sum"/>
+ <alias entity-alias="II" name="orderId" field="orderId" group-by="true"/>
+ <alias entity-alias="II" name="orderItemSeqId" field="orderItemSeqId" group-by="true"/>
+ </view-entity>
<view-entity entity-name="OrderItemQuantityReportGroupByItem"
package-name="org.ofbiz.order.order"
never-cache="true"
title="Reports quantity ordered, issued and open by item for OrderItems.">
<member-entity entity-alias="OH" entity-name="OrderHeader"/>
<member-entity entity-alias="OI" entity-name="OrderItem"/>
- <member-entity entity-alias="II" entity-name="ItemIssuance"/>
+ <member-entity entity-alias="II" entity-name="ItemIssuanceQuantitySum"/>
<alias entity-alias="OH" name="productStoreId" group-by="false"/>
<alias entity-alias="OH" name="orderId" group-by="true"/>
<alias entity-alias="OH" name="orderTypeId" group-by="false"/>
@@ -860,12 +869,12 @@ under the License.
<complex-alias-field entity-alias="OI" field="cancelQuantity" default-value="0"/>
</complex-alias>
</alias>
- <alias entity-alias="II" name="quantityIssued" field="quantity" function="sum"/>
- <alias entity-alias="OI" name="quantityOpen" function="sum">
+ <alias entity-alias="II" name="quantityIssued" field="issuedQuantitySum" function="min" />
+ <alias entity-alias="OI" name="quantityOpen" function="sum" >
<complex-alias operator="-">
<complex-alias-field entity-alias="OI" field="quantity" default-value="0"/>
<complex-alias-field entity-alias="OI" field="cancelQuantity" default-value="0"/>
- <complex-alias-field entity-alias="II" field="quantity" default-value="0"/>
+ <complex-alias-field entity-alias="II" field="issuedQuantitySum" default-value="0"/>
</complex-alias>
</alias>
<view-link entity-alias="OI" rel-entity-alias="OH">
@@ -886,7 +895,7 @@ under the License.
title="Reports quantity ordered, issued and open by product for OrderItems.">
<member-entity entity-alias="OH" entity-name="OrderHeader"/>
<member-entity entity-alias="OI" entity-name="OrderItem"/>
- <member-entity entity-alias="II" entity-name="ItemIssuance"/>
+ <member-entity entity-alias="II" entity-name="ItemIssuanceQuantitySum"/>
<alias entity-alias="OH" name="orderTypeId" group-by="true"/>
<alias entity-alias="OH" name="orderStatusId" field="statusId" group-by="false"/>
<alias entity-alias="OH" name="orderDate" group-by="false"/>
@@ -899,12 +908,12 @@ under the License.
<complex-alias-field entity-alias="OI" field="cancelQuantity" default-value="0"/>
</complex-alias>
</alias>
- <alias entity-alias="II" name="quantityIssued" field="quantity" function="sum"/>
+ <alias entity-alias="II" name="quantityIssued" field="issuedQuantitySum" function="min"/>
<alias entity-alias="OI" name="quantityOpen" function="sum">
<complex-alias operator="-">
<complex-alias-field entity-alias="OI" field="quantity" default-value="0"/>
<complex-alias-field entity-alias="OI" field="cancelQuantity" default-value="0"/>
- <complex-alias-field entity-alias="II" field="quantity" default-value="0"/>
+ <complex-alias-field entity-alias="II" field="issuedQuantitySum" default-value="0"/>
</complex-alias>
</alias>
<view-link entity-alias="OI" rel-entity-alias="OH">