From bce8ba79aee4719774d766efaa798f266f7c2cbe Mon Sep 17 00:00:00 2001
From: "Anup (OpenERP)" <ach@tinyerp.com>
Date: Tue, 12 Oct 2010 11:41:15 +0530
Subject: [PATCH] [REF] base : Corrections

bzr revid: ach@tinyerp.com-20101012061115-mlr5laakmficmoal
---
 bin/addons/base/i18n/zh_CN.po  | 6 +-----
 bin/addons/base/ir/ir_model.py | 4 ----
 2 files changed, 1 insertion(+), 9 deletions(-)

diff --git a/bin/addons/base/i18n/zh_CN.po b/bin/addons/base/i18n/zh_CN.po
index 6a9e40ba413..038d1fb7c8a 100644
--- a/bin/addons/base/i18n/zh_CN.po
+++ b/bin/addons/base/i18n/zh_CN.po
@@ -8018,7 +8018,7 @@ msgstr ""
 #: code:addons/base/res/res_lang.py:0
 #, python-format
 msgid "User Error"
-msgstr ""
+msgstr "用户错误"
 
 #. module: base
 #: code:addons/base/res/res_lang.py:0
@@ -9096,10 +9096,6 @@ msgstr ""
 #~ "defined !"
 #~ msgstr "该供应商的 付款方式未定义（计算）付款方式明细！"
 
-#, python-format
-#~ msgid "User Error"
-#~ msgstr "用户错误"
-
 #, python-format
 #~ msgid "not implemented"
 #~ msgstr "尚未实现"
diff --git a/bin/addons/base/ir/ir_model.py b/bin/addons/base/ir/ir_model.py
index 6f6668af7fa..b87e8bc9801 100644
--- a/bin/addons/base/ir/ir_model.py
+++ b/bin/addons/base/ir/ir_model.py
@@ -235,7 +235,6 @@ class ir_model_access(osv.osv):
     }
 
     def check_groups(self, cr, uid, group):
-        res = False
         grouparr  = group.split('.')
         if not grouparr:
             return False
@@ -427,13 +426,11 @@ class ir_model_data(osv.osv):
         return id
 
     def _update(self,cr, uid, model, module, values, xml_id=False, store=True, noupdate=False, mode='init', res_id=False, context=None):
-        warning = True
         model_obj = self.pool.get(model)
         if not context:
             context = {}
         if xml_id and ('.' in xml_id):
             assert len(xml_id.split('.'))==2, _("'%s' contains too many dots. XML ids should not contain dots ! These are used to refer to other modules data, as in module.reference_id") % (xml_id)
-            warning = False
             module, xml_id = xml_id.split('.')
         if (not xml_id) and (not self.doinit):
             return False
@@ -520,7 +517,6 @@ class ir_model_data(osv.osv):
         return True
 
     def ir_set(self, cr, uid, key, key2, name, models, value, replace=True, isobject=False, meta=None, xml_id=False):
-        obj = self.pool.get('ir.values')
         if type(models[0])==type([]) or type(models[0])==type(()):
             model,res_id = models[0]
         else: