Merge lp:~openerp-community/openobject-addons/fix-1127198-import-invoice-payment-date into lp:openobject-addons/7.0

[Niels Huylebroeck]

[Serpent Consulting Services (serpent-consulting-services)]

Faced a similar issue and your fix is perfect!

review: Approve

[Open Net Sàrl (openerp-open-net)]

Hi,
Could you please review and merge it, It's been such a long time...

[Martin Trigaux (OpenERP) (mat-openerp)]

Hello,

Sorry for the long delay on this one and thanks for your work to fix the bug.

One small remark: Please do not make write calls in on_change methods. on_change should only be for user interface, no impact on the data (eg: if I close my browser after making the change in edit mode without saving).

On the bug report, you mentioned the issue that the date will be changed when confirming is late. On the other hand it is not really problematic as long as these are in draft.
What do you think ?

In the meanwhile I have merged your changes (everything except the on_change) into 7.0

Regards

revno: 9799 [merge]
revision-id: <email address hidden>

review: Approve

=== modified file 'account_voucher/account_voucher.py'
--- account_voucher/account_voucher.py	2013-05-14 11:52:13 +0000
+++ account_voucher/account_voucher.py	2013-05-15 14:01:27 +0000
@@ -1619,7 +1619,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)
@@ -1645,6 +1649,13 @@
 
 class account_bank_statement_line(osv.osv):
     _inherit = 'account.bank.statement.line'
+    
+    def onchange_line_date(self, cr, uid, ids, date, context=None):
+        voucher_obj = self.pool.get('account.voucher')
+        for statement_line in self.browse(cr, uid, ids, context=context):
+            if statement_line.voucher_id:
+                voucher_obj.write(cr, uid, [statement_line.voucher_id.id], {'date': date}, context=context)
+        return {}
 
     def onchange_partner_id(self, cr, uid, ids, partner_id, context=None):
         res = super(account_bank_statement_line, self).onchange_partner_id(cr, uid, ids, partner_id, context=context)
 
=== modified file 'account_voucher/account_voucher_view.xml'
--- account_voucher/account_voucher_view.xml	2013-04-08 00:55:26 +0000
+++ account_voucher/account_voucher_view.xml	2013-05-15 14:01:27 +0000
@@ -221,6 +221,9 @@
                 <field name="amount" position="attributes">
                     <attribute name="on_change">onchange_amount(amount)</attribute>
                 </field>
+                <xpath expr="//page[@name='statement_line_ids']/field[@name='line_ids']/tree/field[@name='date']" position="attributes">
+                    <attribute name="on_change">onchange_line_date(date)</attribute>
+                </xpath>
             </field>
         </record>
 
 
=== modified file 'account_voucher/wizard/account_statement_from_invoice.py'
--- account_voucher/wizard/account_statement_from_invoice.py	2012-12-18 17:55:47 +0000
+++ account_voucher/wizard/account_statement_from_invoice.py	2013-05-15 14:01:27 +0000
@@ -94,7 +94,7 @@
                             'account_id': result['value'].get('account_id', statement.journal_id.default_credit_account_id.id),
                             'company_id': statement.company_id.id,
                             'currency_id': statement.currency.id,
-                            'date': line.date,
+                            'date': statement.date,
                             'amount': sign*amount,
                             'payment_rate': result['value']['payment_rate'],
                             'payment_rate_currency_id': result['value']['payment_rate_currency_id'],
@@ -119,7 +119,7 @@
                 'statement_id': statement_id,
                 'ref': line.ref,
                 'voucher_id': voucher_id,
-                'date': time.strftime('%Y-%m-%d'),
+                'date': statement.date,
             }, context=context)
         return {'type': 'ir.actions.act_window_close'}