[MERGE] Include a security branch to remove the possible sql injections

bzr revid: stephane@openerp.com-20100518093044-flp07h4j4lf639qu

diff --cc bin/addons/base/ir/ir_actions.py
Simple merge

diff --cc bin/addons/base/ir/ir_model.py
Simple merge

diff --cc bin/addons/base/ir/workflow/print_instance.py
Simple merge

diff --cc bin/addons/base/res/res_currency.py
Simple merge

diff --cc bin/osv/fields.py
index 726b76b,60c4115..2142284
--- 1/bin/osv/fields.py
--- 2/bin/osv/fields.py
+++ b/bin/osv/fields.py
@@@ -706,12 -713,10 +713,10 @@@ class related(function)
                  ids=[ids]
              objlst = obj.browse(cr, uid, ids)
              for data in objlst:
 -                t_id=None
 +                t_id = None
                  t_data = data
-                 relation = obj._name
                  for i in range(len(self.arg)):
                      field_detail = self._relations[i]
-                     relation = field_detail['object']
                      if not t_data[self.arg[i]]:
                          if self._type not in ('one2many', 'many2many'):
                              t_id = t_data['id']

diff --cc bin/osv/orm.py
Simple merge

diff --cc bin/tools/misc.py
Simple merge

diff --cc bin/tools/translate.py
Simple merge