Author: doogie
Date: Mon Dec 14 04:22:56 2009
New Revision: 890170
URL: http://svn.apache.org/viewvc?rev=890170&view=rev
Log:
Some formatting fixes.
Modified:
ofbiz/branches/addbirt/applications/accounting/webapp/accounting/WEB-INF/controller.xml
ofbiz/branches/addbirt/applications/accounting/widget/AccountingMenus.xml
ofbiz/branches/addbirt/applications/accounting/widget/CommonScreens.xml
ofbiz/branches/addbirt/applications/accounting/widget/PaymentForms.xml
ofbiz/branches/addbirt/applications/accounting/widget/PaymentScreens.xml
ofbiz/branches/addbirt/applications/order/data/OrderPortletData.xml
ofbiz/branches/addbirt/applications/order/entitydef/entitygroup_olap.xml
ofbiz/branches/addbirt/applications/order/entitydef/entitymodel_olap.xml
ofbiz/branches/addbirt/applications/order/script/org/ofbiz/order/olap/FactServices.xml
ofbiz/branches/addbirt/applications/order/webapp/ordermgr/WEB-INF/actions/reports/OrderByChannel.groovy
ofbiz/branches/addbirt/applications/order/widget/ordermgr/ReportForms.xml
ofbiz/branches/addbirt/applications/order/widget/ordermgr/ReportScreens.xml
ofbiz/branches/addbirt/applications/product/webapp/facility/WEB-INF/actions/inventory/InventoryItemReport.groovy
ofbiz/branches/addbirt/applications/product/webapp/facility/WEB-INF/controller.xml
ofbiz/branches/addbirt/framework/bi/script/org/ofbiz/bi/DimensionServices.xml
Modified:
ofbiz/branches/addbirt/applications/accounting/webapp/accounting/WEB-INF/controller.xml
URL:
http://svn.apache.org/viewvc/ofbiz/branches/addbirt/applications/accounting/webapp/accounting/WEB-INF/controller.xml?rev=890170&r1=890169&r2=890170&view=diff
==============================================================================
---
ofbiz/branches/addbirt/applications/accounting/webapp/accounting/WEB-INF/controller.xml
(original)
+++
ofbiz/branches/addbirt/applications/accounting/webapp/accounting/WEB-INF/controller.xml
Mon Dec 14 04:22:56 2009
@@ -24,7 +24,9 @@
<include location="component://commonext/webapp/WEB-INF/controller.xml"/>
<description>Accounting Manager Module Site Configuration
File</description>
<owner>Copyright 2001-2009 The Apache Software Foundation</owner>
- <handler name="birt" type="view"
class="org.ofbiz.webapp.view.BirtViewHandler"/>
+
+ <handler name="birt" type="view"
class="org.ofbiz.webapp.view.BirtViewHandler"/>
+
<!-- Events to run on every request before security (chains exempt) -->
<!--
<preprocessor>
@@ -2454,7 +2456,7 @@
</request-map>
<!-- Reports -->
<request-map uri="paymentReport">
- <security https="true" auth="true"/>
+ <security https="true" auth="true"/>
<response name="success" type="view" value="paymentReport"/>
</request-map>
<request-map uri="paymentReportHtml">
@@ -2514,7 +2516,6 @@
<view-map name="FindSalesInvoicesByDueDate" type="screen"
page="component://accounting/widget/PaymentScreens.xml#FindSalesInvoicesByDueDate"/>
<view-map name="FindPurchaseInvoicesByDueDate" type="screen"
page="component://accounting/widget/PaymentScreens.xml#FindPurchaseInvoicesByDueDate"/>
<view-map name="paymentReport" type="screen"
page="component://accounting/widget/PaymentScreens.xml#PaymentReport"/>
-
<!-- Payment Group -->
<view-map name="FindPaymentGroup" type="screen"
page="component://accounting/widget/PaymentGroupScreens.xml#FindPaymentGroup"/>
Modified:
ofbiz/branches/addbirt/applications/accounting/widget/AccountingMenus.xml
URL:
http://svn.apache.org/viewvc/ofbiz/branches/addbirt/applications/accounting/widget/AccountingMenus.xml?rev=890170&r1=890169&r2=890170&view=diff
==============================================================================
--- ofbiz/branches/addbirt/applications/accounting/widget/AccountingMenus.xml
(original)
+++ ofbiz/branches/addbirt/applications/accounting/widget/AccountingMenus.xml
Mon Dec 14 04:22:56 2009
@@ -358,7 +358,7 @@
<parameter param-name="paymentId"
from-field="payment.paymentId"/>
</link>
</menu-item>
- <menu-item name="paymentReport" title="Payment Report">
+ <menu-item name="paymentReport" title="Payment Report">
<link target="paymentReport"/>
</menu-item>
<menu-item name="editPaymentApplications"
title="${uiLabelMap.AccountingPaymentTabApplications}">
Modified:
ofbiz/branches/addbirt/applications/accounting/widget/CommonScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/branches/addbirt/applications/accounting/widget/CommonScreens.xml?rev=890170&r1=890169&r2=890170&view=diff
==============================================================================
--- ofbiz/branches/addbirt/applications/accounting/widget/CommonScreens.xml
(original)
+++ ofbiz/branches/addbirt/applications/accounting/widget/CommonScreens.xml Mon
Dec 14 04:22:56 2009
@@ -66,13 +66,13 @@
<include-menu name="PaymentTabBar"
location="component://accounting/widget/AccountingMenus.xml"/>
<include-menu name="PaymentSubTabBar"
location="component://accounting/widget/AccountingMenus.xml"/>
<container style="leftclear">
- <section>
- <condition>
- <not><if-empty
field="paymentId"/></not>
- </condition>
- <widgets>
- <label style="h1"
text="${uiLabelMap[labelTitleProperty]} ${uiLabelMap.CommonId}:[${paymentId}]
${${extraFunctionName}}"/>
- </widgets>
+ <section>
+ <condition>
+ <not><if-empty
field="paymentId"/></not>
+ </condition>
+ <widgets>
+ <label style="h1"
text="${uiLabelMap[labelTitleProperty]} ${uiLabelMap.CommonId}:[${paymentId}]
${${extraFunctionName}}"/>
+ </widgets>
</section>
</container>
<decorator-section-include name="body"/>
Modified: ofbiz/branches/addbirt/applications/accounting/widget/PaymentForms.xml
URL:
http://svn.apache.org/viewvc/ofbiz/branches/addbirt/applications/accounting/widget/PaymentForms.xml?rev=890170&r1=890169&r2=890170&view=diff
==============================================================================
--- ofbiz/branches/addbirt/applications/accounting/widget/PaymentForms.xml
(original)
+++ ofbiz/branches/addbirt/applications/accounting/widget/PaymentForms.xml Mon
Dec 14 04:22:56 2009
@@ -587,17 +587,17 @@
<field name="transactionDate" position="1"><display/></field>
<field name="statusId" position="2"
title="${uiLabelMap.CommonStatus}"><display-entity entity-name="StatusItem"
description="${description}" key-field-name="statusId"/></field>
</form>
- <form name="PaymentReport" type="single" target="paymentReportHtml"
extends="FindPayments"
extends-resource="component://accounting/widget/PaymentForms.xml"
target-window="_BLANK">
- <field name="contentType"
action="document.PaymentReport.action=this.value" event="onchange">
- <drop-down>
- <option key="paymentReportHtml"
description="text/html"></option>
- <option key="paymentReportPdf"
description="application/pdf"></option>
- <!--option
key="application/vnd.ms-excel">application/vnd.ms-excel</option>
- <option
key="application/vnd.ms-word">application/vnd.ms-word</option>
- <option
key="application/vnd.ms-powerpoint">application/vnd.ms-powerpoint</option-->
- </drop-down>
- </field>
- <field name="searchButton"><hidden/></field>
- <field name="report" title="Report" widget-style="smallSubmit"><submit
button-type="button"/></field>
+ <form name="PaymentReport" type="single" target="paymentReportHtml"
extends="FindPayments"
extends-resource="component://accounting/widget/PaymentForms.xml"
target-window="_BLANK">
+ <field name="contentType"
action="document.PaymentReport.action=this.value" event="onchange">
+ <drop-down>
+ <option key="paymentReportHtml"
description="text/html"></option>
+ <option key="paymentReportPdf"
description="application/pdf"></option>
+ <!--option
key="application/vnd.ms-excel">application/vnd.ms-excel</option>
+ <option
key="application/vnd.ms-word">application/vnd.ms-word</option>
+ <option
key="application/vnd.ms-powerpoint">application/vnd.ms-powerpoint</option-->
+ </drop-down>
+ </field>
+ <field name="searchButton"><hidden/></field>
+ <field name="report" title="Report" widget-style="smallSubmit"><submit
button-type="button"/></field>
</form>
</forms>
Modified:
ofbiz/branches/addbirt/applications/accounting/widget/PaymentScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/branches/addbirt/applications/accounting/widget/PaymentScreens.xml?rev=890170&r1=890169&r2=890170&view=diff
==============================================================================
--- ofbiz/branches/addbirt/applications/accounting/widget/PaymentScreens.xml
(original)
+++ ofbiz/branches/addbirt/applications/accounting/widget/PaymentScreens.xml
Mon Dec 14 04:22:56 2009
@@ -68,7 +68,7 @@
<set field="tabButtonItem" value="findPayment"/>
</actions>
<widgets>
- <decorator-screen name="CommonPaymentDecorator"
location="${parameters.mainDecoratorLocation}">
+ <decorator-screen name="CommonPaymentDecorator"
location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
<section>
<widgets>
@@ -542,7 +542,7 @@
<screen name="PaymentReport">
<section>
<actions>
- <set field="headerItem" value="payments"/>
+ <set field="headerItem" value="payments"/>
<set field="tabButtonItem" value="paymentReport"/>
</actions>
<widgets>
@@ -550,9 +550,9 @@
<decorator-section name="body">
<section>
<widgets>
- <screenlet title="Payment Report">
- <include-form name="PaymentReport"
location="component://accounting/widget/PaymentForms.xml"/>
- </screenlet>
+ <screenlet title="Payment Report">
+ <include-form name="PaymentReport"
location="component://accounting/widget/PaymentForms.xml"/>
+ </screenlet>
</widgets>
</section>
</decorator-section>
Modified: ofbiz/branches/addbirt/applications/order/data/OrderPortletData.xml
URL:
http://svn.apache.org/viewvc/ofbiz/branches/addbirt/applications/order/data/OrderPortletData.xml?rev=890170&r1=890169&r2=890170&view=diff
==============================================================================
--- ofbiz/branches/addbirt/applications/order/data/OrderPortletData.xml
(original)
+++ ofbiz/branches/addbirt/applications/order/data/OrderPortletData.xml Mon Dec
14 04:22:56 2009
@@ -139,7 +139,7 @@
<PortletPortletCategory portalPortletId="OrderByReferrer"
portletCategoryId="REPORT"/>
<PortalPagePortlet portalPageId="OrderReportPage"
portalPortletId="OrderByReferrer" portletSeqId="00001" columnSeqId="00001"
sequenceNum="6"/>
- <PortalPortlet portalPortletId="OrderByChannel"
+ <PortalPortlet portalPortletId="OrderByChannel"
portletName="Sale Orders by Channel"
screenName="SaleOrdersByChannelReport"
screenLocation="component://order/widget/ordermgr/ReportScreens.xml"
Modified:
ofbiz/branches/addbirt/applications/order/entitydef/entitygroup_olap.xml
URL:
http://svn.apache.org/viewvc/ofbiz/branches/addbirt/applications/order/entitydef/entitygroup_olap.xml?rev=890170&r1=890169&r2=890170&view=diff
==============================================================================
--- ofbiz/branches/addbirt/applications/order/entitydef/entitygroup_olap.xml
(original)
+++ ofbiz/branches/addbirt/applications/order/entitydef/entitygroup_olap.xml
Mon Dec 14 04:22:56 2009
@@ -30,7 +30,6 @@
<!-- Star Schemas -->
<!-- ========================================================= -->
<entity-group group="org.ofbiz.olap" entity="SalesOrderItemStarSchema"/>
-
</entitygroup>
Modified:
ofbiz/branches/addbirt/applications/order/entitydef/entitymodel_olap.xml
URL:
http://svn.apache.org/viewvc/ofbiz/branches/addbirt/applications/order/entitydef/entitymodel_olap.xml?rev=890170&r1=890169&r2=890170&view=diff
==============================================================================
--- ofbiz/branches/addbirt/applications/order/entitydef/entitymodel_olap.xml
(original)
+++ ofbiz/branches/addbirt/applications/order/entitydef/entitymodel_olap.xml
Mon Dec 14 04:22:56 2009
@@ -38,14 +38,14 @@
<field name="productDimId" type="id-ne"></field>
<field name="origCurrencyDimId" type="id-ne"></field>
<field name="billToCustomerDimId" type="id-ne"></field> <!-- TODO:
implement the dimension -->
-
+
<field name="quantity" type="fixed-point">
<description>Quantity order. From OrderItem.quantity</description>
</field>
<field name="orderStatus" type="description"></field>
- <field name="saleChannel" type="description"></field>
- <field name="visitId" type="id-ne"></field>
- <field name="initialReferrer" type="url"></field>
+ <field name="saleChannel" type="description"></field>
+ <field name="visitId" type="id-ne"></field>
+ <field name="initialReferrer" type="url"></field>
<field name="productPromoCode" type="id"></field>
<field name="extGrossAmount" type="currency-precise">
<description>Extended gross amount: quantity item multiplied by
the unit price.</description>
@@ -187,9 +187,9 @@
<exclude field="orderId"/>
<exclude field="orderItemSeqId"/>
<exclude field="orderStatus"/>
- <exclude field="saleChannel"/>
- <exclude field="visitId"/>
- <exclude field="initialReferrer"/>
+ <exclude field="saleChannel"/>
+ <exclude field="visitId"/>
+ <exclude field="initialReferrer"/>
<exclude field="productPromoCode"/>
</alias-all>
<alias entity-alias="SIIF" name="orderId" group-by="true">
Modified:
ofbiz/branches/addbirt/applications/order/script/org/ofbiz/order/olap/FactServices.xml
URL:
http://svn.apache.org/viewvc/ofbiz/branches/addbirt/applications/order/script/org/ofbiz/order/olap/FactServices.xml?rev=890170&r1=890169&r2=890170&view=diff
==============================================================================
---
ofbiz/branches/addbirt/applications/order/script/org/ofbiz/order/olap/FactServices.xml
(original)
+++
ofbiz/branches/addbirt/applications/order/script/org/ofbiz/order/olap/FactServices.xml
Mon Dec 14 04:22:56 2009
@@ -253,8 +253,8 @@
<field-map field-name="visitId"
from-field="orderHeader.visitId"/>
</entity-one>
<if-not-empty field="visit">
- <set field="fact.visitId" from-field="visit.visitId"/>
- <set field="fact.initialReferrer"
from-field="visit.initialReferrer"/>
+ <set field="fact.visitId" from-field="visit.visitId"/>
+ <set field="fact.initialReferrer"
from-field="visit.initialReferrer"/>
</if-not-empty>
</if-not-empty>
@@ -285,5 +285,4 @@
<store-value value-field="fact"/>
</if-compare>
</simple-method>
-
</simple-methods>
Modified:
ofbiz/branches/addbirt/applications/order/webapp/ordermgr/WEB-INF/actions/reports/OrderByChannel.groovy
URL:
http://svn.apache.org/viewvc/ofbiz/branches/addbirt/applications/order/webapp/ordermgr/WEB-INF/actions/reports/OrderByChannel.groovy?rev=890170&r1=890169&r2=890170&view=diff
==============================================================================
---
ofbiz/branches/addbirt/applications/order/webapp/ordermgr/WEB-INF/actions/reports/OrderByChannel.groovy
(original)
+++
ofbiz/branches/addbirt/applications/order/webapp/ordermgr/WEB-INF/actions/reports/OrderByChannel.groovy
Mon Dec 14 04:22:56 2009
@@ -20,12 +20,12 @@
import org.ofbiz.base.util.*;
birtParameters = [:];
-if(request.getParameter("saleChannel")){
+if (request.getParameter("saleChannel")) {
birtParameters.saleChannel = request.getParameter("saleChannel");
-}else{
+} else {
birtParameters.saleChannel = "null";
}
request.setAttribute("birtParameters", birtParameters);
-return "success";
\ No newline at end of file
+return "success";
Modified:
ofbiz/branches/addbirt/applications/order/widget/ordermgr/ReportForms.xml
URL:
http://svn.apache.org/viewvc/ofbiz/branches/addbirt/applications/order/widget/ordermgr/ReportForms.xml?rev=890170&r1=890169&r2=890170&view=diff
==============================================================================
--- ofbiz/branches/addbirt/applications/order/widget/ordermgr/ReportForms.xml
(original)
+++ ofbiz/branches/addbirt/applications/order/widget/ordermgr/ReportForms.xml
Mon Dec 14 04:22:56 2009
@@ -232,23 +232,23 @@
<field name="submitButton" title="${uiLabelMap.CommonRun}"
widget-style="smallSubmit"><submit button-type="button"/></field>
</form>
<form name="OrderByReferrer" type="single" target="OrderByReferrer.pdf"
target-window="_BLANK">
- <!--field name="referrerUrl"><text-find
default-option="contains"/></field-->
- <field name="referrerUrl"
title="${uiLabelMap.CommonEmptyHeader}"><display description="All
Referrer"></display></field>
- <field name="submit" title="${uiLabelMap.CommonRun}"><submit
button-type="button"/></field>
+ <!--field name="referrerUrl"><text-find
default-option="contains"/></field-->
+ <field name="referrerUrl"
title="${uiLabelMap.CommonEmptyHeader}"><display description="All
Referrer"></display></field>
+ <field name="submit" title="${uiLabelMap.CommonRun}"><submit
button-type="button"/></field>
</form>
<form name="SaleOrdersByChannel" type="single"
target="OrdersByChannel.pdf" target-window="_BLANK">
- <field name="saleChannel">
- <drop-down allow-empty="false">
- <option key="" description="-
${uiLabelMap.CommonSelectAny} -"/>
- <entity-options description="${description}"
entity-name="Enumeration" key-field-name="description">
- <entity-constraint name="enumTypeId"
operator="equals" value="ORDER_SALES_CHANNEL"/>
- </entity-options>
- </drop-down>
- </field>
- <field name="submit" title="${uiLabelMap.CommonRun}"><submit
button-type="button"/></field>
+ <field name="saleChannel">
+ <drop-down allow-empty="false">
+ <option key="" description="- ${uiLabelMap.CommonSelectAny}
-"/>
+ <entity-options description="${description}"
entity-name="Enumeration" key-field-name="description">
+ <entity-constraint name="enumTypeId" operator="equals"
value="ORDER_SALES_CHANNEL"/>
+ </entity-options>
+ </drop-down>
+ </field>
+ <field name="submit" title="${uiLabelMap.CommonRun}"><submit
button-type="button"/></field>
</form>
<form name="SaleOrderDiscountCode" type="single"
target="OrderDiscountCode.pdf" target-window="_BLANK">
<field name="discountCodeUrl"
title="${uiLabelMap.CommonEmptyHeader}"><display description="All order items
with discount code"></display></field>
<field name="submit" title="${uiLabelMap.CommonRun}"><submit
button-type="button"/></field>
</form>
-</forms>
\ No newline at end of file
+</forms>
Modified:
ofbiz/branches/addbirt/applications/order/widget/ordermgr/ReportScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/branches/addbirt/applications/order/widget/ordermgr/ReportScreens.xml?rev=890170&r1=890169&r2=890170&view=diff
==============================================================================
--- ofbiz/branches/addbirt/applications/order/widget/ordermgr/ReportScreens.xml
(original)
+++ ofbiz/branches/addbirt/applications/order/widget/ordermgr/ReportScreens.xml
Mon Dec 14 04:22:56 2009
@@ -24,7 +24,7 @@
<screen name="OrderPurchaseReportOptions">
<section>
<actions>
- <set field="titleProperty" value="OrderReports"/>
+ <set field="titleProperty" value="OrderReports"/>
<set field="headerItem" value="reports"/>
<entity-one value-field="portalPage" entity-name="PortalPage">
<field-map field-name="portalPageId"
value="OrderReportPage"/>
Modified:
ofbiz/branches/addbirt/applications/product/webapp/facility/WEB-INF/actions/inventory/InventoryItemReport.groovy
URL:
http://svn.apache.org/viewvc/ofbiz/branches/addbirt/applications/product/webapp/facility/WEB-INF/actions/inventory/InventoryItemReport.groovy?rev=890170&r1=890169&r2=890170&view=diff
==============================================================================
---
ofbiz/branches/addbirt/applications/product/webapp/facility/WEB-INF/actions/inventory/InventoryItemReport.groovy
(original)
+++
ofbiz/branches/addbirt/applications/product/webapp/facility/WEB-INF/actions/inventory/InventoryItemReport.groovy
Mon Dec 14 04:22:56 2009
@@ -17,39 +17,39 @@
* under the License.
*/
- import org.ofbiz.accounting.util.UtilAccounting
- import org.ofbiz.base.util.*;
- import org.ofbiz.entity.util.EntityUtil;
- import org.ofbiz.entity.condition.EntityCondition;
- import org.ofbiz.entity.condition.EntityOperator;
- import com.ibm.icu.util.Calendar;
-
- birtParameters = [:];
- /*
- birtParameters.facilityId = request.getParameter("facilityId");
- birtParameters.productId = request.getParameter("productId");
- birtParameters.productTypeId = request.getParameter("productTypeId");
- birtParameters.searchInProductCategoryId =
request.getParameter("searchInProductCategoryId");
- birtParameters.contentType = request.getParameter("contentType");
- birtParameters.productSupplierId = request.getParameter("productSupplierId");
- birtParameters.statusId = request.getParameter("statusId");
- birtParameters.productsSoldThruTimestamp =
request.getParameter("productsSoldThruTimestamp");
- birtParameters.VIEW_SIZE = request.getParameter("VIEW_SIZE");
- birtParameters.monthsInPastLimit = request.getParameter("monthsInPastLimit");
- birtParameters.fromDateSellThrough =
request.getParameter("fromDateSellThrough");
- birtParameters.thruDateSellThrough =
request.getParameter("thruDateSellThrough");
- */
+import org.ofbiz.accounting.util.UtilAccounting
+import org.ofbiz.base.util.*;
+import org.ofbiz.entity.util.EntityUtil;
+import org.ofbiz.entity.condition.EntityCondition;
+import org.ofbiz.entity.condition.EntityOperator;
+import com.ibm.icu.util.Calendar;
+
+birtParameters = [:];
+/*
+birtParameters.facilityId = request.getParameter("facilityId");
+birtParameters.productId = request.getParameter("productId");
+birtParameters.productTypeId = request.getParameter("productTypeId");
+birtParameters.searchInProductCategoryId =
request.getParameter("searchInProductCategoryId");
+birtParameters.contentType = request.getParameter("contentType");
+birtParameters.productSupplierId = request.getParameter("productSupplierId");
+birtParameters.statusId = request.getParameter("statusId");
+birtParameters.productsSoldThruTimestamp =
request.getParameter("productsSoldThruTimestamp");
+birtParameters.VIEW_SIZE = request.getParameter("VIEW_SIZE");
+birtParameters.monthsInPastLimit = request.getParameter("monthsInPastLimit");
+birtParameters.fromDateSellThrough =
request.getParameter("fromDateSellThrough");
+birtParameters.thruDateSellThrough =
request.getParameter("thruDateSellThrough");
+*/
- int lastIntMonth = Integer.parseInt(request.getParameter("lastIntMonth"));
- if (lastIntMonth == 0 ){
- fromOrderDate = null;
- }else{
- fromDateTime =
UtilDateTime.getDayStart(UtilDateTime.toTimestamp(UtilDateTime.nowTimestamp()),
(lastIntMonth*(-30)));
- fromOrderDate = UtilDateTime.toDateString(fromDateTime,"MMMM dd, yyyy")
- Debug.logInfo("====fromDate======="+fromOrderDate.toString(),"");
- }
+int lastIntMonth = Integer.parseInt(request.getParameter("lastIntMonth"));
+if (lastIntMonth == 0 ) {
+ fromOrderDate = null;
+} else {
+ fromDateTime =
UtilDateTime.getDayStart(UtilDateTime.toTimestamp(UtilDateTime.nowTimestamp()),
(lastIntMonth*(-30)));
+ fromOrderDate = UtilDateTime.toDateString(fromDateTime,"MMMM dd, yyyy")
+ Debug.logInfo("====fromDate======="+fromOrderDate.toString(),"");
+}
- birtParameters.facilityId = request.getParameter("facilityId");
- birtParameters.orderDateDateValue_fld0_op = fromOrderDate.toString();
- request.setAttribute("birtParameters", birtParameters);
- return "success";
+birtParameters.facilityId = request.getParameter("facilityId");
+birtParameters.orderDateDateValue_fld0_op = fromOrderDate.toString();
+request.setAttribute("birtParameters", birtParameters);
+return "success";
Modified:
ofbiz/branches/addbirt/applications/product/webapp/facility/WEB-INF/controller.xml
URL:
http://svn.apache.org/viewvc/ofbiz/branches/addbirt/applications/product/webapp/facility/WEB-INF/controller.xml?rev=890170&r1=890169&r2=890170&view=diff
==============================================================================
---
ofbiz/branches/addbirt/applications/product/webapp/facility/WEB-INF/controller.xml
(original)
+++
ofbiz/branches/addbirt/applications/product/webapp/facility/WEB-INF/controller.xml
Mon Dec 14 04:22:56 2009
@@ -29,6 +29,7 @@
<handler name="bsf" type="request"
class="org.ofbiz.webapp.event.BsfEventHandler"/>
<handler name="birt" type="view"
class="org.ofbiz.webapp.view.BirtViewHandler"/>
+
<!-- Events to run on every request before security (chains exempt) -->
<!--
<preprocessor>
Modified:
ofbiz/branches/addbirt/framework/bi/script/org/ofbiz/bi/DimensionServices.xml
URL:
http://svn.apache.org/viewvc/ofbiz/branches/addbirt/framework/bi/script/org/ofbiz/bi/DimensionServices.xml?rev=890170&r1=890169&r2=890170&view=diff
==============================================================================
---
ofbiz/branches/addbirt/framework/bi/script/org/ofbiz/bi/DimensionServices.xml
(original)
+++
ofbiz/branches/addbirt/framework/bi/script/org/ofbiz/bi/DimensionServices.xml
Mon Dec 14 04:22:56 2009
@@ -71,7 +71,7 @@
<entity-condition entity-name="InventoryItem" list="inventoryItems">
<condition-expr field-name="inventoryItemTypeId" operator="equals"
value="NON_SERIAL_INV_ITEM"/>
</entity-condition>
- <iterate list="inventoryItems" entry="inventoryItem">
+ <iterate list="inventoryItems" entry="inventoryItem">
<clear-field field="inventMap"/>
<set field="inventMap.inventoryItemId"
from-field="inventoryItem.inventoryItemId"/>
<log level="always"
message="==================inventMap----${inventMap.inventoryItemId}--"/>
