Merge lp:~pedro.baeza/openobject-addons/trunk-fix-1258237 into lp:openobject-addons

[Pedro Manuel Baeza]

Fix for lp:1258237. More info on the bug.

[lp:~pedro.baeza/openobject-addons/trunk-fix-1258237]

9087. By Niko (OpenERP) on 2014-02-28

[IMP] Add some video to manisfest ( website, website_blog, website_event, website_ecommerce)

Unmerged revisions

9181. By Pedro Manuel Baeza on 2014-02-24

[FIX] account_asset: Incorrect names of generated account move and move lines.

=== modified file 'account_asset/account_asset.py'
--- account_asset/account_asset.py	2014-02-10 06:46:42 +0000
+++ account_asset/account_asset.py	2014-02-24 23:38:04 +0000
@@ -179,7 +179,7 @@
                      'amount': amount,
                      'asset_id': asset.id,
                      'sequence': i,
-                     'name': str(asset.id) +'/' + str(i),
+                     'name': "%s/%s" %(i, undone_dotation_number),
                      'remaining_value': residual_amount,
                      'depreciated_value': (asset.purchase_value - asset.salvage_value) - (residual_amount + amount),
                      'depreciation_date': depreciation_date.strftime('%Y-%m-%d'),
@@ -407,9 +407,8 @@
             asset_name = line.asset_id.name
             reference = line.name
             move_vals = {
-                'name': asset_name,
                 'date': depreciation_date,
-                'ref': reference,
+                'ref': "%s %s" %(line.asset_id.code or line.asset_id.name, line.name),
                 'period_id': period_ids and period_ids[0] or False,
                 'journal_id': line.asset_id.category_id.journal_id.id,
                 }