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

[Vincent Renaville@camptocamp]

[FIX] add date of payment line instead of taking current date by default

[Stéphane Bidoul (Acsone) (sbi)]

[not tested in detail, so apologies if it's a dumb question]

Is this change made necessary by the suppression of the voucher?

Otherwise if it's independent of voucher_killer, would it not be better to submit it as a bug and patch the OCB branch?

-sbi

review: Needs Information (code review, no test)

[Frederic Clementi - Camptocamp (frederic-clementi)]

Yes Stéphane, this fix is necessary because of voucher_killer and account_payment module is dependant from account_voucher...
So difficult to report a bug.

[Stéphane Bidoul (Acsone) (sbi)]

Hi Frédéric,

I understand it is difficult to report as a bug.

I did a quick test and IMHO, proposing the payment line date as default is indeed an improvement to the default behaviour. I suggest documenting it as a feature of the module in __openerp__.py.

I also noticed that if line.date is null (which is allowed), it is not possible to add the payment line to the statement. I suggest writing something such as 'date': line.date or line.ml_maturity_date or time.strftime('%Y-%m-%d'),

-sbi

review: Needs Fixing

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

97. By Nicolas Bessi - Camptocamp on 2013-08-27

[PEP8]

98. By Nicolas Bessi - Camptocamp on 2013-08-27

[IMP] if no date on statement line, statement try to use ml_maturity_date or satement date

99. By Nicolas Bessi - Camptocamp on 2013-08-27

[IMP] module description

[Nicolas Bessi - Camptocamp (nbessi-c2c-deactivatedaccount)]

Hello

I have just done required modification. I also used the statement date as default fallback date instead of "now".

Regards

Nicolas

[Stéphane Bidoul (Acsone) (sbi)]

LGTM

review: Approve (code review rev99, test rev96)

[Romain Deheele - Camptocamp (romaindeheele)]

LGTM too

review: Approve (code review and test rev99)

=== modified file 'statement_voucher_killer/__openerp__.py'
--- statement_voucher_killer/__openerp__.py	2013-02-28 12:48:45 +0000
+++ statement_voucher_killer/__openerp__.py	2013-08-27 06:33:26 +0000
@@ -19,7 +19,7 @@
 #
 ##############################################################################
 
-{'name': 'voucher killer',
+{'name': 'Satement voucher killer',
  'version': '1.0.0',
  'category': 'other',
  'description': """
@@ -27,7 +27,15 @@
 #############################################################
 
 When importing invoice or payment into a bank statement or a payment order, normally a
-draft voucher is created on the line. This module will disable this voucher creation""",
+draft voucher is created on the line. This module will disable this voucher creation.
+When importing payment line, date used to populate statement
+line will be take from imported line in this order:
+
+ * Date
+ * Maturity date
+ * Related statement date
+
+""",
  'author': 'Camptocamp',
  'website': 'http://www.camptocamp.com',
  'depends': ['account_voucher', 'account_payment'],
 
=== modified file 'statement_voucher_killer/voucher.py'
--- statement_voucher_killer/voucher.py	2013-02-14 11:31:45 +0000
+++ statement_voucher_killer/voucher.py	2013-08-27 06:33:26 +0000
@@ -35,7 +35,7 @@
         statement_id = context.get('statement_id', False)
         if not statement_id:
             return {'type': 'ir.actions.act_window_close'}
-        data =  self.read(cr, uid, ids, context=context)[0]
+        data = self.read(cr, uid, ids, context=context)[0]
         line_ids = data['line_ids']
         if not line_ids:
             return {'type': 'ir.actions.act_window_close'}
@@ -61,7 +61,7 @@
             if line.amount_currency:
                 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):
+            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)
 
@@ -108,7 +108,7 @@
 
         for line in line_obj.browse(cr, uid, line_ids, context=context):
             ctx = context.copy()
-            ctx['date'] = line.ml_maturity_date # was value_date earlier,but this field exists no more now
+            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 not line.move_line_id.id:
@@ -122,6 +122,7 @@
                 'account_id': line.move_line_id.account_id.id,
                 'statement_id': statement.id,
                 'ref': line.communication,
+                'date': line.date or line.ml_maturity_date or statement.date,
                 }, context=context)
 
             line_obj.write(cr, uid, [line.id], {'bank_statement_line_id': st_line_id})