Merge lp:~therp-nl/banking-addons/6.1-lp1017470-period_search_ignore_special into lp:banking-addons/6.1

[Stefan Rijnhart (Opener)]

[lp:~therp-nl/banking-addons/6.1-lp1017470-period_search_ignore_special]

138. By Stefan Rijnhart (Opener) on 2012-06-26

[FIX] remove call to debugger

=== modified file 'account_banking/wizard/bank_import.py'
--- account_banking/wizard/bank_import.py	2012-05-02 15:09:49 +0000
+++ account_banking/wizard/bank_import.py	2012-06-26 11:20:36 +0000
@@ -260,7 +260,8 @@
             # Get the period for the statement (as bank statement object checks this)
             period_ids = period_obj.search(cursor, uid, [('company_id','=',company.id),
                                                          ('date_start','<=',statement.date),
-                                                         ('date_stop','>=',statement.date)])
+                                                         ('date_stop','>=',statement.date),
+                                                         ('special', '=', False)])
 
             # Create the bank statement record
             statement_id = statement_obj.create(cursor, uid, dict(

=== modified file 'account_banking/wizard/banktools.py'
--- account_banking/wizard/banktools.py	2012-04-14 08:58:58 +0000
+++ account_banking/wizard/banktools.py	2012-06-26 11:20:36 +0000
@@ -71,7 +71,8 @@
     fiscalyear_id = fiscalyear_ids[0]
     period_ids = period_obj.search(cursor, uid, [
         ('date_start','<=',search_date), ('date_stop','>=',search_date),
-        ('fiscalyear_id','=',fiscalyear_id), ('state','=','draft')
+        ('fiscalyear_id','=',fiscalyear_id), ('state','=','draft'),
+        ('special', '=', False),
     ])
     if not period_ids:
         log.append(_('No suitable period found for date %(date)s and company %(company_name)s')