[IMP] account financial type account_type is now m2m

bzr revid: al@openerp.com-20110921150708-wkxt83pulih57o93

diff --git a/addons/account/account.py b/addons/account/account.py
index dffaed6..3be3bfe 100644 (file)
--- a/addons/account/account.py
+++ b/addons/account/account.py
@@ -2707,7 +2707,7 @@ class account_financial_report(osv.osv):
         'account_ids': fields.many2many('account.account', 'account_account_financial_report', 'report_line_id', 'account_id', 'Accounts'),
         'display_detail': fields.boolean('Display details', help='Display every account with its balance instead of the sum.'),
         'account_report_id':  fields.many2one('account.financial.report', 'Report Value'),
-        'account_type_id':  fields.many2one('account.account.type', 'Account Type'),
+        'account_type_ids': fields.many2many('account.account.type', 'account_account_financial_report_type', 'report_id', 'account_type_id', 'Account Types'),
     }
 
     _defaults = {

diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index e3ef40c..033c98a 100644 (file)
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -2727,7 +2727,7 @@ action = pool.get('res.config').next(cr, uid, [], context)
                             <newline/>
                             <field name="account_report_id" attrs="{'invisible': [('type', '!=', 'account_report')]}"/>
                             <newline/>
-                            <field name="account_type_id" attrs="{'invisible': [('type', '!=', 'account_type')]}"/>
+                            <field name="account_type_ids" nolabel="1" attrs="{'invisible': [('type', '!=', 'account_type')]}"/>
                             <newline/>
                         </page>
                         <page string="Notes" attrs="{'invisible': [('state','!=','confirm')]}">