Merge lp:~openerp-dev/openobject-addons/6.1-opw-574663-pso into lp:openobject-addons/6.1

Proposed by Priyesh (OpenERP)
Status: Approved
Approved by: Vinay Rana (OpenERP)
Approved revision: 6791
Proposed branch: lp:~openerp-dev/openobject-addons/6.1-opw-574663-pso
Merge into: lp:openobject-addons/6.1
Diff against target: 12 lines (+1/-1)
1 file modified
account_asset/account_asset.py (+1/-1)
To merge this branch: bzr merge lp:~openerp-dev/openobject-addons/6.1-opw-574663-pso
Reviewer Review Type Date Requested Status
Vinay Rana (OpenERP) (community) Approve
Xavier ALT Pending
Review via email: mp+105047@code.launchpad.net

Description of the change

Hello,

To reproduce the issue:
Create an asset with linear and prorata temporis, compute it and confirm asset.
From Depreciation board, Create move lines and check the period.

It should be of Depreciation date from Depreciation line , not of Purchase date of asset.

Kindly review it and guide me, If I am wrong.

Thanks,
Priyesh Solanki

To post a comment you must log in.
Revision history for this message
Vinay Rana (OpenERP) (vra-openerp) wrote :

The provided solution will solve the problem.

review: Approve
Revision history for this message
Naresh(OpenERP) (nch-openerp) wrote :

Hello,

This bug was qualified as Not Relevant on Trunk, as it has been improved in trunk in a different way (Always consider the current date instead of purchase date or depreciation date) If this Merge Proposal could not be merged in v6.1 at the release of v7.0, it will be closed.

Unmerged revisions

6791. By Luc De Meyer

[FIX] account_asset: Fixed the issue of fetching wrong period in Move creating from depriciation board(case:574663)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'account_asset/account_asset.py'
--- account_asset/account_asset.py 2012-01-31 13:36:57 +0000
+++ account_asset/account_asset.py 2012-05-08 09:49:18 +0000
@@ -355,7 +355,7 @@
355 for line in self.browse(cr, uid, ids, context=context):355 for line in self.browse(cr, uid, ids, context=context):
356 if currency_obj.is_zero(cr, uid, line.asset_id.currency_id, line.remaining_value):356 if currency_obj.is_zero(cr, uid, line.asset_id.currency_id, line.remaining_value):
357 can_close = True357 can_close = True
358 depreciation_date = line.asset_id.prorata and line.asset_id.purchase_date or time.strftime('%Y-%m-%d')358 depreciation_date = line.depreciation_date
359 period_ids = period_obj.find(cr, uid, depreciation_date, context=context)359 period_ids = period_obj.find(cr, uid, depreciation_date, context=context)
360 company_currency = line.asset_id.company_id.currency_id.id360 company_currency = line.asset_id.company_id.currency_id.id
361 current_currency = line.asset_id.currency_id.id361 current_currency = line.asset_id.currency_id.id