Merge lp:~pedro.baeza/ocb-addons/7.0-fix-1258237 into lp:ocb-addons

[Pedro Manuel Baeza]

Fix for the bug #1258237. All the details in the bug.

[Holger Brunn (Therp) (hbrunn)]

review: Approve (code review)

[Guewen Baconnier @ Camptocamp (gbaconnier-c2c)]

Has a similar merge been proposed upstream? I can't find one.

review: Needs Information

[Pedro Manuel Baeza (pedro.baeza)]

No, it hasn't, because I suppose that OpenERP is going to reject it (due to bug policy).

[xavi (xgilest)]

review: Approve

[Stefan Rijnhart (Opener) (stefan-opener)]

@Pedro, I think Guewen means: proposed to trunk, not 7.0. This should not be limited by the bug policy. Or does the issue not apply to trunk anymore?

review: Needs Information

[Pedro Manuel Baeza (pedro.baeza)]

Well, I put the corresponding patch in the bug report, because OpenERP never use foreign branches for MPs, and they get older very soon, so I think that it's the best way to get the fix patched on trunk/v7, don't you think?

Regards.

[Stefan Rijnhart (Opener) (stefan-opener)]

Oh I see, there is a patch. Still, I have the impression that MPs are the preferred format and it's an explicit requirement of OCB that such a branch be submitted to upstream OpenERP. Setting to 'Needs fixing' for that reason.

And they do merge branches sometimes, just not often enough (otherwise we would not be here).

review: Needs Fixing

[Pedro Manuel Baeza (pedro.baeza)]

Hi, Stefan, I have made then two MPs: one for v7 and another for trunk.

Regards.

[Stefan Rijnhart (Opener) (stefan-opener)]

Thanks! You don't actually need to make two proposals, especially because the one on 7.0 will likely merge cleanly on trunk.

review: Approve

[Holger Brunn (Therp) (hbrunn)]

review: Approve (code review)

=== 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,
                 }