From b72de20ec5fba82eb0a42939bfaf8f40a05b84ac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=A9dric=20Krier?= <ced@b2ck.com>
Date: Wed, 7 Jan 2009 15:19:22 +0100
Subject: [PATCH] Fix model name translation for issue733

---
 trytond/ir/translation.py | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/trytond/ir/translation.py b/trytond/ir/translation.py
index fdb39272e0..5c92377f76 100644
--- a/trytond/ir/translation.py
+++ b/trytond/ir/translation.py
@@ -129,12 +129,16 @@ class Translation(OSV, Cacheable):
             for record in records:
                 if ttype in ('field', 'help'):
                     name = record.model.model + ',' + record.name
+                else:
+                    name = record.model + ',' + field_name
                 trans_args.append((name, ttype, lang, None))
             self._get_sources(cursor, trans_args)
 
             for record in records:
                 if ttype in ('field', 'help'):
                     name = record.model.model + ',' + record.name
+                else:
+                    name = record.model + ',' + field_name
                 translations[record.id] = self._get_source(cursor,
                         name, ttype, lang)
             return translations
@@ -249,7 +253,8 @@ class Translation(OSV, Cacheable):
                         'AND src = %s ' \
                         'AND value != \'\' ' \
                         'AND value IS NOT NULL ' \
-                        'AND fuzzy = false',
+                        'AND fuzzy = false ' \
+                        'AND res_id = 0',
                     (lang, ttype, str(name), source))
         else:
             cursor.execute('SELECT value ' \
@@ -259,7 +264,8 @@ class Translation(OSV, Cacheable):
                         'AND name = %s ' \
                         'AND value != \'\' ' \
                         'AND value IS NOT NULL ' \
-                        'AND fuzzy = false ',
+                        'AND fuzzy = false ' \
+                        'AND res_id = 0',
                     (lang, ttype, str(name)))
         res = cursor.fetchone()
         if res:
@@ -304,7 +310,8 @@ class Translation(OSV, Cacheable):
                             'AND src = %s ' \
                             'AND value != \'\' ' \
                             'AND value IS NOT NULL ' \
-                            'AND fuzzy = false)'
+                            'AND fuzzy = false ' \
+                            'AND res_id = 0)'
                     value.extend((lang, ttype, str(name), source))
                 else:
                     clause += '(lang = %s ' \
@@ -312,7 +319,8 @@ class Translation(OSV, Cacheable):
                             'AND name = %s ' \
                             'AND value != \'\' ' \
                             'AND value IS NOT NULL ' \
-                            'AND fuzzy = false)'
+                            'AND fuzzy = false ' \
+                            'AND res_id = 0)'
                     value.extend((lang, ttype, str(name)))
         if clause:
             cursor.execute('SELECT lang, type, name, src, value ' \