Merge lp:~openerp-dev/openobject-addons/6.1-opw-574251-rha into lp:openobject-addons/6.1

[Rifakat Husen (OpenERP)]

Hello,

Force date and period update on voucher while confirming bank statement.
Forward port from 6.0 rev 5136.

Also fix bank statement lines' date creation using bank statement date while importing invoices, previously statement lines were having current date.

Please check this fix.

Regards,
Rifakat Haradwala

[Naresh(OpenERP) (nch-openerp)]

review: Approve

=== modified file 'account_voucher/account_voucher.py'
--- account_voucher/account_voucher.py	2012-03-30 11:07:16 +0000
+++ account_voucher/account_voucher.py	2012-05-03 12:59:19 +0000
@@ -1421,7 +1421,11 @@
         bank_st_line_obj = self.pool.get('account.bank.statement.line')
         st_line = bank_st_line_obj.browse(cr, uid, st_line_id, context=context)
         if st_line.voucher_id:
-            voucher_obj.write(cr, uid, [st_line.voucher_id.id], {'number': next_number}, context=context)
+            voucher_obj.write(cr, uid, [st_line.voucher_id.id],
+                            {'number': next_number,
+                            'date': st_line.date,
+                            'period_id': st_line.statement_id.period_id.id},
+                            context=context)
             if st_line.voucher_id.state == 'cancel':
                 voucher_obj.action_cancel_draft(cr, uid, [st_line.voucher_id.id], context=context)
             wf_service.trg_validate(uid, 'account.voucher', st_line.voucher_id.id, 'proforma_voucher', cr)
 
=== modified file 'account_voucher/wizard/account_statement_from_invoice.py'
--- account_voucher/wizard/account_statement_from_invoice.py	2012-01-31 13:36:57 +0000
+++ account_voucher/wizard/account_statement_from_invoice.py	2012-05-03 12:59:19 +0000
@@ -112,7 +112,7 @@
                 'statement_id': statement_id,
                 'ref': line.ref,
                 'voucher_id': voucher_id,
-                'date': time.strftime('%Y-%m-%d'), #time.strftime('%Y-%m-%d'), #line.date_maturity or,
+                'date': statement.date,
             }, context=context)
         return {'type': 'ir.actions.act_window_close'}