Author: jacopoc
Date: Thu Jan 14 10:59:44 2010
New Revision: 899158
URL: http://svn.apache.org/viewvc?rev=899158&view=rev
Log:
Implemented form to list, in the fixed asset depreciation screen, the
accounting transactions created for the fixed asset.
Fixed a couple of invalid simple method operations I committed in my last
commit.
Modified:
ofbiz/trunk/applications/accounting/entitydef/entitymodel.xml
ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/fixedasset/FixedAssetServices.xml
ofbiz/trunk/applications/accounting/widget/FixedAssetForms.xml
ofbiz/trunk/applications/accounting/widget/FixedAssetScreens.xml
Modified: ofbiz/trunk/applications/accounting/entitydef/entitymodel.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/entitydef/entitymodel.xml?rev=899158&r1=899157&r2=899158&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/entitydef/entitymodel.xml (original)
+++ ofbiz/trunk/applications/accounting/entitydef/entitymodel.xml Thu Jan 14
10:59:44 2010
@@ -1787,6 +1787,7 @@
<alias entity-alias="ATR" name="receiptId"/>
<alias entity-alias="ATR" name="inventoryItemId"/>
<alias entity-alias="ATR" name="workEffortId"/>
+ <alias entity-alias="ATR" name="fixedAssetId"/>
<alias entity-alias="ATR" name="physicalInventoryId"/>
<alias entity-alias="ATE" name="acctgTransId"/>
<alias entity-alias="ATE" name="acctgTransEntrySeqId"/>
Modified:
ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/fixedasset/FixedAssetServices.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/fixedasset/FixedAssetServices.xml?rev=899158&r1=899157&r2=899158&view=diff
==============================================================================
---
ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/fixedasset/FixedAssetServices.xml
(original)
+++
ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/fixedasset/FixedAssetServices.xml
Thu Jan 14 10:59:44 2010
@@ -592,7 +592,7 @@
</calcop>
</calculate>
<calculate field="depreciationTotal">
- <calcop operator="sum">
+ <calcop operator="add">
<calcop operator="get" field="depreciationTotal"/>
<calcop operator="get" field="depreciation"/>
</calcop>
@@ -677,7 +677,7 @@
</calcop>
</calculate>
<calculate field="depreciationTotal">
- <calcop operator="sum">
+ <calcop operator="add">
<calcop operator="get" field="depreciationTotal"/>
<calcop operator="get" field="depreciation"/>
</calcop>
Modified: ofbiz/trunk/applications/accounting/widget/FixedAssetForms.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/FixedAssetForms.xml?rev=899158&r1=899157&r2=899158&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/FixedAssetForms.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/FixedAssetForms.xml Thu Jan 14
10:59:44 2010
@@ -624,4 +624,27 @@
<field name="depreciationTotal"><display type="currency"
currency="${fixedAsset.purchaseCostUomId}"/></field>
<field name="nbv" title="Net Book Value"><display type="currency"
currency="${fixedAsset.purchaseCostUomId}"/></field>
</form>
+ <form name="FixedAssetTransactions" type="list"
+ odd-row-style="alternate-row" header-row-style="header-row-2"
default-table-style="basic-table hover-bar">
+ <actions>
+ <entity-condition entity-name="AcctgTransAndEntries"
list="fixedAssetTransactions">
+ <condition-expr field-name="fixedAssetId"
from-field="fixedAssetId"/>
+ <order-by field-name="transactionDate"/>
+ <order-by field-name="debitCreditFlag"/>
+ </entity-condition>
+ </actions>
+ <field name="acctgTransId" widget-style="buttontext">
+ <hyperlink target="EditAcctgTrans" description="${acctgTransId}"
also-hidden="false">
+ <parameter param-name="acctgTransId"/>
+ <parameter param-name="organizationPartyId"/>
+ </hyperlink>
+ </field>
+ <field name="transTypeDescription"><display/></field>
+ <field name="transactionDate"><display/></field>
+ <field name="accountCode"><display/></field>
+ <field name="accountName"><display/></field>
+ <field name="amount"><display type="currency"
currency="${currency}"/></field>
+ <field name="debitCreditFlag"><display/></field>
+ <field name="isPosted"><display/></field>
+ </form>
</forms>
Modified: ofbiz/trunk/applications/accounting/widget/FixedAssetScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/FixedAssetScreens.xml?rev=899158&r1=899157&r2=899158&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/FixedAssetScreens.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/FixedAssetScreens.xml Thu Jan 14
10:59:44 2010
@@ -524,6 +524,7 @@
<include-form
name="AddFixedAssetDepMethod"
location="component://accounting/widget/FixedAssetForms.xml"/>
<include-form
name="ListFixedAssetDepMethods"
location="component://accounting/widget/FixedAssetForms.xml"/>
<include-form
name="ListFixedAssetDepreciations"
location="component://accounting/widget/FixedAssetForms.xml"/>
+ <include-form
name="FixedAssetTransactions"
location="component://accounting/widget/FixedAssetForms.xml"/>
</screenlet>
</widgets>
</section>
