odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[FIX] account, mail, etc.: uniformize evaluated expressions 

opw-626694
master
Olivier Dony 2015-05-20 13:46:52 +02:00
parent ebb5ddcd65
commit 8d745f9f50
15 changed files with 21 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
addons/account/account.py
View File

@ -31,6 +31,7 @@ from openerp import tools
from openerp.osv import fields, osv, expression
from openerp.tools.translate import _
from openerp.tools.float_utils import float_round as round
from openerp.tools.safe_eval import safe_eval as eval
import openerp.addons.decimal_precision as dp
@ -2001,7 +2002,7 @@ class account_tax(osv.osv):
for tax in taxes:
if tax.applicable_type=='code':
localdict = {'price_unit':price_unit, 'product':product, 'partner':partner}
exec tax.python_applicable in localdict
eval(tax.python_applicable, localdict, mode="exec", nocopy=True)
if localdict.get('result', False):
res.append(tax)
else:
@ -2042,7 +2043,7 @@ class account_tax(osv.osv):
# data['amount'] = quantity
elif tax.type=='code':
localdict = {'price_unit':cur_price_unit, 'product':product, 'partner':partner, 'quantity': quantity}
exec tax.python_compute in localdict
eval(tax.python_compute, localdict, mode="exec", nocopy=True)
amount = localdict['result']
data['amount'] = amount
elif tax.type=='balance':
@ -2190,7 +2191,7 @@ class account_tax(osv.osv):
elif tax.type=='code':
localdict = {'price_unit':cur_price_unit, 'product':product, 'partner':partner}
exec tax.python_compute_inv in localdict
eval(tax.python_compute_inv, localdict, mode="exec", nocopy=True)
amount = localdict['result']
elif tax.type=='balance':
amount = cur_price_unit - reduce(lambda x,y: y.get('amount',0.0)+x, res, 0.0)

1
addons/account/wizard/account_invoice_refund.py
View File

@ -23,6 +23,7 @@ import time
from openerp.osv import fields, osv
from openerp.tools.translate import _
from openerp.tools.safe_eval import safe_eval as eval
class account_invoice_refund(osv.osv_memory):

3
addons/account_test/report/account_test_report.py
View File

@ -26,6 +26,7 @@ import time
from openerp.osv import osv
from openerp.tools.translate import _
from openerp.report import report_sxw
from openerp.tools.safe_eval import safe_eval as eval
#
@ -68,7 +69,7 @@ class report_assert_account(report_sxw.rml_parse):
'result': None, #used to store the result of the test
'column_order': None, #used to choose the display order of columns (in case you are returning a list of dict)
}
exec code_exec in localdict
eval(code_exec, localdict, mode="exec", nocopy=True)
result = localdict['result']
column_order = localdict.get('column_order', None)

1
addons/anonymization/anonymization.py
View File

@ -31,6 +31,7 @@ import random
import datetime
from openerp.osv import fields, osv
from openerp.tools.translate import _
from openerp.tools.safe_eval import safe_eval as eval
from itertools import groupby
from operator import itemgetter

1
addons/base_action_rule/base_action_rule.py
View File

@ -27,6 +27,7 @@ import openerp
from openerp import SUPERUSER_ID
from openerp.osv import fields, osv
from openerp.tools import DEFAULT_SERVER_DATETIME_FORMAT
from openerp.tools.safe_eval import safe_eval as eval
_logger = logging.getLogger(__name__)

1
addons/crm_partner_assign/crm_lead.py
View File

@ -21,6 +21,7 @@
from openerp.osv import osv
from openerp.tools.translate import _
from openerp.tools.safe_eval import safe_eval as eval
class crm_lead(osv.osv):

1
addons/delivery/delivery.py
View File

@ -24,6 +24,7 @@ import time
from openerp.osv import fields,osv
from openerp.tools.translate import _
import openerp.addons.decimal_precision as dp
from openerp.tools.safe_eval import safe_eval as eval
_logger = logging.getLogger(__name__)

1
addons/google_drive/google_drive.py
View File

@ -23,6 +23,7 @@ from openerp import SUPERUSER_ID
from openerp.addons.google_account import TIMEOUT
from openerp.osv import fields, osv
from openerp.tools.translate import _
from openerp.tools.safe_eval import safe_eval as eval
import werkzeug.urls
import urllib2

1
addons/l10n_fr/report/base_report.py
View File

@ -28,6 +28,7 @@
import time
from openerp.report import report_sxw
from openerp.tools.safe_eval import safe_eval as eval
class base_report(report_sxw.rml_parse):

1
addons/mail/mail_alias.py
View File

@ -28,6 +28,7 @@ from openerp.tools import ustr
from openerp.modules.registry import RegistryManager
from openerp import SUPERUSER_ID
from openerp.tools.translate import _
from openerp.tools.safe_eval import safe_eval as eval
_logger = logging.getLogger(__name__)

4
addons/share/wizard/share_wizard.py
View File

@ -600,8 +600,8 @@ class share_wizard(osv.TransientModel):
# other groups, so we duplicate if needed
rule = self._check_personal_rule_or_duplicate(cr, group_id, rule, context=context)
eval_ctx = rule_obj._eval_context_for_combinations()
org_domain = expression.normalize_domain(eval(rule.domain_force, eval_ctx))
new_clause = expression.normalize_domain(eval(domain, eval_ctx))
org_domain = expression.normalize_domain(safe_eval(rule.domain_force, eval_ctx))
new_clause = expression.normalize_domain(safe_eval(domain, eval_ctx))
combined_domain = expression.AND([new_clause, org_domain])
rule.write({'domain_force': combined_domain, 'name': rule.name + _('(Modified)')})
_logger.debug("Combining sharing rule %s on model %s with domain: %s", rule.id, model_id, domain)

1
addons/web_diagram/controllers/main.py
View File

@ -1,4 +1,5 @@
import openerp
from openerp.tools.safe_eval import safe_eval as eval
class DiagramView(openerp.http.Controller):

1
addons/website/models/ir_http.py
View File

@ -15,6 +15,7 @@ from openerp.addons.website.models.website import slug, url_for, _UNSLUG_RE
from openerp.http import request
from openerp.tools import config
from openerp.osv import orm
from openerp.tools.safe_eval import safe_eval as eval
logger = logging.getLogger(__name__)

2
openerp/osv/orm.py
View File

@ -11,6 +11,8 @@ from ..models import (
LOG_ACCESS_COLUMNS,
)
from openerp.tools.safe_eval import safe_eval as eval
# extra definitions for backward compatibility
browse_record_list = BaseModel

1
openerp/report/report_sxw.py
View File

@ -38,6 +38,7 @@ from openerp import SUPERUSER_ID
from openerp.osv.fields import float as float_field, function as function_field, datetime as datetime_field
from openerp.tools.translate import _
from openerp.tools import DEFAULT_SERVER_DATE_FORMAT, DEFAULT_SERVER_DATETIME_FORMAT
from openerp.tools.safe_eval import safe_eval as eval
_logger = logging.getLogger(__name__)