Author: apatel
Date: Wed Aug 12 04:54:50 2009
New Revision: 803363
URL: http://svn.apache.org/viewvc?rev=803363&view=rev
Log:
Implement Inventory Valuation report. Patch from OFBIZ-2824. Thanks Surya,
Sumit for implementation and Jacapo, Vince and Eva for review.
Added:
ofbiz/trunk/applications/accounting/webapp/accounting/reports/InventoryValuationReport.fo.ftl
(with props)
Modified:
ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml
ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/ledger/GeneralLedgerServices.xml
ofbiz/trunk/applications/accounting/servicedef/services_ledger.xml
ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/controller.xml
ofbiz/trunk/applications/accounting/widget/Menus.xml
ofbiz/trunk/applications/accounting/widget/ReportFinancialSummaryForms.xml
ofbiz/trunk/applications/accounting/widget/ReportFinancialSummaryScreens.xml
Modified: ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml?rev=803363&r1=803362&r2=803363&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml (original)
+++ ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml Wed Aug
12 04:54:50 2009
@@ -4520,6 +4520,14 @@
<value xml:lang="it">Istanza del prodotto</value>
<value xml:lang="zh">äº§åæ è¯å®ä¾</value>
</property>
+ <property key="AccountingInventoryValuation">
+ <value xml:lang="en">Inventory Valuation</value>
+ <value xml:lang="hi_IN">वसà¥à¤¤à¥
मà¥à¤²à¥à¤¯à¤¾à¤à¤à¤¨</value>
+ </property>
+ <property key="AccountingInventoryValuationList">
+ <value xml:lang="en">Inventory Valuation List</value>
+ <value xml:lang="hi_IN">वसà¥à¤¤à¥ मà¥à¤²à¥à¤¯à¤¾à¤à¤à¤¨
सà¥à¤à¥</value>
+ </property>
<property key="AccountingInvNr">
<value xml:lang="ar">رÙÙ
اÙÙØ§ØªÙرة</value>
<value xml:lang="en">Inv.Nr</value>
@@ -8559,6 +8567,10 @@
<value xml:lang="th">Total excl. tax</value>
<value xml:lang="zh">æªå«ç¨å计</value>
</property>
+ <property key="AccountingTotalQuantityOnHand">
+ <value xml:lang="en">Total Quantity On Hand</value>
+ <value xml:lang="hi_IN">à¤à¥à¤² मातà¥à¤°à¤¾ हाथ
पर</value>
+ </property>
<property key="AccountingTransactionHasBeenAlreadyPosted">
<value xml:lang="en">Transaction has been already posted</value>
<value xml:lang="fr">Transaction déjà effectuée</value>
Modified:
ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/ledger/GeneralLedgerServices.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/ledger/GeneralLedgerServices.xml?rev=803363&r1=803362&r2=803363&view=diff
==============================================================================
---
ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/ledger/GeneralLedgerServices.xml
(original)
+++
ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/ledger/GeneralLedgerServices.xml
Wed Aug 12 04:54:50 2009
@@ -2584,4 +2584,50 @@
<field-to-result field="glAcctgOrgAndCostCenterMapList"
result-name="glAcctgOrgAndCostCenterMapList"/>
</if-not-empty>
</simple-method>
+
+ <simple-method method-name="getInventoryValuationList"
short-description="Retrieves list for Inventory Valuation Report">
+ <entity-condition entity-name="ProductInventoryItem"
list="productInventoryItems">
+ <condition-list combine="and">
+ <condition-expr field-name="productId"
from-field="parameters.productId" ignore-if-empty="true"/>
+ <condition-expr field-name="facilityId"
from-field="parameters.facilityId" ignore-if-empty="true"/>
+ <condition-expr field-name="primaryProductCategoryId"
from-field="parameters.productCategoryId" ignore-if-empty="true"/>
+ <condition-expr field-name="datetimeReceived"
operator="greater-equals" from-field="parameters.fromDate"
ignore-if-empty="true"/>
+ <condition-expr field-name="datetimeReceived"
operator="less-equals" from-field="parameters.thruDate" ignore-if-empty="true"/>
+ </condition-list>
+ <order-by field-name="productId"/>
+ </entity-condition>
+ <if-not-empty field="productInventoryItems">
+ <set field="productIds"
value="${groovy:org.ofbiz.entity.util.EntityUtil.getFieldListFromEntityList(productInventoryItems,
'productId', true);}" type="List"/>
+ <iterate list="productIds" entry="productId">
+ <set field="totalQuantityOnHand" type="BigDecimal" value="0"/>
+ <set field="totalInventoryCost" type="BigDecimal" value="0"/>
+ <set field="productAverageCost" type="BigDecimal" value="0"/>
+ <iterate list="productInventoryItems"
entry="productInventoryItem">
+ <if-compare-field field="productId" operator="equals"
to-field="productInventoryItem.productId">
+ <if-compare field="parameters.cogsMethodId"
operator="equals" value="COGS_AVG_COST">
+ <entity-one entity-name="InventoryItem"
value-field="inventoryItem" auto-field-map="false">
+ <field-map field-name="inventoryItemId"
from-field="productInventoryItem.inventoryItemId"/>
+ </entity-one>
+ <set field="getProdAvgCostMap.inventoryItem"
from-field="inventoryItem"/>
+ <call-service service-name="getProductAverageCost"
in-map-name="getProdAvgCostMap">
+ <result-to-field result-name="unitCost"
field="productAverageCost"/>
+ </call-service>
+ </if-compare>
+ <set field="totalQuantityOnHand"
value="${totalQuantityOnHand + productInventoryItem.quantityOnHandTotal}"
type="BigDecimal"/>
+ <set field="currencyUomId"
from-field="productInventoryItem.currencyUomId"/>
+ <set field="totalInventoryCost"
value="${totalInventoryCost + (productInventoryItem.quantityOnHandTotal *
productAverageCost)}" type="BigDecimal"/>
+ </if-compare-field>
+ </iterate>
+ <set field="inventoryValuation.productId"
from-field="productId"/>
+ <set field="inventoryValuation.totalQuantityOnHand"
from-field="totalQuantityOnHand" type="BigDecimal"/>
+ <set field="inventoryValuation.totalInventoryCost"
from-field="totalInventoryCost" type="BigDecimal"/>
+ <set field="inventoryValuation.productAverageCost"
from-field="productAverageCost" type="BigDecimal"/>
+ <set field="inventoryValuation.currencyUomId"
from-field="currencyUomId"/>
+ <set field="inventoryValuationList[]"
from-field="inventoryValuation"/>
+ <clear-field field="inventoryValuation"/>
+ </iterate>
+ <field-to-result field="inventoryValuationList"/>
+ </if-not-empty>
+ </simple-method>
+
</simple-methods>
Modified: ofbiz/trunk/applications/accounting/servicedef/services_ledger.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/servicedef/services_ledger.xml?rev=803363&r1=803362&r2=803363&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/servicedef/services_ledger.xml
(original)
+++ ofbiz/trunk/applications/accounting/servicedef/services_ledger.xml Wed Aug
12 04:54:50 2009
@@ -654,4 +654,17 @@
<attribute name="timePeriod" type="String" mode="IN" optional="true"/>
<attribute name="glAcctgOrgAndCostCenterMapList" mode="OUT"
type="List" optional="true"/>
</service>
+
+ <service name="getInventoryValuationList" engine="simple"
+
location="component://accounting/script/org/ofbiz/accounting/ledger/GeneralLedgerServices.xml"
invoke="getInventoryValuationList" auth="true">
+ <description>Inventory Valuation List</description>
+ <attribute name="productId" type="String" mode="IN" optional="true"/>
+ <attribute name="facilityId" type="String" mode="IN" optional="true"/>
+ <attribute name="productCategoryId" type="String" mode="IN"
optional="true"/>
+ <attribute name="cogsMethodId" type="String" mode="IN"
optional="true"/>
+ <attribute name="fromDate" type="Timestamp" mode="IN" optional="true"/>
+ <attribute name="thruDate" type="Timestamp" mode="IN" optional="true"/>
+ <attribute name="inventoryValuationList" type="List" mode="OUT"
optional="true"/>
+ </service>
+
</services>
Modified:
ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/controller.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/controller.xml?rev=803363&r1=803362&r2=803363&view=diff
==============================================================================
---
ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/controller.xml
(original)
+++
ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/controller.xml
Wed Aug 12 04:54:50 2009
@@ -2220,8 +2220,21 @@
<response name="success" type="view"
value="EditDepositSlipAndMembers"/>
<response name="error" type="view" value="NewDepositSlip"/>
</request-map>
-
-
+ <request-map uri="InventoryValuation">
+ <security https="true" auth="true"/>
+ <response name="success" type="view" value="InventoryValuation"/>
+ </request-map>
+ <request-map uri="InventoryValuation.pdf">
+ <security https="true" auth="true"/>
+ <response name="success" type="view" value="InventoryValuationPdf"/>
+ <response name="error" type="view" value="InventoryValuation"/>
+ </request-map>
+ <request-map uri="InventoryValuation.csv">
+ <security https="true" auth="true"/>
+ <response name="success" type="view" value="InventoryValuationCsv"/>
+ <response name="error" type="view" value="InventoryValuation"/>
+ </request-map>
+
<!-- ================ Depreciation Calculation Report requests
================ -->
<request-map uri="showFixedAssetDepreciation">
<security https="true" auth="true"/>
@@ -2650,6 +2663,9 @@
<view-map name="PaymentsDepositWithdraw" type="screen"
page="component://accounting/widget/FinAccountScreens.xml#PaymentsDepositWithdraw"/>
<view-map name="LookupCustomerName" type="screen"
page="component://party/widget/partymgr/LookupScreens.xml#LookupCustomerName"/>
<view-map name="NewDepositSlip" type="screen"
page="component://accounting/widget/FinAccountScreens.xml#NewDepositSlip"/>
+ <view-map name="InventoryValuation" type="screen"
page="component://accounting/widget/ReportFinancialSummaryScreens.xml#InventoryValuation"/>
+ <view-map name="InventoryValuationPdf" type="screenfop"
page="component://accounting/widget/ReportFinancialSummaryScreens.xml#InventoryValuationPdf"
content-type="application/pdf" encoding="none"/>
+ <view-map name="InventoryValuationCsv" type="screencsv"
page="component://accounting/widget/ReportFinancialSummaryScreens.xml#InventoryValuationCsv"
content-type="text/csv" encoding="none"/>
<!-- Assignment Mappings -->
<view-map name="EditPartyFixedAssetAssignments" type="screen"
page="component://accounting/widget/FixedAssetScreens.xml#EditPartyFixedAssetAssignments"/>
Added:
ofbiz/trunk/applications/accounting/webapp/accounting/reports/InventoryValuationReport.fo.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/webapp/accounting/reports/InventoryValuationReport.fo.ftl?rev=803363&view=auto
==============================================================================
---
ofbiz/trunk/applications/accounting/webapp/accounting/reports/InventoryValuationReport.fo.ftl
(added)
+++
ofbiz/trunk/applications/accounting/webapp/accounting/reports/InventoryValuationReport.fo.ftl
Wed Aug 12 04:54:50 2009
@@ -0,0 +1,108 @@
+<#--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+<#escape x as x?xml>
+ <fo:block font-size="14pt" font-weight="bold"
text-align="center">${uiLabelMap.AccountingInventoryValuation}</fo:block>
+ <fo:block font-size="10pt" text-align="left" font-weight="bold">
+ <#if parameters.organizationPartyId?has_content>${uiLabelMap.Party} :
${parameters.organizationPartyId?if_exists}</#if>
+ </fo:block>
+ <fo:block font-size="10pt" text-align="left" font-weight="bold">
+ <#if parameters.facilityId?has_content>
+ <#assign facility = (delegator.findOne("Facility", {"facilityId" :
parameters.facilityId}, false))?if_exists>
+ <#if facility.facilityName?has_content>${uiLabelMap.Facility} :
${facility.facilityName?if_exists}</#if>
+ </#if>
+ </fo:block>
+ <fo:block font-size="10pt" text-align="left" font-weight="bold">
+ <#if parameters.productCategoryId?has_content>
+ <#assign productCategory = (delegator.findOne("ProductCategory",
{"productCategoryId" : parameters.productCategoryId}, false))?if_exists>
+ <#if
productCategory.categoryName?has_content>${uiLabelMap.ProductProductCategory} :
${productCategory.categoryName?if_exists}</#if>
+ </#if>
+ </fo:block>
+ <fo:block font-size="10pt" text-align="left" font-weight="bold">
+ <#if parameters.fromDate?has_content>
+ ${uiLabelMap.CommonFromDate} : ${parameters.fromDate?if_exists}
+ </#if>
+ </fo:block>
+ <fo:block font-size="10pt" text-align="left" font-weight="bold">
+ <#if parameters.thruDate?has_content>
+ ${uiLabelMap.CommonThruDate} : ${parameters.thruDate?if_exists}
+ </#if>
+ </fo:block>
+ <#if inventoryValuationList?has_content>
+ <fo:block><fo:leader/></fo:block>
+ <fo:block space-after.optimum="10pt" font-size="10pt">
+ <fo:table>
+ <fo:table-column column-width="130pt"/>
+ <fo:table-column column-width="130pt"/>
+ <fo:table-column column-width="130pt"/>
+ <fo:table-column column-width="130pt"/>
+ <fo:table-header>
+ <fo:table-row font-weight="bold">
+ <fo:table-cell padding="2pt" background-color="#D4D0C8"
border="1pt solid" border-width=".1mm">
+ <fo:block
text-align="center">${uiLabelMap.ProductProduct}</fo:block>
+ </fo:table-cell>
+ <fo:table-cell padding="2pt" background-color="#D4D0C8"
border="1pt solid" border-width=".1mm">
+ <fo:block
text-align="center">${uiLabelMap.AccountingTotalQuantityOnHand}</fo:block>
+ </fo:table-cell>
+ <fo:table-cell padding="2pt" background-color="#D4D0C8"
border="1pt solid" border-width=".1mm">
+ <fo:block
text-align="center">${uiLabelMap.FormFieldTitle_unitCost}</fo:block>
+ </fo:table-cell>
+ <fo:table-cell padding="2pt" background-color="#D4D0C8"
border="1pt solid" border-width=".1mm">
+ <fo:block
text-align="center">${uiLabelMap.CommonTotalValue}</fo:block>
+ </fo:table-cell>
+ </fo:table-row>
+ </fo:table-header>
+ <fo:table-body>
+ <#list inventoryValuationList as inventoryValuation>
+ <#assign currencyUomId =
inventoryValuation.currencyUomId?if_exists>
+ <fo:table-row>
+ <fo:table-cell padding="2pt" border="1pt solid"
border-width=".1mm">
+ <fo:block
text-align="center">${inventoryValuation.productId?if_exists}</fo:block>
+ </fo:table-cell>
+ <fo:table-cell padding="2pt" border="1pt solid"
border-width=".1mm">
+ <fo:block
text-align="center">${inventoryValuation.totalQuantityOnHand?if_exists}</fo:block>
+ </fo:table-cell>
+ <fo:table-cell padding="2pt" border="1pt solid"
border-width=".1mm">
+ <fo:block text-align="center">
+ <#if currencyUomId != null>
+ <@ofbizCurrency amount =
inventoryValuation.productAverageCost?if_exists isoCode = currencyUomId/>
+ </#if>
+ </fo:block>
+ </fo:table-cell>
+ <fo:table-cell padding="2pt" border="1pt solid"
border-width=".1mm">
+ <fo:block text-align="center">
+ <#if currencyUomId != null>
+ <@ofbizCurrency amount =
inventoryValuation.totalInventoryCost?if_exists isoCode = currencyUomId/>
+ </#if>
+ </fo:block>
+ </fo:table-cell>
+ </fo:table-row>
+ </#list>
+ </fo:table-body>
+ </fo:table>
+ </fo:block>
+ <#else>
+ <fo:table-row>
+ <fo:table-cell number-columns-spanned="2"/>
+ <fo:table-cell padding="2pt">
+ <fo:block>${uiLabelMap.AccountingNoRecordFound}</fo:block>
+ </fo:table-cell>
+ <fo:table-cell number-columns-spanned="2"/>
+ </fo:table-row>
+ </#if>
+</#escape>
Propchange:
ofbiz/trunk/applications/accounting/webapp/accounting/reports/InventoryValuationReport.fo.ftl
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
ofbiz/trunk/applications/accounting/webapp/accounting/reports/InventoryValuationReport.fo.ftl
------------------------------------------------------------------------------
svn:keywords = Date Rev Author URL Id
Propchange:
ofbiz/trunk/applications/accounting/webapp/accounting/reports/InventoryValuationReport.fo.ftl
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: ofbiz/trunk/applications/accounting/widget/Menus.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/Menus.xml?rev=803363&r1=803362&r2=803363&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/Menus.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/Menus.xml Wed Aug 12 04:54:50
2009
@@ -774,6 +774,11 @@
<parameter param-name="organizationPartyId"/>
</link>
</menu-item>
+ <menu-item name="InventoryValuation"
title="${uiLabelMap.AccountingInventoryValuation}">
+ <link target="InventoryValuation">
+ <parameter param-name="organizationPartyId"/>
+ </link>
+ </menu-item>
</menu>
<menu name="PartyAdminTabBar" extends="CommonTabBarMenu"
extends-resource="component://common/widget/CommonMenus.xml"
default-menu-item-name="PartyAcctgPreference">
Modified:
ofbiz/trunk/applications/accounting/widget/ReportFinancialSummaryForms.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/ReportFinancialSummaryForms.xml?rev=803363&r1=803362&r2=803363&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/ReportFinancialSummaryForms.xml
(original)
+++ ofbiz/trunk/applications/accounting/widget/ReportFinancialSummaryForms.xml
Wed Aug 12 04:54:50 2009
@@ -453,4 +453,50 @@
</field>
<field name="submitButton" title="${uiLabelMap.CommonSubmit}"
widget-style="smallSubmit" tooltip="Please enter From and Thru date or select
financial time period in fields above"><submit button-type="button"/></field>
</form>
+
+ <form name="InventoryValuation" type="single" target="InventoryValuation"
header-row-style="header-row" default-table-style="basic-table">
+ <field name="facilityId" position="1">
+ <drop-down allow-empty="true">
+ <entity-options entity-name="Facility"
description="${facilityName}">
+ <entity-constraint name="ownerPartyId" operator="equals"
env-name="organizationPartyId"/>
+ <entity-order-by field-name="facilityId"/>
+ </entity-options>
+ </drop-down>
+ </field>
+ <field name="cogsMethodId" position="2">
+ <drop-down allow-empty="false">
+ <!--TODO for now Average Cost is being calculated-->
+ <!--<entity-options entity-name="Enumeration"
description="${description}" key-field-name="enumId">
+ <entity-constraint name="enumTypeId" operator="equals"
value="COGS_METHODS"/>
+ <entity-order-by field-name="description"/>
+ </entity-options>-->
+ <option key="COGS_AVG_COST"
description="${uiLabelMap.ProductAverageCost}"/>
+ </drop-down>
+ </field>
+ <field name="productId" position="1"><lookup
target-form-name="LookupProduct"/></field>
+ <field name="productCategoryId" position="2"><lookup
target-form-name="LookupProductCategory"/></field>
+ <field name="fromDate" position="1"><date-time/></field>
+ <field name="thruDate" position="2"><date-time/></field>
+ <field name="organizationPartyId"><hidden/></field>
+ <field name="showSearchResults"><hidden value="Y"/><!-- if this isn't
there then with all fields empty no query will be done --></field>
+ <field name="submitButton" widget-style="smallSubmit"><submit
button-type="button"/></field>
+ </form>
+
+ <form name="InventoryValuationList" extends="ListInventoryAverageCosts"
extends-resource="component://product/webapp/facility/facility/FacilityForms.xml"
+ odd-row-style="alternate-row" default-table-style="basic-table
hover-bar" list-name="inventoryValuationList"
paginate-target="InventoryValuation">
+ <field name="productAverageCost"
use-when="currencyUomId!=null"><display type="currency"
currency="${currencyUomId}"/></field>
+ <field name="productAverageCost" use-when="currencyUomId==null"
title="${uiLabelMap.FormFieldTitle_unitCost}"><display
description="${uiLabelMap.ProductDifferentCurrencies}"/></field>
+ <field name="totalInventoryCost" use-when="currencyUomId!=null"
title="${uiLabelMap.CommonTotalValue}"><display type="currency"
currency="${currencyUomId}"/></field>
+ <field name="totalInventoryCost" use-when="currencyUomId==null"
title="${uiLabelMap.CommonTotalValue}"><display
description="${uiLabelMap.ProductDifferentCurrencies}"/></field>
+ </form>
+
+ <form name="InventoryValuationCsv" type="list"
list-name="inventoryValuationList" view-size="99999">
+ <field name="productId"
title="${uiLabelMap.AccountingProductId}"><display/></field>
+ <field name="totalQuantityOnHand"
title="${uiLabelMap.AccountingTotalQuantityOnHand}"><display/></field>
+ <field name="productAverageCost" use-when="currencyUomId!=null"
title="${uiLabelMap.FormFieldTitle_unitCost}" ><display type="currency"
currency="${currencyUomId}"/></field>
+ <field name="productAverageCost" use-when="currencyUomId==null"
title="${uiLabelMap.FormFieldTitle_unitCost}" ><display
description="${uiLabelMap.ProductDifferentCurrencies}"/></field>
+ <field name="totalInventoryCost" use-when="currencyUomId!=null"
title="${uiLabelMap.CommonTotalValue}" ><display type="currency"
currency="${currencyUomId}"/></field>
+ <field name="totalInventoryCost" use-when="currencyUomId==null"
title="${uiLabelMap.CommonTotalValue}"><display
description="${uiLabelMap.ProductDifferentCurrencies}"/></field>
+ </form>
+
</forms>
Modified:
ofbiz/trunk/applications/accounting/widget/ReportFinancialSummaryScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/ReportFinancialSummaryScreens.xml?rev=803363&r1=803362&r2=803363&view=diff
==============================================================================
---
ofbiz/trunk/applications/accounting/widget/ReportFinancialSummaryScreens.xml
(original)
+++
ofbiz/trunk/applications/accounting/widget/ReportFinancialSummaryScreens.xml
Wed Aug 12 04:54:50 2009
@@ -1107,4 +1107,109 @@
</widgets>
</section>
</screen>
+
+ <screen name="InventoryValuation">
+ <section>
+ <actions>
+ <set field="labelTitleProperty"
value="AccountingInventoryValuation"/>
+ <set field="tabButtonItem"
value="OrganizationAccountingReports"/>
+ </actions>
+ <widgets>
+ <decorator-screen
name="CommonOrganizationAccountingReportsDecorator"
location="${parameters.mainDecoratorLocation}">
+ <decorator-section name="body">
+ <decorator-screen name="FindScreenDecorator"
location="component://common/widget/CommonScreens.xml">
+ <decorator-section name="search-options">
+ <include-form name="InventoryValuation"
location="component://accounting/widget/ReportFinancialSummaryForms.xml"/>
+ </decorator-section>
+ <decorator-section name="search-results">
+ <section>
+ <condition>
+ <if-compare
field="parameters.showSearchResults" operator="equals" value="Y"/>
+ </condition>
+ <actions>
+ <service
service-name="getInventoryValuationList" result-map="inventoryValuation"/>
+ <set field="inventoryValuationList"
from-field="inventoryValuation.inventoryValuationList" type="List"/>
+ </actions>
+ <widgets>
+ <section>
+ <condition>
+ <not><if-empty
field="inventoryValuationList"/></not>
+ </condition>
+ <widgets>
+ <link
text="${uiLabelMap.AccountingExportAsPdf}" style="button"
target="InventoryValuation.pdf">
+ <parameter
param-name="organizationPartyId" from-field="parameters.organizationPartyId"/>
+ <parameter
param-name="facilityId" from-field="parameters.facilityId"/>
+ <parameter
param-name="productId" from-field="parameters.productId"/>
+ <parameter
param-name="productCategoryId" from-field="parameters.productCategoryId"/>
+ <parameter
param-name="fromDate" from-field="parameters.fromDate"/>
+ <parameter
param-name="thruDate" from-field="parameters.thruDate"/>
+ <parameter
param-name="cogsMethodId" from-field="parameters.cogsMethodId"/>
+ </link>
+ <link
text="${uiLabelMap.AccountingExportAsCsv}" style="button"
target="InventoryValuation.csv">
+ <parameter
param-name="organizationPartyId" from-field="parameters.organizationPartyId"/>
+ <parameter
param-name="facilityId" from-field="parameters.facilityId"/>
+ <parameter
param-name="productId" from-field="parameters.productId"/>
+ <parameter
param-name="productCategoryId" from-field="parameters.productCategoryId"/>
+ <parameter
param-name="fromDate" from-field="parameters.fromDate"/>
+ <parameter
param-name="thruDate" from-field="parameters.thruDate"/>
+ <parameter
param-name="cogsMethodId" from-field="parameters.cogsMethodId"/>
+ </link>
+ <screenlet
title="${uiLabelMap.AccountingInventoryValuationList}">
+ <include-form
name="InventoryValuationList"
location="component://accounting/widget/ReportFinancialSummaryForms.xml"/>
+ </screenlet>
+ </widgets>
+ <fail-widgets>
+ <label
style="h3">${uiLabelMap.AccountingNoRecordFound}</label>
+ </fail-widgets>
+ </section>
+ </widgets>
+ </section>
+ </decorator-section>
+ </decorator-screen>
+ </decorator-section>
+ </decorator-screen>
+ </widgets>
+ </section>
+ </screen>
+ <screen name="InventoryValuationPdf">
+ <section>
+ <actions>
+ <property-map resource="CommonUiLabels" map-name="uiLabelMap"
global="true"/>
+ <property-map resource="AccountingUiLabels"
map-name="uiLabelMap" global="true"/>
+ <property-map resource="ProductUiLabels" map-name="uiLabelMap"
global="true"/>
+ <set field="organizationPartyId"
from-field="parameters.organizationPartyId"/>
+ <service service-name="getInventoryValuationList"
result-map="inventoryValuation"/>
+ <set field="inventoryValuationList"
from-field="inventoryValuation.inventoryValuationList" type="List"/>
+ </actions>
+ <widgets>
+ <decorator-screen name="SimpleDecorator"
location="component://common/widget/CommonScreens.xml">
+ <decorator-section name="body">
+ <platform-specific>
+ <xsl-fo>
+ <html-template
location="component://accounting/webapp/accounting/reports/InventoryValuationReport.fo.ftl"/>
+ </xsl-fo>
+ </platform-specific>
+ </decorator-section>
+ </decorator-screen>
+ </widgets>
+ </section>
+ </screen>
+ <screen name="InventoryValuationCsv">
+ <section>
+ <actions>
+ <property-map resource="CommonUiLabels" map-name="uiLabelMap"
global="true"/>
+ <property-map resource="AccountingUiLabels"
map-name="uiLabelMap" global="true"/>
+ <property-map resource="ProductUiLabels" map-name="uiLabelMap"
global="true"/>
+ <set field="organizationPartyId"
from-field="parameters.organizationPartyId"/>
+ <service service-name="getInventoryValuationList"
result-map="inventoryValuation"/>
+ <set field="inventoryValuationList"
from-field="inventoryValuation.inventoryValuationList" type="List"/>
+ </actions>
+ <widgets>
+ <container>
+ <include-form name="InventoryValuationCsv"
location="component://accounting/widget/ReportFinancialSummaryForms.xml"/>
+ </container>
+ </widgets>
+ </section>
+ </screen>
+
</screens>