[MERGE] merge from trunk-dev-framework

bzr revid: odo@openerp.com-20100330113026-u49ic0qxq1sa51bn

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

diff --cc bin/report/interface.py
index 9f67bdd,371185d..6aecfe6
--- 1/bin/report/interface.py
--- 2/bin/report/interface.py
+++ b/bin/report/interface.py
@@@ -138,7 -138,8 +138,8 @@@ class report_rml(report_int)
      def create_rml(self, cr, xml, uid, context=None):
          if not context:
              context={}
-         service = netsvc.LocalService("object_proxy")
+         pool = pooler.get_pool(cr.dbname)
 -        ir_translation_obj = pool.get('ir.translation')            
++        ir_translation_obj = pool.get('ir.translation')
  
          # In some case we might not use xsl ...
          if not self.xsl:
@@@ -159,9 -160,7 +160,7 @@@
  
          def translate(doc, lang):
              for node in doc.xpath('//*[@t]'):
-                 translation = service.execute(
-                     cr.dbname, uid, 'ir.translation', '_get_source',
-                     self.name2, 'xsl', lang, node.text)
 -                translation = ir_translation_obj._get_source(cr, uid, self.name2, 'xsl', lang, node.text)        
++                translation = ir_translation_obj._get_source(cr, uid, self.name2, 'xsl', lang, node.text)
                  if translation:
                      node.text = translation