From 3ebc68162a73df15c97612873cab67419568a8cf Mon Sep 17 00:00:00 2001
From: Yogesh Sakhreliya <ysa@tinyerp.com>
Date: Thu, 30 Dec 2010 14:47:34 +0530
Subject: [PATCH 01/12] [FIX] default languange set in partner according to
 database installation language.

bzr revid: ysa@tinyerp.com-20101230091734-0hrmb3fzpdy78w2v
---
 bin/addons/base/base_data.xml          |  2 +
 bin/addons/base/res/partner/partner.py |  3 +-
 bin/addons/base/res/res_lang.py        | 60 +++++++++++++++++++++++---
 bin/service/web_services.py            | 23 +++++-----
 bin/tools/translate.py                 | 45 +++----------------
 5 files changed, 76 insertions(+), 57 deletions(-)

diff --git a/bin/addons/base/base_data.xml b/bin/addons/base/base_data.xml
index 078e7512511..ef0c031068d 100644
--- a/bin/addons/base/base_data.xml
+++ b/bin/addons/base/base_data.xml
@@ -28,6 +28,8 @@
             <field name="translatable">True</field>
         </record>
 
+        <function name="install_lang" model="res.lang"/>
+
         <record id="ad" model="res.country">
             <field name="name">Andorra, Principality of</field>
             <field name="code">ad</field>
diff --git a/bin/addons/base/res/partner/partner.py b/bin/addons/base/res/partner/partner.py
index 3aed1c50aef..7a0f70c1e9c 100644
--- a/bin/addons/base/res/partner/partner.py
+++ b/bin/addons/base/res/partner/partner.py
@@ -138,7 +138,7 @@ class res_partner(osv.osv):
         'email': fields.related('address', 'email', type='char', size=240, string='E-mail'),
         'company_id': fields.many2one('res.company', 'Company', select=1),
     }
-    
+
     def _default_category(self, cr, uid, context={}):
         if 'category_id' in context and context['category_id']:
             return [context['category_id']]
@@ -149,6 +149,7 @@ class res_partner(osv.osv):
         'customer': lambda *a: 1,
         'category_id': _default_category,
         'company_id': lambda s,cr,uid,c: s.pool.get('res.company')._company_default_get(cr, uid, 'res.partner', context=c),
+        'lang': lambda self, cr, uid, context: context.get('lang',False) or tools.config.get('lang', False)
     }
     def copy(self, cr, uid, id, default={}, context={}):
         name = self.read(cr, uid, [id], ['name'])[0]['name']
diff --git a/bin/addons/base/res/res_lang.py b/bin/addons/base/res/res_lang.py
index 64bdb948d14..baeec49cf30 100644
--- a/bin/addons/base/res/res_lang.py
+++ b/bin/addons/base/res/res_lang.py
@@ -24,10 +24,60 @@ from locale import localeconv
 import tools
 from tools.safe_eval import safe_eval as eval
 from tools.translate import _
+import locale
+import logging
+
 class lang(osv.osv):
     _name = "res.lang"
     _description = "Languages"
 
+    def install_lang(self, cr, uid, **args):
+        self.load_lang(cr, uid, tools.config.get('lang'))
+        return True
+
+    def load_lang(self, cr, uid, lang, lang_name=None):
+        # create the language with locale information
+        fail = True
+        logger = logging.getLogger('i18n')
+        iso_lang = tools.get_iso_codes(lang)
+        for ln in tools.get_locales(lang):
+            try:
+                locale.setlocale(locale.LC_ALL, str(ln))
+                fail = False
+                break
+            except locale.Error:
+                continue
+        if fail:
+            lc = locale.getdefaultlocale()[0]
+            msg = 'Unable to get information for locale %s. Information from the default locale (%s) have been used.'
+            logger.warning(msg, lang, lc)
+
+        if not lang_name:
+            lang_name = tools.get_languages().get(lang, lang)
+
+
+        def fix_xa0(s):
+            if s == '\xa0':
+                return '\xc2\xa0'
+            return s
+
+        lang_info = {
+            'code': lang,
+            'iso_code': iso_lang,
+            'name': lang_name,
+            'translatable': 1,
+            'date_format' : str(locale.nl_langinfo(locale.D_FMT).replace('%y', '%Y')),
+            'time_format' : str(locale.nl_langinfo(locale.T_FMT)),
+            'decimal_point' : fix_xa0(str(locale.localeconv()['decimal_point'])),
+            'thousands_sep' : fix_xa0(str(locale.localeconv()['thousands_sep'])),
+        }
+
+        try:
+            self.create(cr, uid, lang_info)
+        finally:
+            tools.resetlocale()
+        return True
+
     def _get_default_date_format(self,cursor,user,context={}):
         return '%m/%d/%Y'
 
@@ -69,7 +119,7 @@ class lang(osv.osv):
         thousands_sep = lang_obj.thousands_sep or conv[monetary and 'mon_thousands_sep' or 'thousands_sep']
         decimal_point = lang_obj.decimal_point
         grouping = lang_obj.grouping
-        return (grouping, thousands_sep, decimal_point)        
+        return (grouping, thousands_sep, decimal_point)
 
     def write(self, cr, uid, ids, vals, context=None):
         for lang_id in ids :
@@ -95,19 +145,19 @@ class lang(osv.osv):
 
     def _group(self, cr, uid, ids, s, monetary=False, grouping=False, thousands_sep=''):
         grouping = eval(grouping)
-        
+
         if not grouping:
             return (s, 0)
 
         result = ""
         seps = 0
         spaces = ""
-        
+
         if s[-1] == ' ':
             sp = s.find(' ')
             spaces = s[sp:]
             s = s[:sp]
-            
+
         while s and grouping:
             # if grouping is -1, we are done
             if grouping[0] == -1:
@@ -139,7 +189,7 @@ class lang(osv.osv):
         if percent[0] != '%':
             raise ValueError("format() must be given exactly one %char format specifier")
 
-        lang_grouping, thousands_sep, decimal_point = self._lang_data_get(cr, uid, ids[0], monetary)        
+        lang_grouping, thousands_sep, decimal_point = self._lang_data_get(cr, uid, ids[0], monetary)
 
         formatted = percent % value
         # floats and decimal ints need special action!
diff --git a/bin/service/web_services.py b/bin/service/web_services.py
index 3c21202780a..b6bef3c7859 100644
--- a/bin/service/web_services.py
+++ b/bin/service/web_services.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
 #
@@ -15,7 +15,7 @@
 #    GNU Affero General Public License for more details.
 #
 #    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
@@ -50,8 +50,8 @@ class db(netsvc.ExportService):
         self._pg_psw_env_var_is_set = False # on win32, pg_dump need the PGPASSWORD env var
 
     def dispatch(self, method, auth, params):
-        if method in [ 'create', 'get_progress', 'drop', 'dump', 
-            'restore', 'rename', 
+        if method in [ 'create', 'get_progress', 'drop', 'dump',
+            'restore', 'rename',
             'change_admin_password', 'migrate_databases' ]:
             passwd = params[0]
             params = params[1:]
@@ -64,7 +64,7 @@ class db(netsvc.ExportService):
             raise KeyError("Method not found: %s" % method)
         fn = getattr(self, 'exp_'+method)
         return fn(*params)
-    
+
     def new_dispatch(self,method,auth,params):
         pass
     def _create_empty_database(self, name):
@@ -93,6 +93,7 @@ class db(netsvc.ExportService):
                     serv.actions[id]['progress'] = 0
                     cr = sql_db.db_connect(db_name).cursor()
                     tools.init_db(cr)
+                    tools.config['lang'] = lang
                     cr.commit()
                     cr.close()
                     cr = None
@@ -392,7 +393,7 @@ class common(_ObjectService):
             security.check_super(passwd)
         else:
             raise Exception("Method not found: %s" % method)
-        
+
         fn = getattr(self, 'exp_'+method)
         return fn(*params)
 
@@ -568,7 +569,7 @@ GNU Public Licence.
 
     def exp_check_connectivity(self):
         return bool(sql_db.db_connect('template1'))
-        
+
     def exp_get_os_time(self):
         return os.times()
 
@@ -598,7 +599,7 @@ class objects_proxy(netsvc.ExportService):
         res = fn(db, uid, *params)
         return res
 
-    
+
     def new_dispatch(self,method,auth,params):
         pass
 
@@ -634,7 +635,7 @@ class wizard(netsvc.ExportService):
         fn = getattr(self, 'exp_'+method)
         res = fn(db, uid, *params)
         return res
-    
+
     def new_dispatch(self,method,auth,params):
         pass
 
@@ -697,7 +698,7 @@ class report_spool(netsvc.ExportService):
         res = fn(db, uid, *params)
         return res
 
-    
+
     def new_dispatch(self,method,auth,params):
         pass
 
@@ -728,7 +729,7 @@ class report_spool(netsvc.ExportService):
                 self._reports[id]['format'] = format
                 self._reports[id]['state'] = True
             except Exception, exception:
-                
+
                 tb = sys.exc_info()
                 tb_s = "".join(traceback.format_exception(*tb))
                 logger = netsvc.Logger()
diff --git a/bin/tools/translate.py b/bin/tools/translate.py
index 1e29b4f474e..3ad66f3d041 100644
--- a/bin/tools/translate.py
+++ b/bin/tools/translate.py
@@ -346,7 +346,7 @@ class TinyPoFile(object):
 
         if name is None:
             if not fuzzy:
-                self.warn('Missing "#:" formated comment at line %d for the following source:\n\t%s', 
+                self.warn('Missing "#:" formated comment at line %d for the following source:\n\t%s',
                         self.cur_line(), source[:30])
             return self.next()
         return type, name, res_id, source, trad
@@ -537,9 +537,9 @@ def trans_generate(lang, modules, dbname=None):
 
     query = 'SELECT name, model, res_id, module'    \
             '  FROM ir_model_data'
-            
-    query_models = """SELECT m.id, m.model, imd.module 
-            FROM ir_model AS m, ir_model_data AS imd 
+
+    query_models = """SELECT m.id, m.model, imd.module
+            FROM ir_model AS m, ir_model_data AS imd
             WHERE m.id = imd.res_id AND imd.model = 'ir.model' """
 
     if 'all_installed' in modules:
@@ -841,42 +841,7 @@ def trans_load_data(db_name, fileobj, fileformat, lang, lang_name=None, verbose=
 
         if not ids:
             # lets create the language with locale information
-            fail = True
-            for ln in get_locales(lang):
-                try:
-                    locale.setlocale(locale.LC_ALL, str(ln))
-                    fail = False
-                    break
-                except locale.Error:
-                    continue
-            if fail:
-                lc = locale.getdefaultlocale()[0]
-                msg = 'Unable to get information for locale %s. Information from the default locale (%s) have been used.'
-                logger.warning(msg, lang, lc)
-
-            if not lang_name:
-                lang_name = tools.get_languages().get(lang, lang)
-
-            def fix_xa0(s):
-                if s == '\xa0':
-                    return '\xc2\xa0'
-                return s
-
-            lang_info = {
-                'code': lang,
-                'iso_code': iso_lang,
-                'name': lang_name,
-                'translatable': 1,
-                'date_format' : str(locale.nl_langinfo(locale.D_FMT).replace('%y', '%Y')),
-                'time_format' : str(locale.nl_langinfo(locale.T_FMT)),
-                'decimal_point' : fix_xa0(str(locale.localeconv()['decimal_point'])),
-                'thousands_sep' : fix_xa0(str(locale.localeconv()['thousands_sep'])),
-            }
-
-            try:
-                lang_obj.create(cr, uid, lang_info)
-            finally:
-                resetlocale()
+            lang_obj.load_lang(cr, 1, lang=lang, lang_name=lang_name)
 
 
         # now, the serious things: we read the language file

From 75bb78d293e90e4995107357e5422c8ee642daee Mon Sep 17 00:00:00 2001
From: Yogesh Sakhreliya <ysa@tinyerp.com>
Date: Fri, 31 Dec 2010 10:42:28 +0530
Subject: [PATCH 02/12] [FIX] check languange not install then call load_lang
 method.

bzr revid: ysa@tinyerp.com-20101231051228-k9m3h91zp0czrovl
---
 bin/addons/base/res/res_lang.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/bin/addons/base/res/res_lang.py b/bin/addons/base/res/res_lang.py
index baeec49cf30..79f9ebc7467 100644
--- a/bin/addons/base/res/res_lang.py
+++ b/bin/addons/base/res/res_lang.py
@@ -32,7 +32,9 @@ class lang(osv.osv):
     _description = "Languages"
 
     def install_lang(self, cr, uid, **args):
-        self.load_lang(cr, uid, tools.config.get('lang'))
+        avil_ids = self.search(cr, uid, [('code','=', tools.config.get('lang'))])
+        if not avil_ids:
+            self.load_lang(cr, uid, tools.config.get('lang'))
         return True
 
     def load_lang(self, cr, uid, lang, lang_name=None):

From 38092d24bfffa416ecf15943b691da4b98c71fd8 Mon Sep 17 00:00:00 2001
From: Yogesh Sakhreliya <ysa@tinyerp.com>
Date: Fri, 31 Dec 2010 11:43:14 +0530
Subject: [PATCH 03/12] [FIX-692891]

bzr revid: ysa@tinyerp.com-20101231061314-jhjc6c2uyeqko19x
---
 bin/osv/fields.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/bin/osv/fields.py b/bin/osv/fields.py
index 1bff99511ba..1d2bebbe9cb 100644
--- a/bin/osv/fields.py
+++ b/bin/osv/fields.py
@@ -553,7 +553,7 @@ class many2many(_column):
                       DeprecationWarning, stacklevel=2)
         obj = obj.pool.get(self._obj)
 
-        # static domains are lists, and are evaluated both here and on client-side, while string 
+        # static domains are lists, and are evaluated both here and on client-side, while string
         # domains supposed by dynamic and evaluated on client-side only (thus ignored here)
         # FIXME: make this distinction explicit in API!
         domain = isinstance(self._domain, list) and self._domain or []
@@ -1049,7 +1049,8 @@ class property(function):
         brs = properties.browse(cr, uid, nids, context=context)
         for prop in brs:
             value = properties.get_by_record(cr, uid, prop, context=context)
-            res[prop.res_id.id][prop.fields_id.name] = value or False
+            avil_id = obj.pool.get(value._name).search(cr, uid, [('id','=',value.id)], context=context)
+            res[prop.res_id.id][prop.fields_id.name] = (avil_id and value) and value or False
             if value and (prop.type == 'many2one'):
                 replaces.setdefault(value._name, {})
                 replaces[value._name][value.id] = True

From 7b37895c7f7d807cbf33f3b495ccadb92286965d Mon Sep 17 00:00:00 2001
From: Yogesh Sakhreliya <ysa@tinyerp.com>
Date: Fri, 31 Dec 2010 14:32:53 +0530
Subject: [PATCH 04/12] [FIX] use exists method instead of search method.

bzr revid: ysa@tinyerp.com-20101231090253-zh0escpwqtk80wtv
---
 bin/osv/fields.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bin/osv/fields.py b/bin/osv/fields.py
index 1d2bebbe9cb..4cd5889310f 100644
--- a/bin/osv/fields.py
+++ b/bin/osv/fields.py
@@ -1049,7 +1049,7 @@ class property(function):
         brs = properties.browse(cr, uid, nids, context=context)
         for prop in brs:
             value = properties.get_by_record(cr, uid, prop, context=context)
-            avil_id = obj.pool.get(value._name).search(cr, uid, [('id','=',value.id)], context=context)
+            avil_id = obj.pool.get(value._name).exists(cr, uid, value.id)
             res[prop.res_id.id][prop.fields_id.name] = (avil_id and value) and value or False
             if value and (prop.type == 'many2one'):
                 replaces.setdefault(value._name, {})

From d4b2226607975d4b91dd044bb33375062ed4f19b Mon Sep 17 00:00:00 2001
From: Yogesh Sakhreliya <ysa@tinyerp.com>
Date: Fri, 31 Dec 2010 15:02:40 +0530
Subject: [PATCH 05/12] [FIX] fixed error if user assign wrong image path.

bzr revid: ysa@tinyerp.com-20101231093240-2m7eg0bpre7x3xsb
---
 bin/addons/base/ir/ir_ui_menu.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/bin/addons/base/ir/ir_ui_menu.py b/bin/addons/base/ir/ir_ui_menu.py
index 8696df80311..e769c117b62 100644
--- a/bin/addons/base/ir/ir_ui_menu.py
+++ b/bin/addons/base/ir/ir_ui_menu.py
@@ -257,8 +257,10 @@ class ir_ui_menu(osv.osv):
     def read_image(self, path):
         path_info = path.split(',')
         icon_path = addons.get_module_resource(path_info[0],path_info[1])
-        icon = tools.file_open(icon_path,'rb').read()
-        return base64.encodestring(icon)
+        if icon_path:
+            icon = tools.file_open(icon_path,'rb').read()
+            icon_image = base64.encodestring(icon)
+        return icon_image
 
     def _get_image_icon(self, cr, uid, ids, name, args, context=None):
         res = {}

From 4e806c6d30cad46740c9eb5469e63d71d56dad8c Mon Sep 17 00:00:00 2001
From: Yogesh Sakhreliya <ysa@tinyerp.com>
Date: Mon, 3 Jan 2011 16:33:33 +0530
Subject: [PATCH 06/12] [FIX] add constraints in ir.model.fields for selection
 values.

bzr revid: ysa@tinyerp.com-20110103110333-xb8lm08mejv8nn4i
---
 bin/addons/base/ir/ir_model.py | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/bin/addons/base/ir/ir_model.py b/bin/addons/base/ir/ir_model.py
index 4dfe39a7762..f7b8bc2c1b7 100644
--- a/bin/addons/base/ir/ir_model.py
+++ b/bin/addons/base/ir/ir_model.py
@@ -185,6 +185,26 @@ class ir_model_fields(osv.osv):
         'selectable': lambda *a: 1,
     }
     _order = "name"
+
+    def _check_selection(self, cr, uid, ids, context=None):
+        obj = self.browse(cr, uid, ids[0], context=context)
+        try:
+            temp = eval(obj.selection)
+        except Exception:
+            raise except_orm(_('Error'), _("Given key and value in not allowed!"))
+
+        if (not isinstance(temp,list)) or (isinstance(temp,list) and not temp):
+            return False
+        elif temp:
+            for tpl in temp:
+                 if not isinstance(tpl,tuple) or (isinstance(tpl,tuple) and len(tpl) != 2):
+                    return False
+        return True
+
+    _constraints = [
+        (_check_selection, 'Wrong format specified for a field of type selection, it should be [(key,value)]', ['selection'])
+    ]
+
     def _size_gt_zero_msg(self, cr, user, ids, context=None):
         return _('Size of the field can never be less than 1 !')
 

From 470f98b9d4470f2392282682cd9b608a18596b99 Mon Sep 17 00:00:00 2001
From: Yogesh Sakhreliya <ysa@tinyerp.com>
Date: Mon, 3 Jan 2011 17:49:49 +0530
Subject: [PATCH 07/12] [FIX] remove default value set in partner.

bzr revid: ysa@tinyerp.com-20110103121949-ayvs047l94jzeyq5
---
 bin/addons/base/res/partner/partner.py |  1 -
 bin/addons/base/res/res_lang.py        | 13 +++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/bin/addons/base/res/partner/partner.py b/bin/addons/base/res/partner/partner.py
index 7a0f70c1e9c..8a6a6197ab3 100644
--- a/bin/addons/base/res/partner/partner.py
+++ b/bin/addons/base/res/partner/partner.py
@@ -149,7 +149,6 @@ class res_partner(osv.osv):
         'customer': lambda *a: 1,
         'category_id': _default_category,
         'company_id': lambda s,cr,uid,c: s.pool.get('res.company')._company_default_get(cr, uid, 'res.partner', context=c),
-        'lang': lambda self, cr, uid, context: context.get('lang',False) or tools.config.get('lang', False)
     }
     def copy(self, cr, uid, id, default={}, context={}):
         name = self.read(cr, uid, [id], ['name'])[0]['name']
diff --git a/bin/addons/base/res/res_lang.py b/bin/addons/base/res/res_lang.py
index 79f9ebc7467..d2dd53eab6b 100644
--- a/bin/addons/base/res/res_lang.py
+++ b/bin/addons/base/res/res_lang.py
@@ -32,9 +32,9 @@ class lang(osv.osv):
     _description = "Languages"
 
     def install_lang(self, cr, uid, **args):
-        avil_ids = self.search(cr, uid, [('code','=', tools.config.get('lang'))])
-        if not avil_ids:
-            self.load_lang(cr, uid, tools.config.get('lang'))
+        lang_ids = self.search(cr, uid, [('code','=', tools.config.get('lang'))])
+        if not lang_ids:
+            lang_id = self.load_lang(cr, uid, tools.config.get('lang'))
         return True
 
     def load_lang(self, cr, uid, lang, lang_name=None):
@@ -73,12 +73,13 @@ class lang(osv.osv):
             'decimal_point' : fix_xa0(str(locale.localeconv()['decimal_point'])),
             'thousands_sep' : fix_xa0(str(locale.localeconv()['thousands_sep'])),
         }
-
+        lang_id = False
         try:
-            self.create(cr, uid, lang_info)
+            lang_id = self.create(cr, uid, lang_info)
+            self.pool.get('ir.values').set(cr, uid, 'default', False, 'lang', ['res.partner'], lang)
         finally:
             tools.resetlocale()
-        return True
+        return lang_id
 
     def _get_default_date_format(self,cursor,user,context={}):
         return '%m/%d/%Y'

From 2218b36b50b34ba7641f59dd448a404ae28d067a Mon Sep 17 00:00:00 2001
From: Yogesh Sakhreliya <ysa@tinyerp.com>
Date: Mon, 3 Jan 2011 18:53:26 +0530
Subject: [PATCH 08/12] [IMP] improve change user password wizard.

bzr revid: ysa@tinyerp.com-20110103132326-18qzic0k7lk1sq2y
---
 bin/addons/base/base_update.xml | 30 ----------------------
 bin/addons/base/res/res_user.py | 44 ++++++---------------------------
 2 files changed, 8 insertions(+), 66 deletions(-)

diff --git a/bin/addons/base/base_update.xml b/bin/addons/base/base_update.xml
index 969b8d49bdd..18d8ee72658 100644
--- a/bin/addons/base/base_update.xml
+++ b/bin/addons/base/base_update.xml
@@ -70,34 +70,6 @@
     ======================
     -->
 
-        <record id="view_change_user_password_form" model="ir.ui.view">
-            <field name="name">change.user.password</field>
-            <field name="model">change.user.password</field>
-            <field name="type">form</field>
-            <field name="arch" type="xml">
-                <form string="Change Password">
-                    <field name="current_password" password="True" readonly="0" colspan="4"/>
-                    <field name="new_password" password="True" readonly="0" colspan="4"/>
-                    <field name="confirm_password" password="True" readonly="0" colspan="4"/>
-                    <label colspan="1" string=""/>
-                    <label colspan="3" string="You must logout and login again after changing your password."/>
-                    <separator colspan="4" />
-                    <label align="0.0" colspan="2" string=""/>
-                    <button colspan="1" icon="gtk-cancel" special="cancel" string="Cancel"/>
-                    <button colspan="1" icon="gtk-ok" name="change_password" string="Change" type="object"/>
-                </form>
-            </field>
-        </record>
-
-        <record id="action_view_change_password_form" model="ir.actions.act_window">
-            <field name="name">Change Password</field>
-            <field name="type">ir.actions.act_window</field>
-            <field name="res_model">change.user.password</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">form</field>
-            <field name="target">new</field>
-        </record>
-
         <record id="view_users_form_simple_modif" model="ir.ui.view">
             <field name="name">res.users.form.modif</field>
             <field name="model">res.users</field>
@@ -119,8 +91,6 @@
                             <field name="context_lang" completion="1" readonly="0"/>
                             <field name="context_tz" completion="1" readonly="0"/>
                             <field name="menu_tips" colspan="2" readonly="0"/>
-                            <label string="" colspan="1"/>
-                            <button name="%(action_view_change_password_form)d" string="Change Password" type="action" icon="gtk-execute"/>
                             <separator string="Email &amp; Signature" colspan="4"/>
                             <group colspan="4"><field name="user_email" widget="email" readonly="0"/></group>
                             <field colspan="4" name="signature" readonly="0" nolabel="1"/>
diff --git a/bin/addons/base/res/res_user.py b/bin/addons/base/res/res_user.py
index c8aa83f3253..d22023810d7 100644
--- a/bin/addons/base/res/res_user.py
+++ b/bin/addons/base/res/res_user.py
@@ -476,6 +476,13 @@ class users(osv.osv):
         finally:
             cr.close()
 
+    def change_password(self, cr, uid, ids, old_passwd, new_passwd):
+        if self.browse(cr, uid, uid).password != old_passwd:
+            raise  osv.except_osv(_('AccessDenied'), 'The current password does not match !')
+        else:
+            self.write(cr, uid, uid, {'password': new_passwd})
+        return True
+
 users()
 
 class config_users(osv.osv_memory):
@@ -574,39 +581,4 @@ class res_config_view(osv.osv_memory):
 
 res_config_view()
 
-class change_user_password(osv.osv_memory):
-    _name = 'change.user.password'
-    _columns = {
-        'current_password':fields.char('Current Password', size=64, required=True, help="Enter your current password."),
-        'new_password': fields.char('New Password', size=64, required=True, help="Enter the new password."),
-        'confirm_password': fields.char('Confirm Password', size=64, required=True, help="Enter the new password again for confirmation."),
-    }
-    _defaults={
-        'current_password' : '',
-        'new_password' : '',
-        'confirm_password' : '',
-    }
-
-    def change_password(self, cr, uid, ids, context=None):
-        for form_id in ids:
-            password_rec = self.browse(cr, uid, form_id, context)
-            if password_rec.new_password != password_rec.confirm_password:
-                raise osv.except_osv(_('Error !'), _('The new and confirmation passwords do not match, please double-check them.'))
-
-            # Validate current password without reading it from database,
-            # as it could be stored differently (LDAP, encrypted/hashed, etc.)
-            is_correct_password = False
-            try:
-                user_obj = self.pool.get('res.users')
-                is_correct_password = user_obj.check(cr.dbname, uid, password_rec.current_password)
-            except Exception:
-                pass
-            if not is_correct_password:
-                raise osv.except_osv(_('Error !'), _('The current password does not match, please double-check it.'))
-            user_obj.write(cr, uid, [uid], {'password': password_rec.new_password}, context=context)
-        return {}
-
-change_user_password()
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file

From b47f0239dc34e4ad3659094e7b32da02ef9a3c74 Mon Sep 17 00:00:00 2001
From: Yogesh Sakhreliya <ysa@tinyerp.com>
Date: Mon, 3 Jan 2011 19:00:24 +0530
Subject: [PATCH 09/12] [IMP]  improve message string.

bzr revid: ysa@tinyerp.com-20110103133024-r7jim80edc3fmyei
---
 bin/addons/base/res/res_user.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bin/addons/base/res/res_user.py b/bin/addons/base/res/res_user.py
index d22023810d7..103cc2784c3 100644
--- a/bin/addons/base/res/res_user.py
+++ b/bin/addons/base/res/res_user.py
@@ -478,7 +478,7 @@ class users(osv.osv):
 
     def change_password(self, cr, uid, ids, old_passwd, new_passwd):
         if self.browse(cr, uid, uid).password != old_passwd:
-            raise  osv.except_osv(_('AccessDenied'), 'The current password does not match !')
+            raise  osv.except_osv(_('AccessDenied'), 'The old password does not match !')
         else:
             self.write(cr, uid, uid, {'password': new_passwd})
         return True

From d6290ccd82529905e5917cb355c50481b1b77daf Mon Sep 17 00:00:00 2001
From: Yogesh Sakhreliya <ysa@tinyerp.com>
Date: Tue, 4 Jan 2011 10:04:15 +0530
Subject: [PATCH 10/12] [FIX] assign default value in icon_image variable in
 ir.ui.menu.

bzr revid: ysa@tinyerp.com-20110104043415-vt2br30i3esqwhm7
---
 bin/addons/base/ir/ir_ui_menu.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/bin/addons/base/ir/ir_ui_menu.py b/bin/addons/base/ir/ir_ui_menu.py
index e769c117b62..d1ea7b03e8b 100644
--- a/bin/addons/base/ir/ir_ui_menu.py
+++ b/bin/addons/base/ir/ir_ui_menu.py
@@ -257,6 +257,7 @@ class ir_ui_menu(osv.osv):
     def read_image(self, path):
         path_info = path.split(',')
         icon_path = addons.get_module_resource(path_info[0],path_info[1])
+        icon_image = False
         if icon_path:
             icon = tools.file_open(icon_path,'rb').read()
             icon_image = base64.encodestring(icon)
@@ -302,7 +303,7 @@ class ir_ui_menu(osv.osv):
                 ('ir.actions.server', 'ir.actions.server'),
             ]),
     }
-    
+
     def _rec_message(self, cr, uid, ids, context=None):
         return _('Error ! You can not create recursive Menu.')
 

From 623485b41b526b73419e9341a521000d25a7eeec Mon Sep 17 00:00:00 2001
From: Yogesh Sakhreliya <ysa@tinyerp.com>
Date: Tue, 4 Jan 2011 10:14:46 +0530
Subject: [PATCH 11/12] [FIX] old password check using check method in
 res.users.

bzr revid: ysa@tinyerp.com-20110104044446-x8407oskmg92ecg0
---
 bin/addons/base/res/res_user.py | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/bin/addons/base/res/res_user.py b/bin/addons/base/res/res_user.py
index 103cc2784c3..cf6b4690a33 100644
--- a/bin/addons/base/res/res_user.py
+++ b/bin/addons/base/res/res_user.py
@@ -477,10 +477,9 @@ class users(osv.osv):
             cr.close()
 
     def change_password(self, cr, uid, ids, old_passwd, new_passwd):
-        if self.browse(cr, uid, uid).password != old_passwd:
-            raise  osv.except_osv(_('AccessDenied'), 'The old password does not match !')
-        else:
-            self.write(cr, uid, uid, {'password': new_passwd})
+        for id in ids:
+            if self.check(cr.dbname, id, old_passwd):
+                self.write(cr, uid, uid, {'password': new_passwd})
         return True
 
 users()

From 3acdf9f9c12ac0acd25f9ff106568e585199b3f8 Mon Sep 17 00:00:00 2001
From: Yogesh Sakhreliya <ysa@tinyerp.com>
Date: Tue, 4 Jan 2011 11:15:12 +0530
Subject: [PATCH 12/12] [FIX] Create new db then check default languange is set
 or not in res.partner.

bzr revid: ysa@tinyerp.com-20110104054512-1nhao63res640c9t
---
 bin/addons/base/res/res_lang.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/bin/addons/base/res/res_lang.py b/bin/addons/base/res/res_lang.py
index d2dd53eab6b..f05c174a62a 100644
--- a/bin/addons/base/res/res_lang.py
+++ b/bin/addons/base/res/res_lang.py
@@ -33,8 +33,12 @@ class lang(osv.osv):
 
     def install_lang(self, cr, uid, **args):
         lang_ids = self.search(cr, uid, [('code','=', tools.config.get('lang'))])
+        values_obj = self.pool.get('ir.values')
         if not lang_ids:
             lang_id = self.load_lang(cr, uid, tools.config.get('lang'))
+        default_value = values_obj.get(cr, uid, 'default', False, 'res.partner')
+        if not default_value:
+            values_obj.set(cr, uid, 'default', False, 'lang', ['res.partner'], tools.config.get('lang'))
         return True
 
     def load_lang(self, cr, uid, lang, lang_name=None):
@@ -76,7 +80,6 @@ class lang(osv.osv):
         lang_id = False
         try:
             lang_id = self.create(cr, uid, lang_info)
-            self.pool.get('ir.values').set(cr, uid, 'default', False, 'lang', ['res.partner'], lang)
         finally:
             tools.resetlocale()
         return lang_id