Merge lp:~openerp-dev/openobject-addons/6.0-opw-592430-ado into lp:openobject-addons/6.0

[Amit Dodiya (OpenERP)]

Hello,

[FIX]account_voucher: (1) updated bank statement date on voucher while importing invoice which was taking invoice date on voucher (2) added onchange on date field of bank statement line so the date on voucher is updated accordingly

Issue:
1). While importing the invoice on bank statement the voucher is created and it takes the date from invoice instead of bank statement date.
2). Added onchange on "date" field of on bank statement line so while changing the date in bank statement line reflect in voucher and changed the voucher date according to statement line.

Unmerged revisions

5473. By Amit Dodiya (OpenERP) on 2013-05-16

[FIX]account_voucher: (1) updated bank statement date on voucher while importing invoice which was taking invoice date on voucher (2) added onchange on bank statement line so the statement line is updated on voucher

=== modified file 'account_voucher/account_voucher.py'
--- account_voucher/account_voucher.py	2013-02-28 08:55:11 +0000
+++ account_voucher/account_voucher.py	2013-05-17 05:42:28 +0000
@@ -1022,6 +1022,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 _amount_reconciled(self, cursor, user, ids, name, args, context=None):
         if not ids:

=== modified file 'account_voucher/account_voucher_view.xml'
--- account_voucher/account_voucher_view.xml	2012-03-13 11:43:02 +0000
+++ account_voucher/account_voucher_view.xml	2013-05-17 05:42:28 +0000
@@ -227,6 +227,9 @@
                 <xpath expr="/form/notebook/page[@name='statement_line_ids']/field[@name='line_ids']/tree/field[@name='amount']" position="after">
                     <field name="voucher_id" context="{'line_type': type, 'default_type': amount &lt; 0 and 'payment' or 'receipt', 'type': amount &lt; 0 and 'payment' or 'receipt', 'default_partner_id': partner_id, 'default_journal_id': parent.journal_id, 'default_amount': abs(amount), 'default_reference': ref, 'default_date': date, 'default_name': name}"/>
                 </xpath>
+                <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-11-29 11:02:12 +0000
+++ account_voucher/wizard/account_statement_from_invoice.py	2013-05-17 05:42:28 +0000
@@ -83,7 +83,7 @@
                             'account_id': result.get('account_id', statement.journal_id.default_credit_account_id.id), # improve me: 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':abs(amount),
                             'period_id':statement.period_id.id}
             voucher_id = voucher_obj.create(cr, uid, voucher_res, context=context)