From 81f7f56b980aaac9add594931e5e8780d3a3d8cb Mon Sep 17 00:00:00 2001
From: Mantavya Gajjar <mga@tinyerp.com>
Date: Wed, 14 Jul 2010 15:15:26 +0530
Subject: [PATCH] [FIX]: accounting: improvemn in account chart

bzr revid: mga@tinyerp.com-20100714094526-u9595az9vvpkab5n
---
 addons/account/demo/account_minimal.xml       | 67 ++++++++++++-------
 .../l10n_chart_uk_minimal/account_chart.xml   | 67 ++++++++++++-------
 2 files changed, 84 insertions(+), 50 deletions(-)

diff --git a/addons/account/demo/account_minimal.xml b/addons/account/demo/account_minimal.xml
index abae5562b2c..e18dab2d332 100644
--- a/addons/account/demo/account_minimal.xml
+++ b/addons/account/demo/account_minimal.xml
@@ -82,21 +82,21 @@
         </record>
         
         <record model="account.account" id="assets_view">
-                <field name="name">Assets - (test)</field>
-                <field name="code">X10</field>
-                <field name="type">view</field>
-                <field name="user_type" ref="account_type_asset"/>
-                <field name="reconcile" eval="False"/>
-                <field name="parent_id" ref="bal"/>
+            <field name="name">Assets - (test)</field>
+            <field name="code">X10</field>
+            <field name="type">view</field>
+            <field name="user_type" ref="account_type_asset"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="bal"/>
         </record>
         
         <record model="account.account" id="liabilities_view">
-                <field name="name">Liabilities - (test)</field>
-                <field name="code">X11</field>
-                <field name="type">view</field>
-                <field name="user_type" ref="account_type_liability"/>
-                <field name="reconcile" eval="False"/>
-                <field name="parent_id" ref="bal"/>
+            <field name="name">Liabilities - (test)</field>
+            <field name="code">X11</field>
+            <field name="type">view</field>
+            <field name="user_type" ref="account_type_liability"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="bal"/>
         </record>
             
         <record id="fas" model="account.account">
@@ -208,23 +208,32 @@
         </record>
         
         <record model="account.account" id="income_view">
-                <field name="name">Income - (test)</field>
-                <field name="code">X20</field>
-                <field name="type">view</field>
-                <field name="user_type" ref="account_type_income"/>
-                <field name="reconcile" eval="False"/>
-                <field name="parent_id" ref="gpf"/>
+            <field name="name">Income - (test)</field>
+            <field name="code">X20</field>
+            <field name="type">view</field>
+            <field name="user_type" ref="account_type_income"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="gpf"/>
+        </record>
+        
+        <record model="account.account" id="income_fx_income">
+            <field name="name">Foreign Exchange Gain - (test)</field>
+            <field name="code">X201</field>
+            <field name="type">other</field>
+            <field name="user_type" ref="account_type_income"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="income_view"/>
         </record>
         
         <record model="account.account" id="expense_view">
-                <field name="name">Expense - (test)</field>
-                <field name="code">X21</field>
-                <field name="type">view</field>
-                <field name="user_type" ref="account_type_expense"/>
-                <field name="reconcile" eval="False"/>
-                <field name="parent_id" ref="gpf"/>
+            <field name="name">Expense - (test)</field>
+            <field name="code">X21</field>
+            <field name="type">view</field>
+            <field name="user_type" ref="account_type_expense"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="gpf"/>
         </record>
-            
+        
         <record id="rev" model="account.account">
             <field name="code">X200</field>        
             <field name="name">Revenue - (test)</field>
@@ -273,6 +282,14 @@
             <field name="user_type" ref="account_type_expense"/>
         </record>
         
+        <record model="account.account" id="income_fx_expense">
+            <field name="name">Foreign Exchange Loss - (test)</field>
+            <field name="code">X2111</field>
+            <field name="type">other</field>
+            <field name="user_type" ref="account_type_expense"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="ovr"/>
+        </record>
         
         <!-- Properties -->
         <record forcecreate="True" id="property_account_receivable" model="ir.property">
diff --git a/addons/l10n_chart_uk_minimal/account_chart.xml b/addons/l10n_chart_uk_minimal/account_chart.xml
index 804568afecc..17eae399ef8 100644
--- a/addons/l10n_chart_uk_minimal/account_chart.xml
+++ b/addons/l10n_chart_uk_minimal/account_chart.xml
@@ -22,21 +22,21 @@
         </record>
         
         <record model="account.account.template" id="assets_view">
-                <field name="name">Assets</field>
-                <field name="code">10</field>
-                <field name="type">view</field>
-                <field name="user_type" ref="acct_type_asset_view"/>
-                <field name="reconcile" eval="False"/>
-                <field name="parent_id" ref="bal"/>
+            <field name="name">Assets</field>
+            <field name="code">10</field>
+            <field name="type">view</field>
+            <field name="user_type" ref="acct_type_asset_view"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="bal"/>
         </record>
         
         <record model="account.account.template" id="liabilities_view">
-                <field name="name">Liabilities</field>
-                <field name="code">11</field>
-                <field name="type">view</field>
-                <field name="user_type" ref="acct_type_liability_view"/>
-                <field name="reconcile" eval="False"/>
-                <field name="parent_id" ref="bal"/>
+            <field name="name">Liabilities</field>
+            <field name="code">11</field>
+            <field name="type">view</field>
+            <field name="user_type" ref="acct_type_liability_view"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="bal"/>
         </record>
             
         <record id="fas" model="account.account.template">
@@ -156,21 +156,30 @@
         </record>
         
         <record model="account.account.template" id="income_view">
-                <field name="name">Income</field>
-                <field name="code">20</field>
-                <field name="type">view</field>
-                <field name="user_type" ref="acct_type_income_view"/>
-                <field name="reconcile" eval="False"/>
-                <field name="parent_id" ref="gpf"/>
+            <field name="name">Income</field>
+            <field name="code">20</field>
+            <field name="type">view</field>
+            <field name="user_type" ref="acct_type_income_view"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="gpf"/>
+        </record>
+        
+        <record model="account.account.template" id="income_fx_income">
+            <field name="name">Foreign Exchange Gain</field>
+            <field name="code">X201</field>
+            <field name="type">other</field>
+            <field name="user_type" ref="acct_type_income_view"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="income_view"/>
         </record>
         
         <record model="account.account.template" id="expense_view">
-                <field name="name">Expense</field>
-                <field name="code">21</field>
-                <field name="type">view</field>
-                <field name="user_type" ref="acct_type_expense_view"/>
-                <field name="reconcile" eval="False"/>
-                <field name="parent_id" ref="gpf"/>
+            <field name="name">Expense</field>
+            <field name="code">21</field>
+            <field name="type">view</field>
+            <field name="user_type" ref="acct_type_expense_view"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="gpf"/>
         </record>
             
         <record id="rev" model="account.account.template">
@@ -225,10 +234,18 @@
             <field name="user_type" ref="account_type_expense"/>
         </record>
         
+        <record model="account.account.template" id="income_fx_expense">
+            <field name="name">Foreign Exchange Loss - (test)</field>
+            <field name="code">X2111</field>
+            <field name="type">other</field>
+            <field name="user_type" ref="account_type_expense"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="ovr"/>
+        </record>
+        
         <!-- <record id="account.property_account_expense_categ" model="ir.property">
             <field eval="'account.account,'+str(a_expense)" name="value"/>
         </record> -->
         
-
     </data>
 </openerp>