Merge lp:~camptocamp/banking-addons/bank-statement-reconcile-7.0_voucher_killer_vre into lp:banking-addons/bank-statement-reconcile-70

[Vincent Renaville@camptocamp]

It take the date of the payment line to set the bank statement line instead of maturity date of the payment line
See bug report

[Leonardo Pistone (lepistone)]

To the naked eye, there seems to be a long line. Can you give the comment its own line?

otherwise, il lgtm

thanks!

review: Needs Fixing

[Stefan Rijnhart (Opener) (stefan-opener)]

Thanks! Looks good, even if I had to verify for myself that line.date actually contains the payment order scheduled date even if this is changed after creating the payment lines (due to logic in the official payment module).

review: Approve

[Alexandre Fayolle - camptocamp (alexandre-fayolle-c2c)]

such fixes deserve an automated test

review: Abstain

[Pedro Manuel Baeza (pedro.baeza)]

Hi, Vincent, please make the MP against the correct branch bank-statement-reconcile-70. You can do it from "Resubmit proposal" link on the right part.

Regards.

review: Needs Fixing

[Pedro Manuel Baeza (pedro.baeza)]

LGTM

Regards.

review: Approve (code review)

[lp:~camptocamp/banking-addons/bank-statement-reconcile-7.0_voucher_killer_vre]

142. By Vincent Renaville@camptocamp on 2014-05-13

[FIX] pep8

[Pedro Manuel Baeza (pedro.baeza)]

This project is now hosted on https://github.com/OCA/bank-statement-reconcile. Please move your proposal there. This guide may help you https://github.com/OCA/maintainers-tools/wiki/How-to-move-a-Merge-Proposal-to-GitHub

Unmerged revisions

142. By Vincent Renaville@camptocamp on 2014-05-13

[FIX] pep8

141. By Vincent Renaville@camptocamp on 2014-04-03

[FIx] set correct date when import payment line into payment order: see bug #1301781

=== modified file 'statement_voucher_killer/voucher.py'
--- statement_voucher_killer/voucher.py	2014-03-04 16:27:19 +0000
+++ statement_voucher_killer/voucher.py	2014-05-13 15:20:41 +0000
@@ -45,7 +45,9 @@
         statement_line_obj = self.pool.get('account.bank.statement.line')
         currency_obj = self.pool.get('res.currency')
         line_date = time.strftime('%Y-%m-%d')
-        statement = statement_obj.browse(cr, uid, statement_id, context=context)
+        statement = statement_obj.browse(cr, uid,
+                                         statement_id,
+                                         context=context)
         # for each selected move lines
         for line in line_obj.browse(cr, uid, line_ids, context=context):
             ctx = context.copy()
@@ -59,11 +61,16 @@
                 amount = -line.credit
 
             if line.amount_currency:
-                amount = currency_obj.compute(cr, uid, line.currency_id.id,
-                    statement.currency.id, line.amount_currency, context=ctx)
+                amount = currency_obj.compute(cr, uid,
+                                              line.currency_id.id,
+                                              statement.currency.id,
+                                              line.amount_currency,
+                                              context=ctx)
             elif (line.invoice and line.invoice.currency_id.id != statement.currency.id):
-                amount = currency_obj.compute(cr, uid, line.invoice.currency_id.id,
-                    statement.currency.id, amount, context=ctx)
+                amount = currency_obj.compute(cr, uid,
+                                              line.invoice.currency_id.id,
+                                              statement.currency.id,
+                                              amount, context=ctx)
 
             context.update({'move_line_ids': [line.id],
                             'invoice_id': line.invoice.id})
@@ -87,8 +94,14 @@
                 'statement_id': statement_id,
                 'ref': move_line.ref,
                 'voucher_id': False,
+<<<<<<< TREE
                 'date': time.strftime('%Y-%m-%d'),
                 }
+=======
+                'date': line_date,
+            }, context=context)
+        return {'type': 'ir.actions.act_window_close'}
+>>>>>>> MERGE-SOURCE
 
 
 class AccountPaymentPopulateStatement(orm.TransientModel):
@@ -109,13 +122,21 @@
         if not line_ids:
             return {'type': 'ir.actions.act_window_close'}
 
-        statement = statement_obj.browse(cr, uid, context['active_id'], context=context)
+        statement = statement_obj.browse(cr,
+                                         uid,
+                                         context['active_id'],
+                                         context=context)
 
         for line in line_obj.browse(cr, uid, line_ids, context=context):
             ctx = context.copy()
-            ctx['date'] = line.ml_maturity_date  # Last value_date earlier,but this field exists no more now
-            amount = currency_obj.compute(cr, uid, line.currency.id,
-                    statement.currency.id, line.amount_currency, context=ctx)
+            # if the date is not set on the statement line
+            # we used the one set on statement
+            ctx['date'] = line.date or statement.date
+            amount = currency_obj.compute(cr, uid,
+                                          line.currency.id,
+                                          statement.currency.id,
+                                          line.amount_currency,
+                                          context=ctx)
             if not line.move_line_id.id:
                 continue
             context.update({'move_line_ids': [line.move_line_id.id]})
@@ -135,7 +156,18 @@
                 'partner_id': payment_line.partner_id.id,
                 'account_id': payment_line.move_line_id.account_id.id,
                 'statement_id': statement.id,
+<<<<<<< TREE
                 'ref': payment_line.communication,
                 'date': (payment_line.date or payment_line.ml_maturity_date or
                          statement.date)
                 }
+=======
+                'ref': line.communication,
+                'date': ctx['date'],
+                }, context=context)
+
+            line_obj.write(cr, uid,
+                           [line.id],
+                           {'bank_statement_line_id': st_line_id})
+        return {'type': 'ir.actions.act_window_close'}
+>>>>>>> MERGE-SOURCE