Author: arunpatidar
Date: Sat Sep 19 13:09:40 2015
New Revision: 1704014
URL: http://svn.apache.org/viewvc?rev=1704014&view=rev
Log:
[OFBIZ-6212] Fixed the issue #1 of Accounting reports due to a minor typo and
missing screen.Added a decorator screen for using with accounting report.
Modified:
ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/reports/SalesInvoiceByProductCategorySummary.groovy
ofbiz/trunk/applications/accounting/widget/CommonScreens.xml
Modified:
ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/reports/SalesInvoiceByProductCategorySummary.groovy
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/reports/SalesInvoiceByProductCategorySummary.groovy?rev=1704014&r1=1704013&r2=1704014&view=diff
==============================================================================
---
ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/reports/SalesInvoiceByProductCategorySummary.groovy
(original)
+++
ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/reports/SalesInvoiceByProductCategorySummary.groovy
Sat Sep 19 13:09:40 2015
@@ -121,7 +121,7 @@ for (int currentDay = 0; currentDay <= d
categoryAndExprs.add(EntityCondition.makeCondition("invoiceDate",
EntityOperator.GREATER_THAN_EQUAL_TO, currentDayBegin));
categoryAndExprs.add(EntityCondition.makeCondition("invoiceDate",
EntityOperator.LESS_THAN, nextDayBegin));
- categoryResultListIterator = select("productCategoryId", "quantityTotal",
"amountTotal").from(InvoiceItemCategorySummary).where(categoryAndExprs).cursorScrollInsensitive().cache(true).queryIterator();
+ categoryResultListIterator = select("productCategoryId", "quantityTotal",
"amountTotal").from("InvoiceItemCategorySummary").where(categoryAndExprs).cursorScrollInsensitive().cache(true).queryIterator();
categoryResultMap = [:];
while ((categoryResult = categoryResultListIterator.next())) {
categoryResultMap[categoryResult.productCategoryId] = categoryResult;
@@ -153,7 +153,7 @@ for (int currentDay = 0; currentDay <= d
}
context.productResultMapByDayList = productResultMapByDayList;
-context.productNullResultByDayList = productNullResultMapByDayList;
+context.productNullResultByDayList = productNullResultByDayList;
context.categoryResultMapByDayList = categoryResultMapByDayList;
context.monthProductResultMap = monthProductResultMap;
Modified: ofbiz/trunk/applications/accounting/widget/CommonScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/CommonScreens.xml?rev=1704014&r1=1704013&r2=1704014&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/CommonScreens.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/CommonScreens.xml Sat Sep 19
13:09:40 2015
@@ -46,7 +46,49 @@ under the License.
</widgets>
</section>
</screen>
-
+
+ <screen name="CommonFinAccountDecorator">
+ <section>
+ <actions>
+ <set field="headerItem" value="FindFinAccount"/>
+ <entity-one value-field="finAccount" entity-name="FinAccount"/>
+ </actions>
+ <widgets>
+ <decorator-screen name="main-decorator"
location="${parameters.mainDecoratorLocation}">
+ <decorator-section name="pre-body">
+ <section>
+ <condition>
+ <if-service-permission
service-name="acctgFinAcctPermissionCheck" main-action="VIEW"/>
+ </condition>
+ <widgets>
+ <section>
+ <condition><not><if-empty
field="finAccountId"/></not></condition>
+ <widgets>
+ <include-menu name="FinAccountTabBar"
location="component://accounting/widget/AccountingMenus.xml"/>
+ </widgets>
+ <fail-widgets>
+ <include-menu
name="FinAccountMainTabBar"
location="component://accounting/widget/AccountingMenus.xml"/>
+ </fail-widgets>
+ </section>
+ </widgets>
+ </section>
+ </decorator-section>
+ <decorator-section name="body">
+ <section>
+ <condition>
+ <not><if-service-permission
service-name="acctgFinAcctPermissionCheck" main-action="VIEW"/></not>
+ </condition>
+ <widgets>
+ <label style="h3"
text="${uiLabelMap.AccountingViewPermissionError}"/>
+ </widgets>
+ </section>
+ <decorator-section-include name="body"/>
+ </decorator-section>
+ </decorator-screen>
+ </widgets>
+ </section>
+ </screen>
+
<screen name="CommonPaymentDecorator">
<section>
<actions>
