Author: deepak
Date: Fri Jun 10 06:57:52 2016
New Revision: 1747644
URL: http://svn.apache.org/viewvc?rev=1747644&view=rev
Log:
Applied fix from trunk for revision: 1747642
===
(OFBIZ-7273) Applied slightly modified patch from jira ticket
=======================================
Report "Sale Orders By Channel" is not rendering details
=======================================
Thanks Nameet Jain for your contirbution.
Modified:
ofbiz/branches/release15.12/ (props changed)
ofbiz/branches/release15.12/specialpurpose/birt/webapp/ordermgr/WEB-INF/actions/reports/OrderByChannel.groovy
ofbiz/branches/release15.12/specialpurpose/birt/webapp/ordermgr/reports/OrdersByChannel.rptdesign
ofbiz/branches/release15.12/specialpurpose/birt/widget/order/OrderForms.xml
Propchange: ofbiz/branches/release15.12/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jun 10 06:57:52 2016
@@ -9,4 +9,4 @@
/ofbiz/branches/json-integration-refactoring:1634077-1635900
/ofbiz/branches/multitenant20100310:921280-927264
/ofbiz/branches/release13.07:1547657
-/ofbiz/trunk:1722712,1723007,1723248,1724402,1724411,1724566,1724689,1724763,1724916,1724918,1724925,1724930,1724940,1724943,1724946,1724951,1724957,1724975,1724978,1725006,1725217,1725257,1725561,1725574,1726388,1726486,1726493,1726828,1727894,1728398,1728411,1729005,1729078,1729609,1729809,1730035,1730456,1730735-1730736,1730747,1730758,1730882,1730889,1731382,1731396,1732454,1732570,1732721,1733951,1733956,1734246,1734269,1734276,1734912,1734918,1735021,1735244,1735385,1735398,1735569,1735731,1735734,1735750,1735753,1735756,1735759,1735773,1736083,1736087,1736272,1736434,1736628,1736851,1736854,1736890,1737156,1737440,1738235,1738303,1738407,1738902,1739438,1739448,1739571,1740008,1740442,1740629,1741146,1741563,1741684,1741925,1741930,1741960,1742018,1742097,1742103,1742712,1742737,1742741,1743025,1743027,1743230,1743411-1743412,1743656,1743937,1744117,1744198,1744396,1744662,1744768,1744773,1744873,1744911,1745111,1745264,1745428,1745438,1745573,1745577,1745592,1745751,1746228,
1746422,1746459,1746524,1746527,1746536,1746601,1746676,1746714,1746755,1746805,1746832,1746890,1747223,1747349,1747498,1747639
+/ofbiz/trunk:1722712,1723007,1723248,1724402,1724411,1724566,1724689,1724763,1724916,1724918,1724925,1724930,1724940,1724943,1724946,1724951,1724957,1724975,1724978,1725006,1725217,1725257,1725561,1725574,1726388,1726486,1726493,1726828,1727894,1728398,1728411,1729005,1729078,1729609,1729809,1730035,1730456,1730735-1730736,1730747,1730758,1730882,1730889,1731382,1731396,1732454,1732570,1732721,1733951,1733956,1734246,1734269,1734276,1734912,1734918,1735021,1735244,1735385,1735398,1735569,1735731,1735734,1735750,1735753,1735756,1735759,1735773,1736083,1736087,1736272,1736434,1736628,1736851,1736854,1736890,1737156,1737440,1738235,1738303,1738407,1738902,1739438,1739448,1739571,1740008,1740442,1740629,1741146,1741563,1741684,1741925,1741930,1741960,1742018,1742097,1742103,1742712,1742737,1742741,1743025,1743027,1743230,1743411-1743412,1743656,1743937,1744117,1744198,1744396,1744662,1744768,1744773,1744873,1744911,1745111,1745264,1745428,1745438,1745573,1745577,1745592,1745751,1746228,
1746422,1746459,1746524,1746527,1746536,1746601,1746676,1746714,1746755,1746805,1746832,1746890,1747223,1747349,1747498,1747639,1747642
Modified:
ofbiz/branches/release15.12/specialpurpose/birt/webapp/ordermgr/WEB-INF/actions/reports/OrderByChannel.groovy
URL:
http://svn.apache.org/viewvc/ofbiz/branches/release15.12/specialpurpose/birt/webapp/ordermgr/WEB-INF/actions/reports/OrderByChannel.groovy?rev=1747644&r1=1747643&r2=1747644&view=diff
==============================================================================
---
ofbiz/branches/release15.12/specialpurpose/birt/webapp/ordermgr/WEB-INF/actions/reports/OrderByChannel.groovy
(original)
+++
ofbiz/branches/release15.12/specialpurpose/birt/webapp/ordermgr/WEB-INF/actions/reports/OrderByChannel.groovy
Fri Jun 10 06:57:52 2016
@@ -20,12 +20,11 @@
import org.ofbiz.base.util.*;
birtParameters = [:];
-if(request.getParameter("saleChannel")){
- birtParameters.saleChannel = request.getParameter("saleChannel");
+if(request.getParameter("SalesChannel")){
+ birtParameters.saleChannel = request.getParameter("SalesChannel");
}else{
birtParameters.saleChannel = "null";
}
-
request.setAttribute("birtParameters", birtParameters);
return "success";
Modified:
ofbiz/branches/release15.12/specialpurpose/birt/webapp/ordermgr/reports/OrdersByChannel.rptdesign
URL:
http://svn.apache.org/viewvc/ofbiz/branches/release15.12/specialpurpose/birt/webapp/ordermgr/reports/OrdersByChannel.rptdesign?rev=1747644&r1=1747643&r2=1747644&view=diff
==============================================================================
---
ofbiz/branches/release15.12/specialpurpose/birt/webapp/ordermgr/reports/OrdersByChannel.rptdesign
(original)
+++
ofbiz/branches/release15.12/specialpurpose/birt/webapp/ordermgr/reports/OrdersByChannel.rptdesign
Fri Jun 10 06:57:52 2016
@@ -255,7 +255,7 @@ module = "OrdersByChannel.rptdesign";]]>
<method name="open"><![CDATA[salesOrderItemFacts = null;
try {
if(params["saleChannel"] != "null"){
- salesOrderItemFacts = delegator.findByAnd("SalesOrderItemFact",
UtilMisc.toMap("saleChannel", params["saleChannel"]), null, false);
+ salesOrderItemFacts = delegator.findByAnd("SalesOrderItemFact",
UtilMisc.toMap("salesChannelEnumId", params["saleChannel"]), null, false);
}else{
salesOrderItemFacts = delegator.findList("SalesOrderItemFact", null,
null, null, null, false);
}
@@ -267,17 +267,13 @@ countOfRow = 0;
if (salesOrderItemFacts) {
totalRow = salesOrderItemFacts.size();
}]]></method>
- <method name="fetch"><![CDATA[if (countOfRow == totalRow - 1)
return false;
-
+ <method name="fetch"><![CDATA[if (countOfRow > (totalRow - 1))
return false;
salesOrderItemFact = salesOrderItemFacts.get(countOfRow);
-
row["orderId"] = salesOrderItemFact.getString("orderId");
row["orderItemSeqId"] = salesOrderItemFact.getString("orderItemSeqId");
-row["orderStatus"] = salesOrderItemFact.getString("orderStatus");
row["quantity"] = salesOrderItemFact.getString("quantity");
-row["saleChannel"] = salesOrderItemFact.getString("saleChannel");
+row["saleChannel"] = salesOrderItemFact.getString("brand");
row["extNetAmount"] = salesOrderItemFact.getString("extNetAmount");
-
countOfRow ++;
return true;]]></method>
</script-data-set>
Modified:
ofbiz/branches/release15.12/specialpurpose/birt/widget/order/OrderForms.xml
URL:
http://svn.apache.org/viewvc/ofbiz/branches/release15.12/specialpurpose/birt/widget/order/OrderForms.xml?rev=1747644&r1=1747643&r2=1747644&view=diff
==============================================================================
--- ofbiz/branches/release15.12/specialpurpose/birt/widget/order/OrderForms.xml
(original)
+++ ofbiz/branches/release15.12/specialpurpose/birt/widget/order/OrderForms.xml
Fri Jun 10 06:57:52 2016
@@ -78,7 +78,7 @@ under the License.
<field name="SalesChannel" title="${uiLabelMap.OrderSalesChannel}">
<drop-down allow-empty="false">
<option key="" description="- ${uiLabelMap.CommonSelectAny}
-"/>
- <entity-options entity-name="Enumeration"
key-field-name="description">
+ <entity-options entity-name="Enumeration"
key-field-name="enumId" description="${description}">
<entity-constraint name="enumTypeId" operator="equals"
value="ORDER_SALES_CHANNEL"/>
</entity-options>
</drop-down>
