Merge lp:~camptocamp/banking-addons/bank-statement-reconcile-7.0-fix-period-lep into lp:banking-addons/bank-statement-reconcile-70

[Leonardo Pistone]

[merge] choose real periods instead of opening ones

[Pedro Manuel Baeza (pedro.baeza)]

LGTM

review: Approve (code review)

[Pedro Manuel Baeza (pedro.baeza)]

I'm thinking that it's better to create a copy of the context to avoid side effects on upstream calls.

Regards.

review: Needs Fixing (code review)

[lp:~camptocamp/banking-addons/bank-statement-reconcile-7.0-fix-period-lep]

117. By Leonardo Pistone on 2014-01-30

[fix] copy the context before modifying it: safer upstream

118. By Leonardo Pistone on 2014-01-30

[imp] docstring

119. By Leonardo Pistone on 2014-01-30

[fix] similarly fix another _get_period

[Leonardo Pistone (lepistone)]

Thanks Pedro, fixed.

I found a similar method on the same file and did the same fix.

[Pedro Manuel Baeza (pedro.baeza)]

Thank you very much!

Regards.

review: Approve

[Romain Deheele - Camptocamp (romaindeheele)]

LGTM,

Romain

review: Approve (code review, no tests)

[Yannick Vaucher @ Camptocamp (yvaucher-c2c)]

Thanks Leonardo

I found the same bug for one of our client in v6.1

review: Approve (code review + test)

=== modified file 'account_statement_ext/statement.py'
--- account_statement_ext/statement.py	2014-01-17 13:22:47 +0000
+++ account_statement_ext/statement.py	2014-01-30 13:12:26 +0000
@@ -210,11 +210,13 @@
         return super(AccountBankSatement, self).create(cr, uid, vals, context=context)
 
     def _get_period(self, cr, uid, date, context=None):
-        """
-        Find matching period for date, used in the statement line creation.
-        """
+        """Return matching period for a date."""
+        if context is None:
+            context = {}
         period_obj = self.pool.get('account.period')
-        periods = period_obj.find(cr, uid, dt=date, context=context)
+        local_context = context.copy()
+        local_context['account_period_prefer_normal'] = True
+        periods = period_obj.find(cr, uid, dt=date, context=local_context)
         return periods and periods[0] or False
 
     def _check_company_id(self, cr, uid, ids, context=None):
@@ -571,14 +573,15 @@
     _inherit = "account.bank.statement.line"
 
     def _get_period(self, cr, uid, context=None):
-        """
-        Return a period from a given date in the context.
-        """
+        """Return matching period for a date."""
         if context is None:
             context = {}
+        period_obj = self.pool['account.period']
         date = context.get('date')
+        local_context = context.copy()
+        local_context['account_period_prefer_normal'] = True
         try:
-            periods = self.pool.get('account.period').find(cr, uid, dt=date)
+            periods = period_obj.find(cr, uid, dt=date, context=local_context)
         except osv.except_osv:
             # if no period defined, we are certainly at installation time
             return False