[MERGE] merge accuont_asset usability branch

bzr revid: qdp-launchpad@openerp.com-20110513101523-asaetwz0duh7d3kq

diff --cc addons/account_asset/account_asset.py
index ee6ec25,3f6638c..4220fe0
--- 1/addons/account_asset/account_asset.py
--- 2/addons/account_asset/account_asset.py
+++ b/addons/account_asset/account_asset.py
@@@ -26,12 -26,11 +26,12 @@@ from datetime import datetim
  class account_asset_category(osv.osv):
      _name = 'account.asset.category'
      _description = 'Asset category'
 +
      _columns = {
-         'name': fields.char('Asset category', size=64, required=True, select=1),
+         'name': fields.char('Name', size=64, required=True, select=1),
          'note': fields.text('Note'),
 -        'journal_analytic_id': fields.many2one('account.analytic.journal', 'Analytic Journal'), #FIXME:add in the form view  with group = analytic
 -        'account_analytic_id': fields.many2one('account.analytic.account', 'Analytic Account'), #FIXME:add in the form view  with group = analytic
 +        'journal_analytic_id': fields.many2one('account.analytic.journal', 'Analytic journal'),
 +        'account_analytic_id': fields.many2one('account.analytic.account', 'Analytic account'),
          'account_asset_id': fields.many2one('account.account', 'Asset Account', required=True),
          'account_depreciation_id': fields.many2one('account.account', 'Depreciation Account', required=True),
          'account_expense_depreciation_id': fields.many2one('account.account', 'Depr. Expense Account', required=True),

diff --cc addons/account_asset/account_asset_view.xml
index a379fd7,bbba525..f75b0dc
--- 1/addons/account_asset/account_asset_view.xml
--- 2/addons/account_asset/account_asset_view.xml
+++ b/addons/account_asset/account_asset_view.xml
@@@ -8,10 -8,9 +8,9 @@@
          <field name="type">form</field>
          <field name="arch" type="xml">
              <form string="Asset category">
-            <group col="6" colspan="4">
-                 <field name="name" select="1" colspan="4"/>
+                 <field name="name" select="1"/>
 -                <field name="company_id" groups="base.group_multi_company"/>
 +                <field name="company_id" widget="selection" groups="base.group_multi_company"/>
-                 <newline/>
+                 <separator string="Accounting information" colspan="4" />
                  <field name="journal_id"/>
                  <field name="account_asset_id"/>
                  <field name="account_depreciation_id"/>