[MERGE] account_asset: analytic entries fixed

bzr revid: qdp-launchpad@openerp.com-20110623151503-ahecqxywzio1euy3

addons/account_asset/account_asset.py

@@ -33,7 +33,6 @@ class account_asset_category(osv.osv):
     _columns = {
         'name': fields.char('Name', size=64, required=True, select=1),
         'note': fields.text('Note'),
-        '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),
@@ -411,7 +410,6 @@ class account_asset_depreciation_line(osv.osv):
                 'partner_id': line.asset_id.partner_id.id,
                 'currency_id': company_currency <> current_currency and  current_currency or False,
                 'amount_currency': company_currency <> current_currency and - sign * line.amount or 0.0,
-                'analytic_account_id': line.asset_id.category_id.account_analytic_id.id,
                 'date': depreciation_date,
             })
             move_line_obj.create(cr, uid, {

addons/account_asset/account_asset_view.xml

@@ -29,11 +29,10 @@
                     <field name="prorata"/>
                     <field name="open_asset"/>
                 </group>
-        	<group col="4" colspan="4" groups="analytic.group_analytic_accounting">
+        	<group col="2" colspan="2" groups="analytic.group_analytic_accounting">
         	    <separator string="Analytic information" colspan="4" />
         	    <newline/>
         	    <field name="account_analytic_id" />
-        	    <field name="journal_analytic_id" />
         	</group>
                 <separator string="Notes" colspan="4"/>
                 <field name="note" colspan="4" nolabel="1"/>