Merge lp:~openerp-dev/openobject-addons/trunk-bug-876320-uco into lp:openobject-addons

[Ujjvala Collins]

[FIX] account_asset:
-----------------------------------
* Fixed problem of category on change when creating asset from supplier invoice.

[qdp (OpenERP) (qdp)]

noooo

you should have done that in account_asset/account_asset_invoice.py around line 44..

please improve.
Quentin

review: Needs Fixing

[Ujjvala Collins (uco-openerp)]

Hello Quentin,

I have improved the code as per your suggestion. Please check.

Thanks,
Ujjvala

review: Needs Resubmitting

[Fabien (Open ERP) (fp-tinyerp)]

the asset computation was not correct, fixed in r5621

=== modified file 'account_asset/account_asset_invoice.py'
--- account_asset/account_asset_invoice.py	2011-11-08 20:14:25 +0000
+++ account_asset/account_asset_invoice.py	2011-11-09 11:53:30 +0000
@@ -51,6 +51,8 @@
                     'company_id': line.invoice_id.company_id.id,
                     'currency_id': line.invoice_id.currency_id.id,
                 }
+                changed_vals = asset_obj.onchange_category_id(cr, uid, [], vals['category_id'], context=context)
+                vals.update(changed_vals['value'])
                 asset_id = asset_obj.create(cr, uid, vals, context=context)
                 if line.asset_category_id.open_asset:
                     asset_obj.validate(cr, uid, [asset_id], context=context)