svn commit: r525417 - in /ofbiz/trunk/applications/acco
Locked
 
|
Author: jonesde
Date: Tue Apr 3 22:40:34 2007 New Revision: 525417 URL: http://svn.apache.org/viewvc?view=rev&rev=525417 Log: A few cleanups/fixes on the reports, now works for categories without both products and cats under them, a few things more clear in the UI Modified: ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/reports/SalesInvoiceSummary.bsh ofbiz/trunk/applications/accounting/webapp/accounting/reports/SalesInvoiceSummary.ftl ofbiz/trunk/applications/accounting/widget/ReportFinancialSummaryForms.xml Modified: ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/reports/SalesInvoiceSummary.bsh URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/reports/SalesInvoiceSummary.bsh?view=diff&rev=525417&r1=525416&r2=525417 ============================================================================== --- ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/reports/SalesInvoiceSummary.bsh (original) +++ ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/reports/SalesInvoiceSummary.bsh Tue Apr 3 22:40:34 2007 @@ -77,8 +77,8 @@ baseCategoryAndExprs.add(new EntityExpr("invoiceTypeId", EntityOperator.EQUALS, "SALES_INVOICE")); baseCategoryAndExprs.add(new EntityExpr("invoiceItemTypeId", EntityOperator.IN, UtilMisc.toList("INV_PROD_ITEM", "INV_FPROD_ITEM", "INV_DPROD_ITEM"))); baseCategoryAndExprs.add(new EntityExpr("statusId", EntityOperator.IN, UtilMisc.toList("INVOICE_READY", "INVOICE_PAID"))); -baseCategoryAndExprs.add(new EntityExpr("productCategoryId", EntityOperator.IN, productCategoryIdSet)); -baseCategoryAndExprs.add(new EntityExpr("productId", EntityOperator.NOT_IN, productIdSet)); +if (productCategoryIdSet.size() > 0) baseCategoryAndExprs.add(new EntityExpr("productCategoryId", EntityOperator.IN, productCategoryIdSet)); +if (productIdSet.size() > 0) baseCategoryAndExprs.add(new EntityExpr("productId", EntityOperator.NOT_IN, productIdSet)); if (UtilValidate.isNotEmpty(organizationPartyId)) baseCategoryAndExprs.add(new EntityExpr("partyIdFrom", EntityOperator.EQUALS, organizationPartyId)); if (UtilValidate.isNotEmpty(currencyUomId)) baseCategoryAndExprs.add(new EntityExpr("currencyUomId", EntityOperator.EQUALS, currencyUomId)); @@ -106,7 +106,7 @@ // do the product find productAndExprs = FastList.newInstance(); productAndExprs.addAll(baseProductAndExprs); - productAndExprs.add(new EntityExpr("productId", EntityOperator.IN, productIdSet)); + if (productIdSet.size() > 0) productAndExprs.add(new EntityExpr("productId", EntityOperator.IN, productIdSet)); productAndExprs.add(new EntityExpr("invoiceDate", EntityOperator.GREATER_THAN_EQUAL_TO, currentDayBegin)); productAndExprs.add(new EntityExpr("invoiceDate", EntityOperator.LESS_THAN, nextDayBegin)); Modified: ofbiz/trunk/applications/accounting/webapp/accounting/reports/SalesInvoiceSummary.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/webapp/accounting/reports/SalesInvoiceSummary.ftl?view=diff&rev=525417&r1=525416&r2=525417 ============================================================================== --- ofbiz/trunk/applications/accounting/webapp/accounting/reports/SalesInvoiceSummary.ftl (original) +++ ofbiz/trunk/applications/accounting/webapp/accounting/reports/SalesInvoiceSummary.ftl Tue Apr 3 22:40:34 2007 @@ -27,11 +27,12 @@ <div>Sales Invoice Summary Report for:</div> <ul> - <li>Month: ${month}/${year}</li> + <li>Month: ${(month + 1)}/${year}</li> <li>Root Category: ${rootProductCategory.categoryName?if_exists} [${rootProductCategoryId}]</li> <li>Organization: ${(organizationPartyName.groupName)?if_exists} [${organizationPartyId?default("No Organization Specified")}]</li> <li>Currency: ${(currencyUom.description)?if_exists} [${currencyUomId?default("No Currency Specified")}]</li> -</il> +</il> +<div>NOTE: each set of numbers is: <quantity>:<total amount>:<average amount></div> <table> <#-- Create the header row --> <tr> Modified: ofbiz/trunk/applications/accounting/widget/ReportFinancialSummaryForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/ReportFinancialSummaryForms.xml?view=diff&rev=525417&r1=525416&r2=525417 ============================================================================== --- ofbiz/trunk/applications/accounting/widget/ReportFinancialSummaryForms.xml (original) +++ ofbiz/trunk/applications/accounting/widget/ReportFinancialSummaryForms.xml Tue Apr 3 22:40:34 2007 @@ -24,18 +24,18 @@ <form name="SalesInvoiceSummaryOptions" type="single" target="SalesInvoiceSummary"> <field name="month" required-field="true"> <drop-down allow-empty="false"> - <option key="0" description="January"/> - <option key="1" description="February"/> - <option key="2" description="March"/> - <option key="3" description="April"/> - <option key="4" description="May"/> - <option key="5" description="June"/> - <option key="6" description="July"/> - <option key="7" description="August"/> - <option key="8" description="September"/> - <option key="9" description="October"/> - <option key="10" description="November"/> - <option key="11" description="December"/> + <option key="0" description="1-January"/> + <option key="1" description="2-February"/> + <option key="2" description="3-March"/> + <option key="3" description="4-April"/> + <option key="4" description="5-May"/> + <option key="5" description="6-June"/> + <option key="6" description="7-July"/> + <option key="7" description="8-August"/> + <option key="8" description="9-September"/> + <option key="9" description="10-October"/> + <option key="10" description="11-November"/> + <option key="11" description="12-December"/> </drop-down> </field> <field name="year" required-field="true"><text size="4" default-value="2007"/></field> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |