[ADD][FIX][IMP] account: added property field for reserve & surplus account reference...

bzr revid: vra@tinyerp.com-20100813141406-4a5m4jty2g873r7o

diff --git a/addons/account/account.py b/addons/account/account.py
index 52bee77..8b7d286 100644 (file)
--- a/addons/account/account.py
+++ b/addons/account/account.py
@@ -2342,6 +2342,7 @@ class account_chart_template(osv.osv):
         'property_account_income_categ': fields.many2one('account.account.template','Income Category Account'),
         'property_account_expense': fields.many2one('account.account.template','Expense Account on Product Template'),
         'property_account_income': fields.many2one('account.account.template','Income Account on Product Template'),
+        'property_reserve_and_surplus_account': fields.many2one('account.account.template', 'Reserve and Surplus Account', domain=[('type', '=', 'payable')] , help='This Account is used for trasfering Profit/Loss(If It is Profit : Amount will be added, Loss : Amount will be duducted.), Which is calculated from Profilt & Loss Report'),
     }
 
 account_chart_template()
@@ -2725,7 +2726,8 @@ class wizard_multi_charts_accounts(osv.osv_memory):
             ('property_account_expense_categ','product.category','account.account'),
             ('property_account_income_categ','product.category','account.account'),
             ('property_account_expense','product.template','account.account'),
-            ('property_account_income','product.template','account.account')
+            ('property_account_income','product.template','account.account'),
+            ('property_reserve_and_surplus_account','res.company','account.account')
         ]
         for record in todo_list:
             r = []
@@ -2738,6 +2740,7 @@ class wizard_multi_charts_accounts(osv.osv_memory):
                 'fields_id': field[0],
                 'value': account and 'account.account,'+str(acc_template_ref[account.id]) or False,
             }
+            
             if r:
                 #the property exist: modify it
                 property_obj.write(cr, uid, r, vals)

diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index 31d4b39..ae458a0 100644 (file)
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -2080,6 +2080,7 @@
                     <field name="property_account_income_categ"/>
                     <field name="property_account_expense"/>
                     <field name="property_account_income"/>
+                    <field name="property_reserve_and_surplus_account"/>
                     </group>
                 </form>
             </field>

diff --git a/addons/account/company.py b/addons/account/company.py
index 613c702..ec10661 100644 (file)
--- a/addons/account/company.py
+++ b/addons/account/company.py
@@ -25,6 +25,15 @@ class res_company(osv.osv):
     _inherit = "res.company"
     _columns = {
         'overdue_msg' : fields.text('Overdue Payments Message', translate=True),
+        'property_reserve_and_surplus_account': fields.property(
+            'account.account',
+            type='many2one',
+            relation='account.account',
+            string="Reserve and Surplus Account",
+            method=True,
+            view_load=True,
+            domain="[('type', '=', 'payable')]",
+            help="This Account is used for trasfering Profit/Loss(If It is Profit : Amount will be added, Loss : Amount will be duducted.), Which is calculated from Profilt & Loss Report"),
     }
 
     _defaults = {

diff --git a/addons/account/company_view.xml b/addons/account/company_view.xml
index 7892fce..a3a1ec0 100644 (file)
--- a/addons/account/company_view.xml
+++ b/addons/account/company_view.xml
@@ -15,5 +15,21 @@
              </notebook>
             </field>
         </record>
+        
+        <record model="ir.ui.view" id="view_company_inherit_1_form">
+            <field name="name">res.company.form.inherit</field>
+            <field name="inherit_id" ref="base.view_company_form"/>
+            <field name="model">res.company</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <page string="Configuration" position="inside">
+                  <group col="2" colspan="2">
+                      <separator string="Reserve And Surplus Account" colspan="2"/>
+                      <field name="property_reserve_and_surplus_account" colspan="2"/>
+                  </group>
+                </page>
+            </field>
+        </record>
+
     </data>
 </openerp>

diff --git a/addons/account/configurable_account_chart.xml b/addons/account/configurable_account_chart.xml
index b9e063d..053b842 100644 (file)
--- a/addons/account/configurable_account_chart.xml
+++ b/addons/account/configurable_account_chart.xml
@@ -2,16 +2,18 @@
 <openerp>
     <data>
 
-         <!-- Types -->
-     <record model="account.account.type" id="conf_account_type_receivable" >
+        <!-- Types -->
+       <record model="account.account.type" id="conf_account_type_receivable" >
           <field name="name">Receivable</field>
           <field name="code">receivable</field>
+          <field name="report_type">income</field>
           <field name="close_method">unreconciled</field>
         </record>
 
         <record model="account.account.type" id="conf_account_type_payable" >
           <field name="name">Payable</field>
           <field name="code">payable</field>
+          <field name="report_type">expense</field>
           <field name="close_method">unreconciled</field>
         </record>
 
@@ -21,50 +23,86 @@
           <field name="close_method">none</field>
         </record>
 
+            <record model="account.account.type" id="account_type_income_view1">
+               <field name="name">Income View</field>
+               <field name="code">view</field>
+               <field name="report_type">income</field>
+           </record>
+           <record model="account.account.type" id="account_type_expense_view1">
+               <field name="name">Expense View</field>
+               <field name="code">expense</field>
+               <field name="report_type">expense</field>
+           </record>
+           <record model="account.account.type" id="account_type_asset_view1">
+               <field name="name">Asset View</field>
+               <field name="code">asset</field>
+               <field name="report_type">asset</field>
+           </record>
+           <record model="account.account.type" id="account_type_liability_view1">
+               <field name="name">Liability View</field>
+               <field name="code">liability</field>
+               <field name="report_type">liability</field>
+           </record>
+
         <record model="account.account.type" id="conf_account_type_income" >
           <field name="name">Income</field>
           <field name="code">income</field>
+          <field name="report_type">income</field>
           <field name="close_method">none</field>
         </record>
 
         <record model="account.account.type" id="conf_account_type_expense">
           <field name="name">Expense</field>
           <field name="code">expense</field>
+          <field name="report_type">expense</field>
           <field name="close_method">none</field>
         </record>
 
         <record model="account.account.type" id="conf_account_type_tax">
           <field name="name">Tax</field>
           <field name="code">tax</field>
+          <field name="report_type">expense</field>
           <field name="close_method">unreconciled</field>
         </record>
 
         <record model="account.account.type" id="conf_account_type_cash">
           <field name="name">Cash</field>
           <field name="code">cash</field>
+          <field name="report_type">asset</field>
           <field name="close_method">balance</field>
         </record>
 
+        <record model="account.account.type" id="conf_account_type_liability">
+            <field name="name">Liability</field>
+            <field name="code">liability</field>
+            <field name="report_type">liability</field>
+            <field name="close_method">balance</field>
+        </record>
+
         <record model="account.account.type" id="conf_account_type_asset">
           <field name="name">Asset</field>
           <field name="code">asset</field>
+          <field name="report_type">asset</field>
           <field name="close_method">balance</field>
         </record>
 
         <record model="account.account.type" id="conf_account_type_equity">
           <field name="name">Equity</field>
           <field name="code">equity</field>
+          <field name="report_type">asset</field>
           <field name="close_method">balance</field>
         </record>
 
          <record model="account.account.type" id="conf_account_type_bnk">
           <field name="name">Bank</field>
           <field name="code">bank</field>
+          <field name="report_type">asset</field>
           <field name="close_method">balance</field>
         </record>
          <record model="account.account.type" id="conf_account_type_chk">
           <field name="name">Check</field>
           <field name="code">check</field>
+          <field name="report_type">asset</field>
           <field name="close_method">balance</field>
         </record>
 
@@ -79,183 +117,193 @@
             <field name="user_type" ref="conf_account_type_view"/>
         </record>
 
-        <!-- Balance Sheet -->
-
-        <record id="conf_bal" model="account.account.template">
-            <field name="code">1</field>
-            <field name="name">Balance Sheet</field>
-            <field ref="conf_chart0" name="parent_id"/>
-            <field name="type">view</field>
-            <field name="user_type" ref="conf_account_type_view"/>
-        </record>
-
-        <record id="conf_fas" model="account.account.template">
-            <field name="code">10</field>
-            <field name="name">Fixed Assets</field>
-            <field ref="conf_bal" name="parent_id"/>
-            <field name="type">view</field>
-            <field name="user_type" ref="conf_account_type_view"/>
-        </record>
-
-        <record id="conf_xfa" model="account.account.template">
-            <field name="code">100</field>
-            <field name="name">Fixed Asset Account</field>
-            <field ref="conf_fas" name="parent_id"/>
-            <field name="type">other</field>
-            <field name="user_type" ref="conf_account_type_asset"/>
-        </record>
-
-        <record id="conf_nca" model="account.account.template">
-            <field name="code">11</field>
-            <field name="name">Net Current Assets</field>
-            <field ref="conf_bal" name="parent_id"/>
-            <field name="type">view</field>
-            <field name="user_type" ref="conf_account_type_view"/>
-        </record>
-
-        <record id="conf_cas" model="account.account.template">
-            <field name="code">110</field>
-            <field name="name">Current Assets</field>
-            <field ref="conf_nca" name="parent_id"/>
-            <field name="type">view</field>
-            <field name="user_type" ref="conf_account_type_view"/>
-        </record>
-
-        <record id="conf_stk" model="account.account.template">
-            <field name="code">1101</field>
-            <field name="name">Purchased Stocks</field>
-            <field ref="conf_cas" name="parent_id"/>
-            <field name="type">other</field>
-            <field name="user_type" ref="conf_account_type_asset"/>
-        </record>
-
-        <record id="conf_a_recv" model="account.account.template">
-            <field name="code">1102</field>
-            <field name="name">Debtors</field>
-            <field ref="conf_cas" name="parent_id"/>
-            <field name="type">receivable</field>
-            <field eval="True" name="reconcile"/>
-            <field name="user_type" ref="conf_account_type_receivable"/>
-        </record>
-
-        <!-- <record id="account.property_account_receivable" model="ir.property">
-            <field eval="'account.account,'+str(a_recv)" name="value"/>
-        </record> -->
-
-        <record id="conf_ova" model="account.account.template">
-            <field name="code">1103</field>
-            <field name="name">Output VAT</field>
-            <field ref="conf_cas" name="parent_id"/>
-            <field name="type">other</field>
-            <field name="user_type" ref="conf_account_type_tax"/>
-        </record>
-
-        <record id="conf_bnk" model="account.account.template">
-            <field name="code">1104</field>
-            <field name="name">Bank Current Account</field>
-            <field ref="conf_cas" name="parent_id"/>
-            <field name="type">view</field>
-            <field name="user_type" ref="conf_account_type_cash"/>
-        </record>
-
-        <record id="conf_cash" model="account.account.template">
-            <field name="code">1105</field>
-            <field name="name">Cash</field>
-            <field ref="conf_cas" name="parent_id"/>
-            <field name="type">view</field>
-            <field name="user_type" ref="conf_account_type_cash"/>
-        </record>
-
-        <record id="conf_cli" model="account.account.template">
-            <field name="code">111</field>
-            <field name="name">Current Liabilities</field>
-            <field ref="conf_nca" name="parent_id"/>
-            <field name="type">view</field>
-            <field name="user_type" ref="conf_account_type_view"/>
-        </record>
-
-        <record id="conf_a_pay" model="account.account.template">
-            <field name="code">1111</field>
-            <field name="name">Creditors</field>
-            <field ref="conf_cli" name="parent_id"/>
-            <field name="type">payable</field>
-            <field eval="True" name="reconcile"/>
-            <field name="user_type" ref="conf_account_type_payable"/>
-        </record>
-
-        <!-- <record id="account.property_account_payable" model="ir.property">
-            <field eval="'account.account,'+str(a_pay)" name="value"/>
-        </record>-->
-
-        <record id="conf_iva" model="account.account.template">
-            <field name="code">1112</field>
-            <field name="name">Input VAT</field>
-            <field ref="conf_cli" name="parent_id"/>
-            <field name="type">other</field>
-            <field name="user_type" ref="conf_account_type_tax"/>
-        </record>
-
-        <!-- Profit and Loss -->
-
-        <record id="conf_gpf" model="account.account.template">
-            <field name="code">2</field>
-            <field name="name">Profit and Loss</field>
-            <field ref="conf_chart0" name="parent_id"/>
-            <field name="type">view</field>
-            <field name="user_type" ref="conf_account_type_view"/>
-        </record>
-
-        <record id="conf_rev" model="account.account.template">
-            <field name="code">20</field>
-            <field name="name">Revenue</field>
-            <field ref="conf_gpf" name="parent_id"/>
-            <field name="type">view</field>
-            <field name="user_type" ref="conf_account_type_view"/>
-        </record>
-
-        <record id="conf_a_sale" model="account.account.template">
-            <field name="code">200</field>
-            <field name="name">Product Sales</field>
-            <field ref="conf_rev" name="parent_id"/>
-            <field name="type">other</field>
-            <field name="user_type" ref="conf_account_type_income"/>
-        </record>
-
-        <!-- <record id="account.property_account_income_categ" model="ir.property">
-            <field eval="'account.account,'+str(a_sale)" name="value"/>
-        </record> -->
-
-        <record id="conf_cos" model="account.account.template">
-            <field name="code">21</field>
-            <field name="name">Cost of Sales</field>
-            <field ref="conf_gpf" name="parent_id"/>
-            <field name="type">view</field>
-            <field name="user_type" ref="conf_account_type_view"/>
-        </record>
-
-        <record id="conf_cog" model="account.account.template">
-            <field name="code">210</field>
-            <field name="name">Cost of Goods Sold</field>
-            <field ref="conf_cos" name="parent_id"/>
-            <field name="type">other</field>
-            <field name="user_type" ref="conf_account_type_expense"/>
-        </record>
-
-        <record id="conf_ovr" model="account.account.template">
-            <field name="code">22</field>
-            <field name="name">Overheads</field>
-            <field ref="conf_gpf" name="parent_id"/>
-            <field name="type">view</field>
-            <field name="user_type" ref="conf_account_type_view"/>
-        </record>
-
-        <record id="conf_a_expense" model="account.account.template">
-            <field name="code">220</field>
-            <field name="name">Expenses</field>
-            <field ref="conf_ovr" name="parent_id"/>
-            <field name="type">other</field>
-            <field name="user_type" ref="conf_account_type_expense"/>
-        </record>
+               <!-- Balance Sheet -->
+
+               <record id="conf_bal" model="account.account.template">
+                   <field name="code">1</field>
+                   <field name="name">Balance Sheet</field>
+                   <field ref="conf_chart0" name="parent_id"/>
+                   <field name="type">view</field>
+                   <field name="user_type" ref="conf_account_type_view"/>
+               </record>
+       
+                       <record id="conf_fas" model="account.account.template">
+                           <field name="code">10</field>
+                           <field name="name">Fixed Assets</field>
+                           <field ref="conf_bal" name="parent_id"/>
+                           <field name="type">view</field>
+                           <field name="user_type" ref="account_type_asset_view1"/>
+                       </record>
+               
+                               <record id="conf_xfa" model="account.account.template">
+                                   <field name="code">100</field>
+                                   <field name="name">Fixed Asset Account</field>
+                                   <field ref="conf_fas" name="parent_id"/>
+                                   <field name="type">other</field>
+                                   <field name="user_type" ref="account_type_asset_view1"/>
+                               </record>
+               
+                       <record id="conf_nca" model="account.account.template">
+                           <field name="code">11</field>
+                           <field name="name">Net Current Assets</field>
+                           <field ref="conf_bal" name="parent_id"/>
+                           <field name="type">view</field>
+                           <field name="user_type" ref="account_type_asset_view1"/>
+                       </record>
+               
+                               <record id="conf_cas" model="account.account.template">
+                                   <field name="code">110</field>
+                                   <field name="name">Current Assets</field>
+                                   <field ref="conf_nca" name="parent_id"/>
+                                   <field name="type">view</field>
+                                   <field name="user_type" ref="account_type_asset_view1"/>
+                               </record>
+                       
+                                       <record id="conf_stk" model="account.account.template">
+                                           <field name="code">1101</field>
+                                           <field name="name">Purchased Stocks</field>
+                                           <field ref="conf_cas" name="parent_id"/>
+                                           <field name="type">other</field>
+                                           <field name="user_type" ref="conf_account_type_asset"/>
+                                       </record>
+                               
+                                       <record id="conf_a_recv" model="account.account.template">
+                                           <field name="code">1102</field>
+                                           <field name="name">Debtors</field>
+                                           <field ref="conf_cas" name="parent_id"/>
+                                           <field name="type">receivable</field>
+                                           <field eval="True" name="reconcile"/>
+                                           <field name="user_type" ref="conf_account_type_asset"/>
+                                       </record>
+                               
+                                       <!-- <record id="account.property_account_receivable" model="ir.property">
+                                           <field eval="'account.account,'+str(a_recv)" name="value"/>
+                                       </record> -->
+                               
+                                       <record id="conf_ova" model="account.account.template">
+                                           <field name="code">1103</field>
+                                           <field name="name">Output VAT</field>
+                                           <field ref="conf_cas" name="parent_id"/>
+                                           <field name="type">other</field>
+                                           <field name="user_type" ref="conf_account_type_asset"/>
+                                       </record>
+                               
+                                       <record id="conf_bnk" model="account.account.template">
+                                           <field name="code">1104</field>
+                                           <field name="name">Bank Current Account</field>
+                                           <field ref="conf_cas" name="parent_id"/>
+                                           <field name="type">view</field>
+                                           <field name="user_type" ref="conf_account_type_bnk"/>
+                                       </record>
+                       
+                       <!--        <record id="conf_cash" model="account.account.template">-->
+                       <!--            <field name="code">1105</field>-->
+                       <!--            <field name="name">Cash</field>-->
+                       <!--            <field ref="conf_cas" name="parent_id"/>-->
+                       <!--            <field name="type">view</field>-->
+                       <!--            <field name="user_type" ref="conf_account_type_cash"/>-->
+                       <!--        </record>-->
+                       
+                               <record id="conf_cli" model="account.account.template">
+                                   <field name="code">111</field>
+                                   <field name="name">Current Liabilities</field>
+                                   <field ref="conf_nca" name="parent_id"/>
+                                   <field name="type">view</field>
+                                   <field name="user_type" ref="account_type_liability_view1"/>
+                               </record>
+                       
+                                       <record id="conf_a_pay" model="account.account.template">
+                                           <field name="code">1111</field>
+                                           <field name="name">Creditors</field>
+                                           <field ref="conf_cli" name="parent_id"/>
+                                           <field name="type">payable</field>
+                                           <field eval="True" name="reconcile"/>
+                                           <field name="user_type" ref="conf_account_type_liability"/>
+                                       </record>
+                               
+                                       <!-- <record id="account.property_account_payable" model="ir.property">
+                                           <field eval="'account.account,'+str(a_pay)" name="value"/>
+                                       </record>-->
+                               
+                                       <record id="conf_iva" model="account.account.template">
+                                           <field name="code">1112</field>
+                                           <field name="name">Input VAT</field>
+                                           <field ref="conf_cli" name="parent_id"/>
+                                           <field name="type">other</field>
+                                           <field name="user_type" ref="conf_account_type_liability"/>
+                                       </record>
+                               
+                                       <record id="conf_a_reserve_and_surplus" model="account.account.template">
+                                           <field name="code">1113</field>
+                                           <field name="name">Reserve and Surplus Account</field>
+                                           <field ref="conf_cli" name="parent_id"/>
+                                           <field name="type">payable</field>
+                                           <field eval="True" name="reconcile"/>
+                                           <field name="user_type" ref="conf_account_type_liability"/>
+                                       </record>
+       
+       
+               <!-- Profit and Loss -->
+       
+               <record id="conf_gpf" model="account.account.template">
+                   <field name="code">2</field>
+                   <field name="name">Profit and Loss</field>
+                   <field ref="conf_chart0" name="parent_id"/>
+                   <field name="type">view</field>
+                   <field name="user_type" ref="conf_account_type_view"/>
+               </record>
+       
+                       <record id="conf_rev" model="account.account.template">
+                           <field name="code">20</field>
+                           <field name="name">Revenue</field>
+                           <field ref="conf_gpf" name="parent_id"/>
+                           <field name="type">view</field>
+                           <field name="user_type" ref="account_type_income_view1"/>
+                       </record>
+               
+                               <record id="conf_a_sale" model="account.account.template">
+                                   <field name="code">200</field>
+                                   <field name="name">Product Sales</field>
+                                   <field ref="conf_rev" name="parent_id"/>
+                                   <field name="type">other</field>
+                                   <field name="user_type" ref="conf_account_type_income"/>
+                               </record>
+               
+                       <!-- <record id="account.property_account_income_categ" model="ir.property">
+                           <field eval="'account.account,'+str(a_sale)" name="value"/>
+                       </record> -->
+               
+                       <record id="conf_cos" model="account.account.template">
+                           <field name="code">21</field>
+                           <field name="name">Cost of Sales</field>
+                           <field ref="conf_gpf" name="parent_id"/>
+                           <field name="type">view</field>
+                           <field name="user_type" ref="account_type_income_view1"/>
+                       </record>
+               
+                               <record id="conf_cog" model="account.account.template">
+                                   <field name="code">210</field>
+                                   <field name="name">Cost of Goods Sold</field>
+                                   <field ref="conf_cos" name="parent_id"/>
+                                   <field name="type">other</field>
+                                   <field name="user_type" ref="conf_account_type_expense"/>
+                               </record>
+               
+                       <record id="conf_ovr" model="account.account.template">
+                           <field name="code">22</field>
+                           <field name="name">Overheads</field>
+                           <field ref="conf_gpf" name="parent_id"/>
+                           <field name="type">view</field>
+                           <field name="user_type" ref="account_type_expense_view1"/>
+                       </record>
+               
+                               <record id="conf_a_expense" model="account.account.template">
+                                   <field name="code">220</field>
+                                   <field name="name">Expenses</field>
+                                   <field ref="conf_ovr" name="parent_id"/>
+                                   <field name="type">other</field>
+                                   <field name="user_type" ref="conf_account_type_expense"/>
+                               </record>
 
         <!-- <record id="account.property_account_expense_categ" model="ir.property">
             <field eval="'account.account,'+str(a_expense)" name="value"/>
@@ -266,137 +314,138 @@
 
         <!-- Invoiced VAT -->
 
-        <!-- Input VAT -->
-
         <record id="vat_code_chart_root" model="account.tax.code.template">
             <field name="name">Plan Fees </field>
         </record>
 
-        <record id="vat_code_balance_net" model="account.tax.code.template">
-            <field name="name">VAT Balance to Pay</field>
-            <field name="parent_id" ref="vat_code_chart_root"/>
-        </record>
-
-        <record id="vat_code_input" model="account.tax.code.template">
-            <field name="name">Input VAT</field>
-            <field name="parent_id" ref="vat_code_balance_net"/>
-            <field eval="-1" name="sign"/>
-        </record>
-
-        <record id="vat_code_input_S" model="account.tax.code.template">
-            <field name="name">Input VAT Rate S (15%)</field>
-            <field name="parent_id" ref="vat_code_input"/>
-        </record>
-
-        <record id="vat_code_input_R" model="account.tax.code.template">
-            <field name="name">Input VAT Rate R (5%)</field>
-            <field name="parent_id" ref="vat_code_input"/>
-        </record>
-
-        <!-- Output VAT -->
-
-        <record id="vat_code_output" model="account.tax.code.template">
-            <field name="name">Output VAT</field>
-            <field name="parent_id" ref="vat_code_balance_net"/>
-        </record>
-
-        <record id="vat_code_output_S" model="account.tax.code.template">
-            <field name="name">Output VAT Rate S (15%)</field>
-            <field name="parent_id" ref="vat_code_output"/>
-        </record>
-
-        <record id="vat_code_output_R" model="account.tax.code.template">
-            <field name="name">Output VAT Rate R (5%)</field>
-            <field name="parent_id" ref="vat_code_output"/>
-        </record>
-
-        <!-- Invoiced Base of VAT -->
-
-        <!-- Purchases -->
-
-        <record id="vat_code_base_net" model="account.tax.code.template">
-            <field name="name">Tax Bases</field>
-            <field name="parent_id" ref="vat_code_chart_root"/>
-        </record>
-
-        <record id="vat_code_base_purchases" model="account.tax.code.template">
-            <field name="name">Taxable Purchases Base</field>
-            <field name="parent_id" ref="vat_code_base_net"/>
-        </record>
-
-        <record id="vat_code_purch_S" model="account.tax.code.template">
-            <field name="name">Taxable Purchases Rated S (15%)</field>
-            <field name="parent_id" ref="vat_code_base_purchases"/>
-        </record>
-
-        <record id="vat_code_purch_R" model="account.tax.code.template">
-            <field name="name">Taxable Purchases Rated R (5%)</field>
-            <field name="parent_id" ref="vat_code_base_purchases"/>
-        </record>
-
-        <record id="vat_code_purch_Z" model="account.tax.code.template">
-            <field name="name">Taxable Purchases Rated Z (0%)</field>
-            <field name="parent_id" ref="vat_code_base_purchases"/>
-        </record>
-
-        <record id="vat_code_purch_X" model="account.tax.code.template">
-            <field name="name">Taxable Purchases Type X (Exempt)</field>
-            <field name="parent_id" ref="vat_code_base_purchases"/>
-        </record>
-
-        <record id="vat_code_purch_O" model="account.tax.code.template">
-            <field name="name">Taxable Purchases Type O (Out of scope)</field>
-            <field name="parent_id" ref="vat_code_base_purchases"/>
-        </record>
-
-        <!-- Sales -->
-
-        <record id="vat_code_base_sales" model="account.tax.code.template">
-            <field name="name">Base of Taxable Sales</field>
-            <field name="parent_id" ref="vat_code_base_net"/>
-        </record>
-
-        <record id="vat_code_sales_S" model="account.tax.code.template">
-            <field name="name">Taxable Sales Rated S (15%)</field>
-            <field name="parent_id" ref="vat_code_base_sales"/>
-        </record>
-
-        <record id="vat_code_sales_R" model="account.tax.code.template">
-            <field name="name">Taxable Sales Rated R (5%)</field>
-            <field name="parent_id" ref="vat_code_base_sales"/>
-        </record>
-
-        <record id="vat_code_sales_Z" model="account.tax.code.template">
-            <field name="name">Taxable Sales Rated Z (0%)</field>
-            <field name="parent_id" ref="vat_code_base_sales"/>
-        </record>
-
-        <record id="vat_code_sales_X" model="account.tax.code.template">
-            <field name="name">Taxable Sales Type X (Exempt)</field>
-            <field name="parent_id" ref="vat_code_base_sales"/>
-        </record>
-
-        <record id="vat_code_sales_O" model="account.tax.code.template">
-            <field name="name">Taxable Sales Type O (Out of scope)</field>
-            <field name="parent_id" ref="vat_code_base_sales"/>
-        </record>
+               <record id="vat_code_balance_net" model="account.tax.code.template">
+                   <field name="name">VAT Balance to Pay</field>
+                   <field name="parent_id" ref="vat_code_chart_root"/>
+               </record>
+
+                       <!-- Input VAT -->
+               <record id="vat_code_input" model="account.tax.code.template">
+                   <field name="name">Input VAT</field>
+                   <field name="parent_id" ref="vat_code_balance_net"/>
+                   <field eval="-1" name="sign"/>
+               </record>
+
+                       <record id="vat_code_input_S" model="account.tax.code.template">
+                           <field name="name">Input VAT Rate S (15%)</field>
+                           <field name="parent_id" ref="vat_code_input"/>
+                       </record>
+       
+                       <record id="vat_code_input_R" model="account.tax.code.template">
+                           <field name="name">Input VAT Rate R (5%)</field>
+                           <field name="parent_id" ref="vat_code_input"/>
+                       </record>
+
+               <!-- Output VAT -->
+       
+               <record id="vat_code_output" model="account.tax.code.template">
+                   <field name="name">Output VAT</field>
+                   <field name="parent_id" ref="vat_code_balance_net"/>
+               </record>
+
+                       <record id="vat_code_output_S" model="account.tax.code.template">
+                           <field name="name">Output VAT Rate S (15%)</field>
+                           <field name="parent_id" ref="vat_code_output"/>
+                       </record>
+               
+                       <record id="vat_code_output_R" model="account.tax.code.template">
+                           <field name="name">Output VAT Rate R (5%)</field>
+                           <field name="parent_id" ref="vat_code_output"/>
+                       </record>
+
+
+               <!-- Invoiced Base of VAT -->
+       
+               <!-- Purchases -->
+       
+               <record id="vat_code_base_net" model="account.tax.code.template">
+                   <field name="name">Tax Bases</field>
+                   <field name="parent_id" ref="vat_code_chart_root"/>
+               </record>
+
+                       <record id="vat_code_base_purchases" model="account.tax.code.template">
+                           <field name="name">Taxable Purchases Base</field>
+                           <field name="parent_id" ref="vat_code_base_net"/>
+                       </record>
+
+                               <record id="vat_code_purch_S" model="account.tax.code.template">
+                                   <field name="name">Taxable Purchases Rated S (15%)</field>
+                                   <field name="parent_id" ref="vat_code_base_purchases"/>
+                               </record>
+       
+                               <record id="vat_code_purch_R" model="account.tax.code.template">
+                                   <field name="name">Taxable Purchases Rated R (5%)</field>
+                                   <field name="parent_id" ref="vat_code_base_purchases"/>
+                               </record>
+       
+                               <record id="vat_code_purch_Z" model="account.tax.code.template">
+                                   <field name="name">Taxable Purchases Rated Z (0%)</field>
+                                   <field name="parent_id" ref="vat_code_base_purchases"/>
+                               </record>
+
+                               <record id="vat_code_purch_X" model="account.tax.code.template">
+                                   <field name="name">Taxable Purchases Type X (Exempt)</field>
+                                   <field name="parent_id" ref="vat_code_base_purchases"/>
+                               </record>
+                       
+                               <record id="vat_code_purch_O" model="account.tax.code.template">
+                                   <field name="name">Taxable Purchases Type O (Out of scope)</field>
+                                   <field name="parent_id" ref="vat_code_base_purchases"/>
+                               </record>
+
+               <!-- Sales -->
+       
+               <record id="vat_code_base_sales" model="account.tax.code.template">
+                   <field name="name">Base of Taxable Sales</field>
+                   <field name="parent_id" ref="vat_code_base_net"/>
+               </record>
+
+                       <record id="vat_code_sales_S" model="account.tax.code.template">
+                           <field name="name">Taxable Sales Rated S (15%)</field>
+                           <field name="parent_id" ref="vat_code_base_sales"/>
+                       </record>
+               
+                       <record id="vat_code_sales_R" model="account.tax.code.template">
+                           <field name="name">Taxable Sales Rated R (5%)</field>
+                           <field name="parent_id" ref="vat_code_base_sales"/>
+                       </record>
+               
+                       <record id="vat_code_sales_Z" model="account.tax.code.template">
+                           <field name="name">Taxable Sales Rated Z (0%)</field>
+                           <field name="parent_id" ref="vat_code_base_sales"/>
+                       </record>
+
+                       <record id="vat_code_sales_X" model="account.tax.code.template">
+                           <field name="name">Taxable Sales Type X (Exempt)</field>
+                           <field name="parent_id" ref="vat_code_base_sales"/>
+                       </record>
+               
+                       <record id="vat_code_sales_O" model="account.tax.code.template">
+                           <field name="name">Taxable Sales Type O (Out of scope)</field>
+                           <field name="parent_id" ref="vat_code_base_sales"/>
+                       </record>
 
         <record id="configurable_chart_template" model="account.chart.template">
             <field name="name">Configurable Account Chart Template</field>
             <field name="account_root_id" ref="conf_chart0"/>
             <field name="tax_code_root_id" ref="vat_code_chart_root"/>
-              <field name="bank_account_view_id" ref="conf_bnk"/>
+            <field name="bank_account_view_id" ref="conf_bnk"/>
             <field name="property_account_receivable" ref="conf_a_recv"/>
             <field name="property_account_payable" ref="conf_a_pay"/>
             <field name="property_account_expense_categ" ref="conf_a_expense"/>
             <field name="property_account_income_categ" ref="conf_a_sale"/>
+            <field name="property_reserve_and_surplus_account" ref="conf_a_reserve_and_surplus"/>
         </record>
 
-     <!-- VAT Codes -->
+       <!-- VAT Codes -->
         <!-- Purchases + Input VAT -->
 
         <record id="ivats" model="account.tax.template">
-                <field name="chart_template_id" ref="configurable_chart_template"/>
+            <field name="chart_template_id" ref="configurable_chart_template"/>
             <field name="name">IVAT S</field>
             <field eval="0.15" name="amount"/>
             <field name="type">percent</field>
@@ -410,7 +459,7 @@
         </record>
 
         <record id="ivatr" model="account.tax.template">
-               <field name="chart_template_id" ref="configurable_chart_template"/>
+            <field name="chart_template_id" ref="configurable_chart_template"/>
             <field name="name">IVAT R</field>
             <field eval="0.005" name="amount"/>
             <field name="type">percent</field>

diff --git a/addons/account/demo/account_minimal.xml b/addons/account/demo/account_minimal.xml
index d7a8575..df43c81 100644 (file)
--- a/addons/account/demo/account_minimal.xml
+++ b/addons/account/demo/account_minimal.xml
@@ -4,6 +4,7 @@
         <!--
         Account Type
         -->
+
         <record id="account_type_root" model="account.account.type">
             <field name="name">View</field>
             <field name="code">view</field>
@@ -70,225 +71,234 @@
             <field name="user_type" ref="account_type_root"/>
         </record>
 
-        <!-- Balance Sheet -->
-
-        <record id="bal" model="account.account">
-            <field name="code">X1</field>
-            <field name="name">Balance Sheet - (test)</field>
-            <field ref="chart0" name="parent_id"/>
-            <field name="type">view</field>
-            <field name="user_type" ref="account_type_root"/>
-        </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"/>
-        </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"/>
-        </record>
-
-        <record id="fas" model="account.account">
-            <field name="code">X100</field>
-            <field name="name">Fixed Assets - (test)</field>
-            <field ref="assets_view" name="parent_id"/>
-            <field name="type">view</field>
-            <field name="user_type" ref="account_type_asset"/>
-        </record>
-
-        <record id="xfa" model="account.account">
-            <field name="code">X1000</field>
-            <field name="name">Fixed Asset Account - (test)</field>
-            <field ref="fas" name="parent_id"/>
-            <field name="type">other</field>
-            <field name="user_type" ref="account_type_asset"/>
-        </record>
-
-        <record id="nca" model="account.account">
-            <field name="code">X101</field>
-            <field name="name">Net Current Assets - (test)</field>
-            <field ref="assets_view" name="parent_id"/>
-            <field name="type">view</field>
-            <field name="user_type" ref="account_type_asset"/>
-        </record>
-
-        <record id="cas" model="account.account">
-            <field name="code">X1100</field>
-            <field name="name">Current Assets - (test)</field>
-            <field ref="nca" name="parent_id"/>
-            <field name="type">view</field>
-            <field name="user_type" ref="account_type_asset"/>
-        </record>
-
-        <record id="stk" model="account.account">
-            <field name="code">X11001</field>
-            <field name="name">Purchased Stocks - (test)</field>
-            <field ref="cas" name="parent_id"/>
-            <field name="type">other</field>
-            <field name="user_type" ref="account_type_asset"/>
-        </record>
-
-        <record id="a_recv" model="account.account">
-            <field name="code">X11002</field>
-            <field name="name">Debtors - (test)</field>
-            <field ref="cas" name="parent_id"/>
-            <field name="type">receivable</field>
-            <field eval="True" name="reconcile"/>
-            <field name="user_type" ref="account_type_receivable"/>
-        </record>
-
-        <record id="ova" model="account.account">
-            <field name="code">X11003</field>
-            <field name="name">Output VAT - (test)</field>
-            <field ref="cas" name="parent_id"/>
-            <field name="type">other</field>
-            <field name="user_type" ref="account_type_receivable"/>
-        </record>
-
-        <record id="bnk" model="account.account">
-            <field name="code">X11004</field>
-            <field name="name">Bank Current Account - (test)</field>
-            <field ref="cas" name="parent_id"/>
-            <field name="type">other</field>
-            <field name="user_type" ref="account_type_asset"/>
-        </record>
-
-        <record id="cash" model="account.account">
-            <field name="code">X11005</field>
-            <field name="name">Cash - (test)</field>
-            <field ref="cas" name="parent_id"/>
-            <field name="type">other</field>
-            <field name="user_type" ref="account_type_asset"/>
-        </record>
-
-        <record id="cli" model="account.account">
-            <field name="code">X110</field>
-            <field name="name">Current Liabilities - (test)</field>
-            <field ref="liabilities_view" name="parent_id"/>
-            <field name="type">view</field>
-            <field name="user_type" ref="account_type_liability"/>
-        </record>
-
-        <record id="a_pay" model="account.account">
-            <field name="code">X1111</field>
-            <field name="name">Creditors - (test)</field>
-            <field ref="cli" name="parent_id"/>
-            <field name="type">payable</field>
-            <field eval="True" name="reconcile"/>
-            <field name="user_type" ref="account_type_payable"/>
-        </record>
-
-        <record id="iva" model="account.account">
-            <field name="code">X1112</field>
-            <field name="name">Input VAT - (test)</field>
-            <field ref="cli" name="parent_id"/>
-            <field name="type">other</field>
-            <field name="user_type" ref="account_type_payable"/>
-        </record>
-
-        <!-- Profit and Loss -->
-
-        <record id="gpf" model="account.account">
-            <field name="code">X2</field>
-            <field name="name">Profit and Loss - (test)</field>
-            <field ref="chart0" name="parent_id"/>
-            <field name="type">view</field>
-            <field name="user_type" ref="account_type_root"/>
-        </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"/>
-        </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"/>
-        </record>
-
-        <record id="rev" model="account.account">
-            <field name="code">X200</field>
-            <field name="name">Revenue - (test)</field>
-            <field ref="income_view" name="parent_id"/>
-            <field name="type">view</field>
-            <field name="user_type" ref="account_type_income"/>
-        </record>
-
-        <record id="a_sale" model="account.account">
-            <field name="code">X2001</field>
-            <field name="name">Product Sales - (test)</field>
-            <field ref="rev" name="parent_id"/>
-            <field name="type">other</field>
-            <field name="user_type" ref="account_type_income"/>
-        </record>
-
-        <record id="cos" model="account.account">
-            <field name="code">X210</field>
-            <field name="name">Cost of Sales - (test)</field>
-            <field ref="expense_view" name="parent_id"/>
-            <field name="type">view</field>
-            <field name="user_type" ref="account_type_expense"/>
-        </record>
-
-        <record id="cog" model="account.account">
-            <field name="code">X2100</field>
-            <field name="name">Cost of Goods Sold - (test)</field>
-            <field ref="cos" name="parent_id"/>
-            <field name="type">other</field>
-            <field name="user_type" ref="account_type_expense"/>
-        </record>
-
-        <record id="ovr" model="account.account">
-            <field name="code">X211</field>
-            <field name="name">Overheads - (test)</field>
-            <field ref="expense_view" name="parent_id"/>
-            <field name="type">view</field>
-            <field name="user_type" ref="account_type_expense"/>
-        </record>
-
-        <record id="a_expense" model="account.account">
-            <field name="code">X2110</field>
-            <field name="name">Expenses - (test)</field>
-            <field ref="ovr" name="parent_id"/>
-            <field name="type">other</field>
-            <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>
+               <!-- Balance Sheet -->
+       
+               <record id="bal" model="account.account">
+                   <field name="code">X1</field>
+                   <field name="name">Balance Sheet - (test)</field>
+                   <field ref="chart0" name="parent_id"/>
+                   <field name="type">view</field>
+                   <field name="user_type" ref="account_type_root"/>
+               </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"/>
+                       </record>
+
+                               <record id="fas" model="account.account">
+                                   <field name="code">X100</field>
+                                   <field name="name">Fixed Assets - (test)</field>
+                                   <field ref="assets_view" name="parent_id"/>
+                                   <field name="type">view</field>
+                                   <field name="user_type" ref="account_type_asset"/>
+                               </record>
+                       
+                                       <record id="xfa" model="account.account">
+                                           <field name="code">X1000</field>
+                                           <field name="name">Fixed Asset Account - (test)</field>
+                                           <field ref="fas" name="parent_id"/>
+                                           <field name="type">other</field>
+                                           <field name="user_type" ref="account_type_asset"/>
+                                       </record>
+                       
+                               <record id="nca" model="account.account">
+                                   <field name="code">X101</field>
+                                   <field name="name">Net Current Assets - (test)</field>
+                                   <field ref="assets_view" name="parent_id"/>
+                                   <field name="type">view</field>
+                                   <field name="user_type" ref="account_type_asset"/>
+                               </record>
+                       
+                                       <record id="cas" model="account.account">
+                                           <field name="code">X1100</field>
+                                           <field name="name">Current Assets - (test)</field>
+                                           <field ref="nca" name="parent_id"/>
+                                           <field name="type">view</field>
+                                           <field name="user_type" ref="account_type_asset"/>
+                                       </record>
+                       
+                               <record id="stk" model="account.account">
+                                   <field name="code">X11001</field>
+                                   <field name="name">Purchased Stocks - (test)</field>
+                                   <field ref="cas" name="parent_id"/>
+                                   <field name="type">other</field>
+                                   <field name="user_type" ref="account_type_asset"/>
+                               </record>
+                       
+                               <record id="a_recv" model="account.account">
+                                   <field name="code">X11002</field>
+                                   <field name="name">Debtors - (test)</field>
+                                   <field ref="cas" name="parent_id"/>
+                                   <field name="type">receivable</field>
+                                   <field eval="True" name="reconcile"/>
+                                   <field name="user_type" ref="account_type_asset"/>
+                               </record>
+                       
+                               <record id="ova" model="account.account">
+                                   <field name="code">X11003</field>
+                                   <field name="name">Output VAT - (test)</field>
+                                   <field ref="cas" name="parent_id"/>
+                                   <field name="type">other</field>
+                                   <field name="user_type" ref="account_type_asset"/>
+                               </record>
+                       
+                               <record id="bnk" model="account.account">
+                                   <field name="code">X11004</field>
+                                   <field name="name">Bank Current Account - (test)</field>
+                                   <field ref="cas" name="parent_id"/>
+                                   <field name="type">other</field>
+                                   <field name="user_type" ref="account_type_asset"/>
+                               </record>
+                       
+                               <record id="cash" model="account.account">
+                                   <field name="code">X11005</field>
+                                   <field name="name">Cash - (test)</field>
+                                   <field ref="cas" name="parent_id"/>
+                                   <field name="type">other</field>
+                                   <field name="user_type" ref="account_type_asset"/>
+                               </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"/>
+                       </record>
+       
+                               <record id="cli" model="account.account">
+                                   <field name="code">X110</field>
+                                   <field name="name">Current Liabilities - (test)</field>
+                                   <field ref="liabilities_view" name="parent_id"/>
+                                   <field name="type">view</field>
+                                   <field name="user_type" ref="account_type_liability"/>
+                               </record>
+                       
+                                       <record id="a_pay" model="account.account">
+                                           <field name="code">X1111</field>
+                                           <field name="name">Creditors - (test)</field>
+                                           <field ref="cli" name="parent_id"/>
+                                           <field name="type">payable</field>
+                                           <field eval="True" name="reconcile"/>
+                                           <field name="user_type" ref="account_type_liability"/>
+                                       </record>
+                               
+                                       <record id="iva" model="account.account">
+                                           <field name="code">X1112</field>
+                                           <field name="name">Input VAT - (test)</field>
+                                           <field ref="cli" name="parent_id"/>
+                                           <field name="type">other</field>
+                                           <field name="user_type" ref="account_type_liability"/>
+                                       </record>
+                               
+                                       <record id="rsa" model="account.account">
+                                           <field name="code">X1113</field>
+                                           <field name="name">Reserve and Surplus - (test)</field>
+                                           <field ref="cli" name="parent_id"/>
+                                           <field name="type">payable</field>
+                                           <field name="user_type" ref="account_type_liability"/>
+                                       </record>
+                       
+               <!-- Profit and Loss -->
+       
+               <record id="gpf" model="account.account">
+                   <field name="code">X2</field>
+                   <field name="name">Profit and Loss - (test)</field>
+                   <field ref="chart0" name="parent_id"/>
+                   <field name="type">view</field>
+                   <field name="user_type" ref="account_type_root"/>
+               </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"/>
+                       </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 id="rev" model="account.account">
+                                   <field name="code">X200</field>
+                                   <field name="name">Revenue - (test)</field>
+                                   <field ref="income_view" name="parent_id"/>
+                                   <field name="type">view</field>
+                                   <field name="user_type" ref="account_type_income"/>
+                               </record>
+                       
+                                       <record id="a_sale" model="account.account">
+                                           <field name="code">X2001</field>
+                                           <field name="name">Product Sales - (test)</field>
+                                           <field ref="rev" name="parent_id"/>
+                                           <field name="type">other</field>
+                                           <field name="user_type" ref="account_type_income"/>
+                                       </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"/>
+                       </record>
+       
+       
+                       <record id="cos" model="account.account">
+                           <field name="code">X210</field>
+                           <field name="name">Cost of Sales - (test)</field>
+                           <field ref="expense_view" name="parent_id"/>
+                           <field name="type">view</field>
+                           <field name="user_type" ref="account_type_expense"/>
+                       </record>
+       
+                               <record id="cog" model="account.account">
+                                   <field name="code">X2100</field>
+                                   <field name="name">Cost of Goods Sold - (test)</field>
+                                   <field ref="cos" name="parent_id"/>
+                                   <field name="type">other</field>
+                                   <field name="user_type" ref="account_type_expense"/>
+                               </record>
+       
+                       <record id="ovr" model="account.account">
+                           <field name="code">X211</field>
+                           <field name="name">Overheads - (test)</field>
+                           <field ref="expense_view" name="parent_id"/>
+                           <field name="type">view</field>
+                           <field name="user_type" ref="account_type_expense"/>
+                       </record>
+       
+                               <record id="a_expense" model="account.account">
+                                   <field name="code">X2110</field>
+                                   <field name="name">Expenses - (test)</field>
+                                   <field ref="ovr" name="parent_id"/>
+                                   <field name="type">other</field>
+                                   <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">
@@ -310,6 +320,13 @@
             <field name="company_id" ref="base.main_company"/>
         </record>
 
+        <record forcecreate="True" id="property_reserve_and_surplus_account" model="ir.property">
+            <field name="name">property_account_receivable</field>
+            <field name="fields_id" search="[('model','=','res.company'),('name','=','property_reserve_and_surplus_account')]"/>
+            <field eval="'account.account,'+str(rsa)" name="value"/>
+            <field name="company_id" ref="base.main_company"/>
+        </record>
+
 
         <!--
         Account Journal

diff --git a/addons/account/installer.py b/addons/account/installer.py
index 250fb5c..3eead7f 100644 (file)
--- a/addons/account/installer.py
+++ b/addons/account/installer.py
@@ -340,8 +340,10 @@ class account_installer(osv.osv_memory):
             ('property_account_expense_categ','product.category','account.account'),
             ('property_account_income_categ','product.category','account.account'),
             ('property_account_expense','product.template','account.account'),
-            ('property_account_income','product.template','account.account')
+            ('property_account_income','product.template','account.account'),
+            ('property_reserve_and_surplus_account','res.company','account.account'),
         ]
+
         for record in todo_list:
             r = []
             r = property_obj.search(cr, uid, [('name','=', record[0] ),('company_id','=',company_id.id)])
@@ -353,6 +355,7 @@ class account_installer(osv.osv_memory):
                 'fields_id': field[0],
                 'value': account and 'account.account,'+str(acc_template_ref[account.id]) or False,
             }
+
             if r:
                 #the property exist: modify it
                 property_obj.write(cr, uid, r, vals)

diff --git a/addons/account/wizard/account_report_balance_sheet.py b/addons/account/wizard/account_report_balance_sheet.py
index 8398731..91840b5 100644 (file)
--- a/addons/account/wizard/account_report_balance_sheet.py
+++ b/addons/account/wizard/account_report_balance_sheet.py
@@ -22,6 +22,7 @@
 from lxml import etree
 
 from osv import osv, fields
+from tools.translate import _
 
 class account_bs_report(osv.osv_memory):
     """
@@ -57,7 +58,11 @@ class account_bs_report(osv.osv_memory):
         if context is None:
             context = {}
         data = self.pre_print_report(cr, uid, ids, data, query_line, context=context)
-        data['form'].update(self.read(cr, uid, ids, ['display_type', 'reserve_account_id'])[0])
+        account = self.pool.get('account.account').browse(cr, uid, data['form']['chart_account_id'])
+        if not account.company_id.property_reserve_and_surplus_account:
+            raise osv.except_osv(_('Warning'),_('Please define the Reserve and Surplus account for current user company !'))
+        data['form']['reserve_account_id'] = account.company_id.property_reserve_and_surplus_account.id
+        data['form'].update(self.read(cr, uid, ids, ['display_type'])[0])
         if data['form']['display_type']:
             return {
                 'type': 'ir.actions.report.xml',

diff --git a/addons/account/wizard/account_report_balance_sheet_view.xml b/addons/account/wizard/account_report_balance_sheet_view.xml
index 14e0cc7..a83ab46 100644 (file)
--- a/addons/account/wizard/account_report_balance_sheet_view.xml
+++ b/addons/account/wizard/account_report_balance_sheet_view.xml
@@ -9,8 +9,8 @@
             <field name="inherit_id" ref="account.account_common_report_view" />
             <field name="arch" type="xml">
                <field name="fiscalyear_id" position="after">
-                               <field name="reserve_account_id"/>
-                               <newline/>
+<!--                           <field name="reserve_account_id"/>-->
+<!--                           <newline/>-->
                    <field name="display_account"/>
                    <field name="display_type"/>
                    <newline/>

diff --git a/addons/l10n_chart_uk_minimal/account_chart.xml b/addons/l10n_chart_uk_minimal/account_chart.xml
index 17eae39..2dba2a4 100644 (file)
--- a/addons/l10n_chart_uk_minimal/account_chart.xml
+++ b/addons/l10n_chart_uk_minimal/account_chart.xml
@@ -11,241 +11,249 @@
             <field name="user_type" ref="account_type_view"/>
         </record>
 
-        <!-- Balance Sheet -->
+               <!-- Balance Sheet -->
+       
+               <record id="bal" model="account.account.template">
+                   <field name="code">1</field>
+                   <field name="name">Balance Sheet</field>
+                   <field ref="chart0" name="parent_id"/>
+                   <field name="type">view</field>
+                   <field name="user_type" ref="account_type_view"/>
+               </record>
 
-        <record id="bal" model="account.account.template">
-            <field name="code">1</field>
-            <field name="name">Balance Sheet</field>
-            <field ref="chart0" name="parent_id"/>
-            <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">100</field>
-            <field name="name">Fixed Assets</field>
-            <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">1000</field>
-            <field name="name">Fixed Asset Account</field>
-            <field ref="fas" name="parent_id"/>
-            <field name="type">other</field>
-            <field name="user_type" ref="account_type_asset"/>
-        </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="nca" model="account.account.template">
-            <field name="code">101</field>
-            <field name="name">Net Current Assets</field>
-            <field ref="assets_view" name="parent_id"/>
-            <field name="type">view</field>
-            <field name="user_type" ref="account_type_view"/>
-        </record>
+                               <record id="cli" model="account.account.template">
+                                   <field name="code">110</field>
+                                   <field name="name">Current Liabilities</field>
+                                   <field ref="liabilities_view" name="parent_id"/>
+                                   <field name="type">view</field>
+                                   <field name="user_type" ref="acct_type_liability_view"/>
+                               </record>
+                       
+                                       <record id="a_pay" model="account.account.template">
+                                           <field name="code">1111</field>
+                                           <field name="name">Creditors</field>
+                                           <field ref="cli" name="parent_id"/>
+                                           <field name="type">payable</field>
+                                           <field eval="True" name="reconcile"/>
+                                           <field name="user_type" ref="account_type_liability"/>
+                                       </record>
+                                       
+                                       <record id="iva" model="account.account.template">
+                                           <field name="code">1112</field>
+                                           <field name="name">Input VAT</field>
+                                           <field ref="cli" name="parent_id"/>
+                                           <field name="type">other</field>
+                                           <field name="user_type" ref="account_type_liability"/>
+                                       </record>
 
-        <record id="cas" model="account.account.template">
-            <field name="code">1100</field>
-            <field name="name">Current Assets</field>
-            <field ref="nca" name="parent_id"/>
-            <field name="type">view</field>
-            <field name="user_type" ref="account_type_view"/>
-        </record>
+                                       <record id="a_reserve_and_surplus" model="account.account.template">
+                                           <field name="code">1113</field>
+                                           <field name="name">Reserve and Surplus Account</field>
+                                           <field ref="cli" name="parent_id"/>
+                                           <field name="type">payable</field>
+                                           <field name="user_type" ref="account_type_liability"/>
+                                       </record>
 
-        <record id="stk" model="account.account.template">
-            <field name="code">11001</field>
-            <field name="name">Purchased Stocks</field>
-            <field ref="cas" name="parent_id"/>
-            <field name="type">other</field>
-            <field name="user_type" ref="account_type_asset"/>
-        </record>
+                       <!-- <record id="account.property_account_payable" model="ir.property">
+                           <field eval="'account.account,'+str(a_pay)" name="value"/>
+                       </record>-->
 
-        <record id="a_recv" model="account.account.template">
-            <field name="code">11002</field>
-            <field name="name">Debtors</field>
-            <field ref="cas" name="parent_id"/>
-            <field name="type">receivable</field>
-            <field eval="True" name="reconcile"/>
-            <field name="user_type" ref="account_type_receivable"/>
-        </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 id="fas" model="account.account.template">
+                                   <field name="code">100</field>
+                                   <field name="name">Fixed Assets</field>
+                                   <field ref="assets_view" name="parent_id"/>
+                                   <field name="type">view</field>
+                                   <field name="user_type" ref="acct_type_asset_view"/>
+                               </record>
 
-        <!-- <record id="account.property_account_receivable" model="ir.property">
-            <field eval="'account.account,'+str(a_recv)" name="value"/>
-        </record> -->
+                                       <record id="xfa" model="account.account.template">
+                                           <field name="code">1000</field>
+                                           <field name="name">Fixed Asset Account</field>
+                                           <field ref="fas" name="parent_id"/>
+                                           <field name="type">other</field>
+                                           <field name="user_type" ref="account_type_asset"/>
+                                       </record>
+                                       
+                               <record id="nca" model="account.account.template">
+                                   <field name="code">101</field>
+                                   <field name="name">Net Current Assets</field>
+                                   <field ref="assets_view" name="parent_id"/>
+                                   <field name="type">view</field>
+                                   <field name="user_type" ref="acct_type_asset_view"/>
+                               </record>
 
-        <record id="ova" model="account.account.template">
-            <field name="code">11003</field>
-            <field name="name">Output VAT</field>
-            <field ref="cas" name="parent_id"/>
-            <field name="type">other</field>
-            <field name="user_type" ref="account_type_tax"/>
-        </record>
+                                       <record id="cas" model="account.account.template">
+                                           <field name="code">1100</field>
+                                           <field name="name">Current Assets</field>
+                                           <field ref="nca" name="parent_id"/>
+                                           <field name="type">view</field>
+                                           <field name="user_type" ref="acct_type_asset_view"/>
+                                       </record>
 
-        <record id="bnk" model="account.account.template">
-            <field name="code">11004</field>
-            <field name="name">Bank Current Account</field>
-            <field ref="cas" name="parent_id"/>
-            <field name="type">other</field>
-            <field name="user_type" ref="account_type_cash"/>
-        </record>
+                                               <record id="stk" model="account.account.template">
+                                                   <field name="code">11001</field>
+                                                   <field name="name">Purchased Stocks</field>
+                                                   <field ref="cas" name="parent_id"/>
+                                                   <field name="type">other</field>
+                                                   <field name="user_type" ref="account_type_asset"/>
+                                               </record>
 
-        <record id="cash" model="account.account.template">
-            <field name="code">11005</field>
-            <field name="name">Cash</field>
-            <field ref="cas" name="parent_id"/>
-            <field name="type">other</field>
-            <field name="user_type" ref="account_type_cash"/>
-        </record>
+                                               <record id="a_recv" model="account.account.template">
+                                                   <field name="code">11002</field>
+                                                   <field name="name">Debtors</field>
+                                                   <field ref="cas" name="parent_id"/>
+                                                   <field name="type">receivable</field>
+                                                   <field eval="True" name="reconcile"/>
+                                                   <field name="user_type" ref="account_type_asset"/>
+                                               </record>
 
-        <record id="cli" model="account.account.template">
-            <field name="code">110</field>
-            <field name="name">Current Liabilities</field>
-            <field ref="liabilities_view" name="parent_id"/>
-            <field name="type">view</field>
-            <field name="user_type" ref="account_type_view"/>
-        </record>
+                                               <!-- <record id="account.property_account_receivable" model="ir.property">
+                                                   <field eval="'account.account,'+str(a_recv)" name="value"/>
+                                               </record> -->
 
-        <record id="a_pay" model="account.account.template">
-            <field name="code">1111</field>
-            <field name="name">Creditors</field>
-            <field ref="cli" name="parent_id"/>
-            <field name="type">payable</field>
-            <field eval="True" name="reconcile"/>
-            <field name="user_type" ref="account_type_payable"/>
-        </record>
+                                               <record id="ova" model="account.account.template">
+                                                   <field name="code">11003</field>
+                                                   <field name="name">Output VAT</field>
+                                                   <field ref="cas" name="parent_id"/>
+                                                   <field name="type">other</field>
+                                                   <field name="user_type" ref="account_type_asset"/>
+                                               </record>
 
-        <!-- <record id="account.property_account_payable" model="ir.property">
-            <field eval="'account.account,'+str(a_pay)" name="value"/>
-        </record>-->
+                                               <record id="bnk" model="account.account.template">
+                                                   <field name="code">11004</field>
+                                                   <field name="name">Bank Current Account</field>
+                                                   <field ref="cas" name="parent_id"/>
+                                                   <field name="type">other</field>
+                                                   <field name="user_type" ref="account_type_cash"/>
+                                               </record>
 
-        <record id="iva" model="account.account.template">
-            <field name="code">1112</field>
-            <field name="name">Input VAT</field>
-            <field ref="cli" name="parent_id"/>
-            <field name="type">other</field>
-            <field name="user_type" ref="account_type_tax"/>
-        </record>
+                                               <record id="cash" model="account.account.template">
+                                                   <field name="code">11005</field>
+                                                   <field name="name">Cash</field>
+                                                   <field ref="cas" name="parent_id"/>
+                                                   <field name="type">other</field>
+                                                   <field name="user_type" ref="account_type_cash"/>
+                                               </record>
 
-        <!-- Profit and Loss -->
 
-        <record id="gpf" model="account.account.template">
-            <field name="code">2</field>
-            <field name="name">Profit and Loss</field>
-            <field ref="chart0" name="parent_id"/>
-            <field name="type">view</field>
-            <field name="user_type" ref="account_type_view"/>
-        </record>
+               <!-- Profit and Loss -->
+       
+               <record id="gpf" model="account.account.template">
+                   <field name="code">2</field>
+                   <field name="name">Profit and Loss</field>
+                   <field ref="chart0" name="parent_id"/>
+                   <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="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="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"/>
-        </record>
-            
-        <record id="rev" model="account.account.template">
-            <field name="code">200</field>        
-            <field name="name">Revenue</field>
-            <field ref="income_view" name="parent_id"/>
-            <field name="type">view</field>
-            <field name="user_type" ref="account_type_view"/>
-        </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="account_type_income"/>
+                                   <field name="reconcile" eval="False"/>
+                                   <field name="parent_id" ref="income_view"/>
+                               </record>
+                               
+                               <record id="rev" model="account.account.template">
+                                   <field name="code">200</field>        
+                                   <field name="name">Revenue</field>
+                                   <field ref="income_view" name="parent_id"/>
+                                   <field name="type">view</field>
+                                   <field name="user_type" ref="acct_type_income_view"/>
+                               </record>
+                       
+                                       <record id="a_sale" model="account.account.template">
+                                           <field name="code">2001</field>
+                                           <field name="name">Product Sales</field>
+                                           <field ref="rev" name="parent_id"/>
+                                           <field name="type">other</field>
+                                           <field name="user_type" ref="account_type_income"/>
+                                       </record>
 
-        <record id="a_sale" model="account.account.template">
-            <field name="code">2001</field>
-            <field name="name">Product Sales</field>
-            <field ref="rev" name="parent_id"/>
-            <field name="type">other</field>
-            <field name="user_type" ref="account_type_income"/>
-        </record>
-
-        <!-- <record id="account.property_account_income_categ" model="ir.property">
-            <field eval="'account.account,'+str(a_sale)" name="value"/>
-        </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="account.property_account_income_categ" model="ir.property">
+                                   <field eval="'account.account,'+str(a_sale)" name="value"/>
+                               </record> -->
+                       
+                               <record id="cos" model="account.account.template">
+                                   <field name="code">210</field>
+                                   <field name="name">Cost of Sales</field>
+                                   <field ref="expense_view" name="parent_id"/>
+                                   <field name="type">view</field>
+                                   <field name="user_type" ref="acct_type_expense_view"/>
+                               </record>
 
-        <record id="cos" model="account.account.template">
-            <field name="code">210</field>
-            <field name="name">Cost of Sales</field>
-            <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">2100</field>
+                                           <field name="name">Cost of Goods Sold</field>
+                                           <field ref="cos" name="parent_id"/>
+                                           <field name="type">other</field>
+                                           <field name="user_type" ref="account_type_expense"/>
+                                       </record>
 
-        <record id="cog" model="account.account.template">
-            <field name="code">2100</field>
-            <field name="name">Cost of Goods Sold</field>
-            <field ref="cos" name="parent_id"/>
-            <field name="type">other</field>
-            <field name="user_type" ref="account_type_expense"/>
-        </record>
+                               <record id="ovr" model="account.account.template">
+                                   <field name="code">211</field>
+                                   <field name="name">Overheads</field>
+                                   <field ref="expense_view" name="parent_id"/>
+                                   <field name="type">view</field>
+                                   <field name="user_type" ref="acct_type_expense_view"/>
+                               </record>
 
-        <record id="ovr" model="account.account.template">
-            <field name="code">211</field>
-            <field name="name">Overheads</field>
-            <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">2110</field>
-            <field name="name">Expenses</field>
-            <field ref="ovr" name="parent_id"/>
-            <field name="type">other</field>
-            <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> -->
+                                       <record id="a_expense" model="account.account.template">
+                                           <field name="code">2110</field>
+                                           <field name="name">Expenses</field>
+                                           <field ref="ovr" name="parent_id"/>
+                                           <field name="type">other</field>
+                                           <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>

diff --git a/addons/l10n_chart_uk_minimal/account_tax.xml b/addons/l10n_chart_uk_minimal/account_tax.xml
index 502cea9..64375db 100644 (file)
--- a/addons/l10n_chart_uk_minimal/account_tax.xml
+++ b/addons/l10n_chart_uk_minimal/account_tax.xml
@@ -132,6 +132,7 @@
             <field name="property_account_payable" ref="l10n_chart_uk_minimal.a_pay"/>
             <field name="property_account_expense_categ" ref="l10n_chart_uk_minimal.a_expense"/>
             <field name="property_account_income_categ" ref="l10n_chart_uk_minimal.a_sale"/>
+            <field name="property_reserve_and_surplus_account" ref="l10n_chart_uk_minimal.a_reserve_and_surplus"/>
         </record>
 
         <!-- VAT Codes -->

diff --git a/addons/l10n_chart_uk_minimal/account_types.xml b/addons/l10n_chart_uk_minimal/account_types.xml
index 180cf3a..d9bfb53 100644 (file)
--- a/addons/l10n_chart_uk_minimal/account_types.xml
+++ b/addons/l10n_chart_uk_minimal/account_types.xml
@@ -5,14 +5,14 @@
         <record model="account.account.type" id="account_type_receivable" >
           <field name="name">Receivable</field>
           <field name="code">receivable</field>
-          <field name="report_type">asset</field>
+          <field name="report_type">income</field>
           <field name="close_method">unreconciled</field>
         </record>
 
         <record model="account.account.type" id="account_type_payable" >
           <field name="name">Payable</field>
           <field name="code">payable</field>
-          <field name="report_type">liability</field>
+          <field name="report_type">expense</field>
           <field name="close_method">unreconciled</field>
         </record>
 
@@ -22,26 +22,30 @@
           <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="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>
@@ -59,6 +63,7 @@
         <record model="account.account.type" id="account_type_tax">
           <field name="name">Tax</field>
           <field name="code">tax</field>
+          <field name="report_type">liability</field>
           <field name="close_method">unreconciled</field>
         </record>
 
@@ -69,6 +74,13 @@
           <field name="close_method">balance</field>
         </record>
 
+        <record model="account.account.type" id="account_type_liability">
+          <field name="name">Liability</field>
+          <field name="code">liability</field>
+          <field name="close_method">balance</field>
+          <field name="report_type">liability</field>
+        </record>
+
         <record model="account.account.type" id="account_type_asset">
           <field name="name">Asset</field>
           <field name="code">asset</field>

diff --git a/addons/l10n_in/account_chart.xml b/addons/l10n_in/account_chart.xml
index 5bdc5df..9881704 100644 (file)
--- a/addons/l10n_in/account_chart.xml
+++ b/addons/l10n_in/account_chart.xml
@@ -580,6 +580,7 @@
                     <field name="property_account_payable" ref="IA_AC02131"/>
                     <field name="property_account_expense_categ" ref="IA_AC112"/>
                     <field name="property_account_income_categ" ref="IA_AC122"/>
+                    <field name="property_reserve_and_surplus_account" ref="IA_AC0232"/>
                 </record>