Merge lp:~openerp-dev/openobject-addons/trunk-bug-1078004-jco into lp:openobject-addons

[Josse Colpaert (OpenERP)]

The period of the moves created by the compute assets wizard is now that of the chosen period. The date chosen is end of the month of that period.

=== modified file 'account_asset/account_asset.py'
--- account_asset/account_asset.py	2012-12-17 15:23:03 +0000
+++ account_asset/account_asset.py	2012-12-21 14:55:51 +0000
@@ -331,6 +331,9 @@
         depreciation_obj = self.pool.get('account.asset.depreciation.line')
         period = period_obj.browse(cr, uid, period_id, context=context)
         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)
+        if context is None:
+            context = {}
+        context.update({'depreciation_date':period.date_stop})
         return depreciation_obj.create_move(cr, uid, depreciation_ids, context=context)
 
     def create(self, cr, uid, vals, context=None):
@@ -388,7 +391,7 @@
         created_move_ids = []
         asset_ids = []
         for line in self.browse(cr, uid, ids, context=context):
-            depreciation_date = time.strftime('%Y-%m-%d')
+            depreciation_date = context.get('depreciation_date') or time.strftime('%Y-%m-%d')
             period_ids = period_obj.find(cr, uid, depreciation_date, context=context)
             company_currency = line.asset_id.company_id.currency_id.id
             current_currency = line.asset_id.currency_id.id