Merge lp:~openerp-community/openobject-addons/trunk-bug-917732-pslt into lp:openobject-addons

Proposed by DJ Patel (OpenERP)
Status: Merged
Merged at revision: 6448
Proposed branch: lp:~openerp-community/openobject-addons/trunk-bug-917732-pslt
Merge into: lp:openobject-addons
Diff against target: 25 lines (+2/-2)
2 files modified
account_asset/account_asset.py (+1/-1)
account_asset/account_asset_demo.xml (+1/-1)
To merge this branch: bzr merge lp:~openerp-community/openobject-addons/trunk-bug-917732-pslt
Reviewer Review Type Date Requested Status
Raphael Collet (OpenERP) (community) Approve
Purnendu Singh (OpenERP) (community) Needs Resubmitting
qdp (OpenERP) Pending
Review via email: mp+90057@code.launchpad.net

Description of the change

Hello Sir,

I have fix the issue: https://bugs.launchpad.net/openobject-addons/+bug/917732 "Compute asset wizard don't include asset depreciation line date same like period start/end date".

Thanks and Regards,

Divyesh Makwana(MDI)

To post a comment you must log in.
Revision history for this message
Purnendu Singh (OpenERP) (purnendu-singh) :
review: Approve
Revision history for this message
Raphael Collet (OpenERP) (rco-openerp) wrote :

On its way to be merged.
Thanks,
Raphael

review: Approve
Revision history for this message
Raphael Collet (OpenERP) (rco-openerp) wrote :

It breaks the tests in account_asset. Please install the module with tests enabled, you will see that something is broken...

review: Needs Fixing
Revision history for this message
Purnendu Singh (OpenERP) (purnendu-singh) wrote :

Hello Raphael Collet,

Update the demo data so it will not break the YML test at the time of installation.

Thanks,
Purnendu Singh

review: Needs Resubmitting
Revision history for this message
Raphael Collet (OpenERP) (rco-openerp) wrote :

Looks fine, now.

Thanks,
Raphael

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'account_asset/account_asset.py'
2--- account_asset/account_asset.py 2012-01-25 16:06:06 +0000
3+++ account_asset/account_asset.py 2012-01-27 09:33:33 +0000
4@@ -309,7 +309,7 @@
5 period_obj = self.pool.get('account.period')
6 depreciation_obj = self.pool.get('account.asset.depreciation.line')
7 period = period_obj.browse(cr, uid, period_id, context=context)
8- depreciation_ids = depreciation_obj.search(cr, uid, [('asset_id', 'in', ids), ('depreciation_date', '<', period.date_stop), ('depreciation_date', '>', period.date_start), ('move_check', '=', False)], context=context)
9+ depreciation_ids = depreciation_obj.search(cr, uid, [('asset_id', 'in', ids), ('depreciation_date', '<=', period.date_stop), ('depreciation_date', '>=', period.date_start), ('move_check', '=', False)], context=context)
10 return depreciation_obj.create_move(cr, uid, depreciation_ids, context=context)
11
12 def create(self, cr, uid, vals, context=None):
13
14=== modified file 'account_asset/account_asset_demo.xml'
15--- account_asset/account_asset_demo.xml 2011-12-19 06:56:53 +0000
16+++ account_asset/account_asset_demo.xml 2012-01-27 09:33:33 +0000
17@@ -63,7 +63,7 @@
18 <field name="state">open</field>
19 <field eval="12" name="method_period"/>
20 <field eval="20" name="method_number"/>
21- <field name="purchase_date">2011-01-01</field>
22+ <field name="purchase_date">2012-01-01</field>
23 <field name="name">Office</field>
24 <field eval="500000.0" name="purchase_value"/>
25 <field name="category_id" ref="account_asset_category_fixedassets0"/>

Subscribers

People subscribed via source and target branches

to all changes: