openerp-community-reviewer team mailing list archive

[Pedro Manuel Baeza <pedro.baeza@xxxxxxxxx>]

Pedro Manuel Baeza has proposed merging lp:~pedro.baeza/ocb-addons/7.0-fix-1258237 into lp:ocb-addons.

Requested reviews:
  OpenERP Community Backports Team (ocb)

For more details, see:
https://code.launchpad.net/~pedro.baeza/ocb-addons/7.0-fix-1258237/+merge/197939

Fix for the bug #1258237. All the details in the bug.
-- 
https://code.launchpad.net/~pedro.baeza/ocb-addons/7.0-fix-1258237/+merge/197939
Your team OpenERP Community Backports Team is requested to review the proposed merge of lp:~pedro.baeza/ocb-addons/7.0-fix-1258237 into lp:ocb-addons.

=== modified file 'account_asset/account_asset.py'
--- account_asset/account_asset.py	2012-10-23 16:05:04 +0000
+++ account_asset/account_asset.py	2013-12-05 17:54:55 +0000
@@ -181,7 +181,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'),
@@ -410,9 +410,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,
                 }