[FIX] account: financial reports and data for account_account_type fixed

bzr revid: qdp-launchpad@openerp.com-20120126142618-fdyf054eaqjo85es

diff --git a/addons/account/account_financial_report_data.xml b/addons/account/account_financial_report_data.xml
index 18624f9..6410a5e 100644 (file)
--- a/addons/account/account_financial_report_data.xml
+++ b/addons/account/account_financial_report_data.xml
@@ -4,6 +4,23 @@
         <!-- 
             Financial Reports
         -->
+        <record id="account_financial_report_profitandloss0" model="account.financial.report">
+            <field name="name">Profit and Loss</field>
+            <field name="type">sum</field>
+        </record>
+        <record id="account_financial_report_income0" model="account.financial.report">
+            <field name="name">Income</field>
+            <field name="parent_id" ref="account_financial_report_profitandloss0"/>
+            <field name="display_detail">detail_with_hierarchy</field>
+            <field name="type">account_type</field>
+        </record>
+        <record id="account_financial_report_expense0" model="account.financial.report">
+            <field name="name">Expense</field>
+            <field name="parent_id" ref="account_financial_report_profitandloss0"/>
+            <field name="display_detail">detail_with_hierarchy</field>
+            <field name="type">account_type</field>
+        </record>
+
         <record id="account_financial_report_balancesheet0" model="account.financial.report">
             <field name="name">Balance Sheet</field>
             <field name="type">sum</field>
@@ -14,30 +31,25 @@
             <field name="display_detail">detail_with_hierarchy</field>
             <field name="type">account_type</field>
         </record>
-        <record id="account_financial_report_liability0" model="account.financial.report">
+        <record id="account_financial_report_liabilitysum0" model="account.financial.report">
             <field name="name">Liability</field>
             <field name="parent_id" ref="account_financial_report_balancesheet0"/>
-            <field name="display_detail">detail_with_hierarchy</field>
-            <field name="type">account_type</field>
-        </record>
-
-        <record id="account_financial_report_profitandloss0" model="account.financial.report">
-            <field name="name">Profit and Loss</field>
+            <field name="display_detail">no_detail</field>
             <field name="type">sum</field>
         </record>
-        <record id="account_financial_report_income0" model="account.financial.report">
-            <field name="name">Income</field>
-            <field name="parent_id" ref="account_financial_report_profitandloss0"/>
+        <record id="account_financial_report_liability0" model="account.financial.report">
+            <field name="name">Liability</field>
+            <field name="parent_id" ref="account_financial_report_liabilitysum0"/>
             <field name="display_detail">detail_with_hierarchy</field>
             <field name="type">account_type</field>
         </record>
-        <record id="account_financial_report_expense0" model="account.financial.report">
-            <field name="name">Expense</field>
-            <field name="parent_id" ref="account_financial_report_profitandloss0"/>
-            <field name="display_detail">detail_with_hierarchy</field>
-            <field name="type">account_type</field>
+        <record id="account_financial_report_profitloss_toreport0" model="account.financial.report">
+            <field name="name">Profit (Loss) to report</field>
+            <field name="parent_id" ref="account_financial_report_liabilitysum0"/>
+            <field name="display_detail">no_detail</field>
+            <field name="type">account_report</field>
+            <field name="account_report_id" ref="account_financial_report_profitandloss0"/>
         </record>
-
     </data>
 </openerp>
 

diff --git a/addons/account/data/data_account_type.xml b/addons/account/data/data_account_type.xml
index 590357e..a594f3d 100644 (file)
--- a/addons/account/data/data_account_type.xml
+++ b/addons/account/data/data_account_type.xml
@@ -2,7 +2,7 @@
 <openerp>
     <data noupdate="1">
         <record model="account.account.type" id="data_account_type_view">
-          <field name="name">View</field>
+          <field name="name">Root/View</field>
           <field name="code">view</field>
           <field name="close_method">none</field>
         </record>
@@ -10,11 +10,13 @@
           <field name="name">Receivable</field>
           <field name="code">receivable</field>
           <field name="close_method">unreconciled</field>
+          <field name="report_type">asset</field>
         </record>
         <record model="account.account.type" id="data_account_type_payable">
           <field name="name">Payable</field>
           <field name="code">payable</field>
           <field name="close_method">unreconciled</field>
+          <field name="report_type">liability</field>
         </record>
         <record model="account.account.type" id="data_account_type_bank">
           <field name="name">Bank</field>
@@ -25,6 +27,7 @@
           <field name="name">Cash</field>
           <field name="code">cash</field>
           <field name="close_method">balance</field>
+          <field name="report_type">asset</field>
         </record>
         <record model="account.account.type" id="data_account_type_asset">
           <field name="name">Asset</field>