Author: mor
Date: Thu Jan 20 10:56:56 2011
New Revision: 1061210
URL: http://svn.apache.org/viewvc?rev=1061210&view=rev
Log:
Merged from trunk r1056669.
Log: Bug fix - Added group-by clause on OrderPaymentPreference.statusId field
on OrderPurchasePaymentSummary view so that the max amount is summed up
according to the status.
Modified:
ofbiz/branches/release10.04/applications/order/entitydef/entitymodel_view.xml
Modified:
ofbiz/branches/release10.04/applications/order/entitydef/entitymodel_view.xml
URL:
http://svn.apache.org/viewvc/ofbiz/branches/release10.04/applications/order/entitydef/entitymodel_view.xml?rev=1061210&r1=1061209&r2=1061210&view=diff
==============================================================================
---
ofbiz/branches/release10.04/applications/order/entitydef/entitymodel_view.xml
(original)
+++
ofbiz/branches/release10.04/applications/order/entitydef/entitymodel_view.xml
Thu Jan 20 10:56:56 2011
@@ -918,7 +918,7 @@ under the License.
<alias entity-alias="OH" name="orderTypeId"/>
<alias entity-alias="OH" name="orderDate"/>
<alias entity-alias="OH" name="billingAccountId"/>
- <alias entity-alias="OPP" name="preferenceStatusId" field="statusId"/>
+ <alias entity-alias="OPP" name="preferenceStatusId" field="statusId"
group-by="true"/>
<view-link entity-alias="OH" rel-entity-alias="OPP">
<key-map field-name="orderId"/>
</view-link>