[IMP] import readability

This commit is contained in:
unknown
2013-03-22 09:31:27 +01:00
parent 4c54f0e1a2
commit 5b016572f4

View File

@@ -19,7 +19,7 @@
# #
############################################################################## ##############################################################################
from collections import defaultdict from collections import defaultdict
from re import escape import re
from tools.translate import _ from tools.translate import _
from openerp.osv.orm import Model, fields from openerp.osv.orm import Model, fields
@@ -285,7 +285,7 @@ class AccountStatementCompletionRule(Model):
[('bank_statement_label', '!=', False)]) [('bank_statement_label', '!=', False)])
line_ids = tuple(x.id for x in context.get('line_ids', [])) line_ids = tuple(x.id for x in context.get('line_ids', []))
for partner in partner_obj.browse(cr, uid, partner_ids, context=context): for partner in partner_obj.browse(cr, uid, partner_ids, context=context):
vals = '|'.join(escape(x.strip()) for x in partner.bank_statement_label.split(';')) vals = '|'.join(re.escape(x.strip()) for x in partner.bank_statement_label.split(';'))
or_regex = ".*%s*." % vals or_regex = ".*%s*." % vals
sql = ("SELECT id from account_bank_statement_line" sql = ("SELECT id from account_bank_statement_line"
" WHERE id in %s" " WHERE id in %s"
@@ -334,7 +334,7 @@ class AccountStatementCompletionRule(Model):
st_line = st_obj.browse(cr, uid, line_id, context=context) st_line = st_obj.browse(cr, uid, line_id, context=context)
if st_line: if st_line:
sql = "SELECT id FROM res_partner WHERE name ~* %s" sql = "SELECT id FROM res_partner WHERE name ~* %s"
pattern = ".*%s.*" % escape(st_line.label) pattern = ".*%s.*" % re.escape(st_line.label)
cr.execute(sql, (pattern,)) cr.execute(sql, (pattern,))
result = cr.fetchall() result = cr.fetchall()
if not result: if not result: