pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[MERGE] merge pap branch for uk charts account with report_type field added

Browse Source 
bzr revid: mra@mra-laptop-20100609114946-f80wyzl0nlk9ip0i
This commit is contained in:
Mustufa Rangwala
2010-06-09 17:19:46 +05:30
parent 3d34dcfe0c 9b74beae29
commit 977e3f7b13
2 changed files with 84 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/l10n_chart_uk_minimal/account_chart.xml
+60 -24
View File
@@ -21,17 +21,35 @@
<field name="type">view</field>
<field name="user_type" ref="account_type_view"/>
</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"/>
</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"/>
</record>
<record id="fas" model="account.account.template">
<field name="code">10</field>
<field name="code">100</field>
<field name="name">Fixed Assets</field>
<field ref="bal" name="parent_id"/>
<field ref="assets_view" name="parent_id"/>
<field name="type">view</field>
<field name="user_type" ref="account_type_view"/>
</record>
<record id="xfa" model="account.account.template">
<field name="code">100</field>
<field name="code">1000</field>
<field name="name">Fixed Asset Account</field>
<field ref="fas" name="parent_id"/>
<field name="type">other</field>
@@ -39,15 +57,15 @@
</record>
<record id="nca" model="account.account.template">
<field name="code">11</field>
<field name="code">101</field>
<field name="name">Net Current Assets</field>
<field ref="bal" name="parent_id"/>
<field ref="assets_view" name="parent_id"/>
<field name="type">view</field>
<field name="user_type" ref="account_type_view"/>
</record>
<record id="cas" model="account.account.template">
<field name="code">110</field>
<field name="code">1100</field>
<field name="name">Current Assets</field>
<field ref="nca" name="parent_id"/>
<field name="type">view</field>
@@ -55,7 +73,7 @@
</record>
<record id="stk" model="account.account.template">
<field name="code">1101</field>
<field name="code">11001</field>
<field name="name">Purchased Stocks</field>
<field ref="cas" name="parent_id"/>
<field name="type">other</field>
@@ -63,7 +81,7 @@
</record>
<record id="a_recv" model="account.account.template">
<field name="code">1102</field>
<field name="code">11002</field>
<field name="name">Debtors</field>
<field ref="cas" name="parent_id"/>
<field name="type">receivable</field>
@@ -76,7 +94,7 @@
</record> -->
<record id="ova" model="account.account.template">
<field name="code">1103</field>
<field name="code">11003</field>
<field name="name">Output VAT</field>
<field ref="cas" name="parent_id"/>
<field name="type">other</field>
@@ -84,7 +102,7 @@
</record>
<record id="bnk" model="account.account.template">
<field name="code">1104</field>
<field name="code">11004</field>
<field name="name">Bank Current Account</field>
<field ref="cas" name="parent_id"/>
<field name="type">other</field>
@@ -92,7 +110,7 @@
</record>
<record id="cash" model="account.account.template">
<field name="code">1105</field>
<field name="code">11005</field>
<field name="name">Cash</field>
<field ref="cas" name="parent_id"/>
<field name="type">other</field>
@@ -100,9 +118,9 @@
</record>
<record id="cli" model="account.account.template">
<field name="code">111</field>
<field name="code">110</field>
<field name="name">Current Liabilities</field>
<field ref="nca" name="parent_id"/>
<field ref="liabilities_view" name="parent_id"/>
<field name="type">view</field>
<field name="user_type" ref="account_type_view"/>
</record>
@@ -137,17 +155,35 @@
<field name="type">view</field>
<field name="user_type" ref="account_type_view"/>
</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"/>
</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"/>
</record>
<record id="rev" model="account.account.template">
<field name="code">20</field>
<field name="code">200</field>
<field name="name">Revenue</field>
<field ref="gpf" name="parent_id"/>
<field ref="income_view" name="parent_id"/>
<field name="type">view</field>
<field name="user_type" ref="account_type_view"/>
</record>
<record id="a_sale" model="account.account.template">
<field name="code">200</field>
<field name="code">2001</field>
<field name="name">Product Sales</field>
<field ref="rev" name="parent_id"/>
<field name="type">other</field>
@@ -159,15 +195,15 @@
</record> -->
<record id="cos" model="account.account.template">
<field name="code">21</field>
<field name="code">210</field>
<field name="name">Cost of Sales</field>
<field ref="gpf" name="parent_id"/>
<field ref="expense_view" name="parent_id"/>
<field name="type">view</field>
<field name="user_type" ref="account_type_view"/>
</record>
<record id="cog" model="account.account.template">
<field name="code">210</field>
<field name="code">2100</field>
<field name="name">Cost of Goods Sold</field>
<field ref="cos" name="parent_id"/>
<field name="type">other</field>
@@ -175,15 +211,15 @@
</record>
<record id="ovr" model="account.account.template">
<field name="code">22</field>
<field name="code">211</field>
<field name="name">Overheads</field>
<field ref="gpf" name="parent_id"/>
<field ref="expense_view" name="parent_id"/>
<field name="type">view</field>
<field name="user_type" ref="account_type_view"/>
</record>
<record id="a_expense" model="account.account.template">
<field name="code">220</field>
<field name="code">2110</field>
<field name="name">Expenses</field>
<field ref="ovr" name="parent_id"/>
<field name="type">other</field>
addons/l10n_chart_uk_minimal/account_types.xml
+24 -1
View File
@@ -19,17 +19,39 @@
<field name="code">view</field>
<field name="close_method">none</field>
</record>
<record model="account.account.type" id="acct_type_income_view">
<field name="name">Income View</field>
<field name="code">view</field>
<field name="report_type">income</field>
</record>
<record model="account.account.type" id="acct_type_expense_view">
<field name="name">Expense View</field>
<field name="code">expense</field>
<field name="report_type">expense</field>
</record>
<record model="account.account.type" id="acct_type_asset_view">
<field name="name">Asset View</field>
<field name="code">asset</field>
<field name="report_type">asset</field>
</record>
<record model="account.account.type" id="acct_type_liability_view">
<field name="name">Liability View</field>
<field name="code">liability</field>
<field name="report_type">liability</field>
</record>
<record model="account.account.type" id="account_type_income" >
<field name="name">Income</field>
<field name="code">income</field>
<field name="close_method">none</field>
<field name="report_type">income</field>
</record>
<record model="account.account.type" id="account_type_expense">
<field name="name">Expense</field>
<field name="code">expense</field>
<field name="close_method">none</field>
<field name="report_type">expense</field>
</record>
<record model="account.account.type" id="account_type_tax">
@@ -48,6 +70,7 @@
<field name="name">Asset</field>
<field name="code">asset</field>
<field name="close_method">balance</field>
<field name="report_type">asset</field>
</record>
<record model="account.account.type" id="account_type_equity">