From 25d12e8be4930a8a945957867d723c203f2d4349 Mon Sep 17 00:00:00 2001
From: "pap (openerp)" <pap@tinyerp.co.in>
Date: Wed, 9 Jun 2010 11:22:44 +0530
Subject: [PATCH 1/2] [IMP]:improved chart for l10n_chart_uk_minimal

bzr revid: pap@tinyerp.co.in-20100609055244-izitjr3t0svdajv3
---
 .../l10n_chart_uk_minimal/account_chart.xml   | 84 +++++++++++++------
 1 file changed, 60 insertions(+), 24 deletions(-)

diff --git a/addons/l10n_chart_uk_minimal/account_chart.xml b/addons/l10n_chart_uk_minimal/account_chart.xml
index a08b7dbb1b2..f8005edf2de 100644
--- a/addons/l10n_chart_uk_minimal/account_chart.xml
+++ b/addons/l10n_chart_uk_minimal/account_chart.xml
@@ -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="account_type_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="account_type_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="account_type_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="account_type_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>

From 9b74beae2923b7b41dc4202806b4477aca4d0d3e Mon Sep 17 00:00:00 2001
From: "pap (openerp)" <pap@tinyerp.co.in>
Date: Wed, 9 Jun 2010 14:46:56 +0530
Subject: [PATCH 2/2] [IMP]: added new account types

bzr revid: pap@tinyerp.co.in-20100609091656-8s5thphyf3dnmj4m
---
 .../l10n_chart_uk_minimal/account_chart.xml   |  8 +++---
 .../l10n_chart_uk_minimal/account_types.xml   | 25 ++++++++++++++++++-
 2 files changed, 28 insertions(+), 5 deletions(-)

diff --git a/addons/l10n_chart_uk_minimal/account_chart.xml b/addons/l10n_chart_uk_minimal/account_chart.xml
index f8005edf2de..32ee1cdc0df 100644
--- a/addons/l10n_chart_uk_minimal/account_chart.xml
+++ b/addons/l10n_chart_uk_minimal/account_chart.xml
@@ -26,7 +26,7 @@
                 <field name="name">Assets</field>
                 <field name="code">10</field>
                 <field name="type">view</field>
-                <field name="user_type" ref="account_type_view"/>
+                <field name="user_type" ref="acct_type_asset_view"/>
                 <field name="reconcile" eval="False"/>
                 <field name="parent_id" ref="bal"/>
         </record>
@@ -35,7 +35,7 @@
                 <field name="name">Liabilities</field>
                 <field name="code">11</field>
                 <field name="type">view</field>
-                <field name="user_type" ref="account_type_view"/>
+                <field name="user_type" ref="acct_type_liability_view"/>
                 <field name="reconcile" eval="False"/>
                 <field name="parent_id" ref="bal"/>
         </record>
@@ -160,7 +160,7 @@
                 <field name="name">Income</field>
                 <field name="code">20</field>
                 <field name="type">view</field>
-                <field name="user_type" ref="account_type_view"/>
+                <field name="user_type" ref="acct_type_income_view"/>
                 <field name="reconcile" eval="False"/>
                 <field name="parent_id" ref="gpf"/>
         </record>
@@ -169,7 +169,7 @@
                 <field name="name">Expense</field>
                 <field name="code">21</field>
                 <field name="type">view</field>
-                <field name="user_type" ref="account_type_view"/>
+                <field name="user_type" ref="acct_type_expense_view"/>
                 <field name="reconcile" eval="False"/>
                 <field name="parent_id" ref="gpf"/>
         </record>
diff --git a/addons/l10n_chart_uk_minimal/account_types.xml b/addons/l10n_chart_uk_minimal/account_types.xml
index 51040cadbbd..adecc45c228 100644
--- a/addons/l10n_chart_uk_minimal/account_types.xml
+++ b/addons/l10n_chart_uk_minimal/account_types.xml
@@ -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">