From 8ba3b54047ed9125e93cebd7d71502342cd69569 Mon Sep 17 00:00:00 2001
From: "aag (OpenERP)" <aag@tinyerp.co.in>
Date: Mon, 4 Apr 2011 19:08:12 +0530
Subject: [PATCH 01/12] [IMP]Base:ADD Give access to others users confg wiz

bzr revid: aag@tinyerp.co.in-20110404133812-4c2l8uu54wo3dkix
---
 openerp/addons/base/base_update.xml  | 20 ++++++++++++++++++++
 openerp/addons/base/ir/ir_actions.py |  4 ++--
 2 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/openerp/addons/base/base_update.xml b/openerp/addons/base/base_update.xml
index 914e3a9a488..c53c681bd1d 100644
--- a/openerp/addons/base/base_update.xml
+++ b/openerp/addons/base/base_update.xml
@@ -304,6 +304,26 @@
             <field name="view_id" ref="view_users_configuration_form"/>
             <field name="target">new</field>
         </record>
+        
+      <!--     Config Wiz     Give access to others users-->
+        
+        <record id="action_config_access_other_user" model="ir.actions.act_window">
+            <field name="name">Give access to others users</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">res.config.users</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="view_id" ref="view_users_form"/>
+        </record>
+        
+        <!--   register configuration wizard -->
+
+        <record id="config_wizard_action_config_user_form" model="ir.actions.todo">
+            <field name="action_id" ref="action_config_access_other_user"/>
+            <field name="restart">never</field>
+            <field name="target">current</field>
+            <field name="sequence">1000</field>
+        </record>
 
         <record id="view_confirm_simple_view_form" model="ir.ui.view">
             <field name="name">Configure Your Interface</field>
diff --git a/openerp/addons/base/ir/ir_actions.py b/openerp/addons/base/ir/ir_actions.py
index 1d73ad70171..58d068ee207 100644
--- a/openerp/addons/base/ir/ir_actions.py
+++ b/openerp/addons/base/ir/ir_actions.py
@@ -811,8 +811,8 @@ class ir_actions_todo(osv.osv):
             context = {}
         wizard_id = ids and ids[0] or False
         wizard = self.browse(cr, uid, wizard_id, context=context)
-        res = self.pool.get('ir.actions.act_window').read(cr, uid, wizard.action_id.id, ['name', 'view_type', 'view_mode', 'res_model', 'context', 'views', 'type'], context=context)
-        res.update({'target':'new', 'nodestroy': True})
+        res = self.pool.get('ir.actions.act_window').read(cr, uid, wizard.action_id.id, ['name', 'view_type', 'view_mode', 'res_model', 'context', 'views', 'type','target'], context=context)
+        res.update({'nodestroy': True})
         return res
 
     def action_open(self, cr, uid, ids, context=None):

From f3d713c62142c6230012e46ba60e457507d07e2b Mon Sep 17 00:00:00 2001
From: "aag (OpenERP)" <aag@tinyerp.co.in>
Date: Tue, 5 Apr 2011 13:59:47 +0530
Subject: [PATCH 02/12] [IMP]Base:ADD Define default users preferences confg
 wiz

bzr revid: aag@tinyerp.co.in-20110405082947-n5yfepjn7cehhmzd
---
 openerp/addons/base/base_update.xml | 54 +++++++++++++++++++++++++++++
 openerp/addons/base/res/res_user.py | 38 ++++++++++++++++++++
 2 files changed, 92 insertions(+)

diff --git a/openerp/addons/base/base_update.xml b/openerp/addons/base/base_update.xml
index c53c681bd1d..5cd12ea486f 100644
--- a/openerp/addons/base/base_update.xml
+++ b/openerp/addons/base/base_update.xml
@@ -378,5 +378,59 @@
             <field name="sequence">1</field>
             <field name="state">skip</field>
         </record>
+        
+<!--        Define default users preferences-->
+
+       <record id="view_user_preferences_config_form" model="ir.ui.view">
+            <field name="name">Define default users preferences</field>
+            <field name="model">user.preferences.config</field>
+            <field name="type">form</field>
+            <field name="inherit_id" ref="res_config_view_base"/>
+            <field name="arch" type="xml">
+              <data>
+                <form position="attributes">
+                  <attribute name="string">Define default users preferences</attribute>
+                </form>
+              <xpath expr='//separator[@string="title"]' position='attributes'>
+                    <attribute name='string'>Define default users preferences</attribute>
+              </xpath>
+              <xpath expr="//label[@string='description']"
+                 position="attributes">
+                <attribute name="string">Set Timezone,Language,Interface,MenuTip as default for all users by company.</attribute>
+              </xpath>
+              <xpath expr='//separator[@string="vsep"]' position='attributes'>
+                    <attribute name='string'></attribute>
+                    <attribute name='rowspan'>12</attribute>
+              </xpath>
+               <group string="res_config_contents" position="replace">
+                      <group colspan="4">
+                          <field colspan="4" name="company_id" />
+                          <field colspan="4" name="context_tz" />
+                          <field colspan="4" name="context_lang" />
+                          <field colspan="4" name="view" />
+                          <field colspan="4" name="menu_tips" />
+                    </group>
+                </group>
+              </data>
+            </field>
+        </record>
+
+        <record id="action_user_preferences_config_form" model="ir.actions.act_window">
+            <field name="name">Define default users preferences</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">user.preferences.config</field>
+            <field name="view_type">form</field>
+            <field name="view_id" ref="view_user_preferences_config_form"/>
+            <field name="view_mode">form</field>
+            <field name="target">new</field>
+        </record>
+
+        <!--   Register configuration wizard -->
+        
+        <record id="config_action_user_preferences_config_form" model="ir.actions.todo">
+            <field name="action_id" ref="action_user_preferences_config_form"/>
+            <field name="restart">on_trigger</field>
+        </record>
+        
     </data>
 </openerp>
diff --git a/openerp/addons/base/res/res_user.py b/openerp/addons/base/res/res_user.py
index 261ec699659..9d1dde26ea7 100644
--- a/openerp/addons/base/res/res_user.py
+++ b/openerp/addons/base/res/res_user.py
@@ -604,4 +604,42 @@ class res_config_view(osv.osv_memory):
 
 res_config_view()
 
+#       Define default users preferences config wiz
+
+class user_preferences_config(osv.osv_memory):
+    _name = 'user.preferences.config'
+    _inherit = 'res.config'
+    _columns = {
+        'company_id': fields.many2one('res.company', 'Company', required=True,
+            help="Select company for configure by company ."),
+        'context_tz': fields.selection(_tz_get,  'Timezone', size=64,
+            help="The company's timezone, used to perform timezone conversions "
+                 "between the server and the client."),
+        'context_lang': fields.selection(_lang_get, 'Language', required=True,
+            help="Sets the language for the company's user interface, when UI "
+                 "translations are available"),
+        'view': fields.selection([('simple','Simplified'),
+                                  ('extended','Extended')],
+                                 'Interface', required=True ),
+        'menu_tips': fields.boolean('Menu Tips', help="Check out this box if you want to always display tips on each menu action"),
+                                 
+    }
+    _defaults={
+               'company_id':lambda self,cr,uid,c: self.pool.get('res.users').browse(cr, uid, uid, c).company_id.id,
+               'view':lambda self,cr,uid,*args: self.pool.get('res.users').browse(cr, uid, uid).view or 'simple',
+               'context_lang':'en_US',
+    }
+
+    def execute(self, cr, uid, ids, context=None):
+        usr_obj = self.pool.get("res.users")
+        res = self.read(cr, uid, ids, ['company_id', 'context_tz', 'context_lang', 'view', 'menu_tips'], context=context)[0]
+        get_val = self.browse(cr, uid, ids)[0]
+        company_id = get_val.company_id.id
+        data_ids = usr_obj.search(cr,uid,[('company_id','=',get_val.company_id.id)])
+        if data_ids:
+            for w_id in data_ids:
+                usr_obj.write(cr, uid, [w_id], {'context_tz': get_val.context_tz,'context_lang':get_val.context_lang,'view':get_val.view,'menu_tips':get_val.menu_tips})
+
+user_preferences_config()
+
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file

From 64217176dda27e4389673806296d1447bfca449c Mon Sep 17 00:00:00 2001
From: "aag (OpenERP)" <aag@tinyerp.co.in>
Date: Tue, 5 Apr 2011 14:13:29 +0530
Subject: [PATCH 03/12] [IMP]Base:Skip Give access to others users confg wiz

bzr revid: aag@tinyerp.co.in-20110405084329-fklwv2bcun4lxm9z
---
 openerp/addons/base/base_update.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/openerp/addons/base/base_update.xml b/openerp/addons/base/base_update.xml
index 5cd12ea486f..1c19ba180aa 100644
--- a/openerp/addons/base/base_update.xml
+++ b/openerp/addons/base/base_update.xml
@@ -323,6 +323,7 @@
             <field name="restart">never</field>
             <field name="target">current</field>
             <field name="sequence">1000</field>
+            <field name="state">skip</field>
         </record>
 
         <record id="view_confirm_simple_view_form" model="ir.ui.view">

From 5ad06eed7d788e11b846976944e333d98727ef14 Mon Sep 17 00:00:00 2001
From: "aag (OpenERP)" <aag@tinyerp.co.in>
Date: Tue, 5 Apr 2011 17:25:36 +0530
Subject: [PATCH 04/12] [IMP]Base:Return True Define default users preferences
 confg wiz

bzr revid: aag@tinyerp.co.in-20110405115536-t55j58khnpqblvna
---
 openerp/addons/base/res/res_user.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/openerp/addons/base/res/res_user.py b/openerp/addons/base/res/res_user.py
index 9d1dde26ea7..e336d1a3a63 100644
--- a/openerp/addons/base/res/res_user.py
+++ b/openerp/addons/base/res/res_user.py
@@ -639,6 +639,7 @@ class user_preferences_config(osv.osv_memory):
         if data_ids:
             for w_id in data_ids:
                 usr_obj.write(cr, uid, [w_id], {'context_tz': get_val.context_tz,'context_lang':get_val.context_lang,'view':get_val.view,'menu_tips':get_val.menu_tips})
+        return True
 
 user_preferences_config()
 

From eb5374ef6495f693eab9a0121720735bf0cd7b6d Mon Sep 17 00:00:00 2001
From: "aag (OpenERP)" <aag@tinyerp.co.in>
Date: Tue, 5 Apr 2011 17:53:00 +0530
Subject: [PATCH 05/12] [IMP]Base:Optimize Define default users preferences
 confg wiz

bzr revid: aag@tinyerp.co.in-20110405122300-dva3sdeitn3dkv7s
---
 openerp/addons/base/res/res_user.py | 2 --
 1 file changed, 2 deletions(-)

diff --git a/openerp/addons/base/res/res_user.py b/openerp/addons/base/res/res_user.py
index e336d1a3a63..d52f1763b04 100644
--- a/openerp/addons/base/res/res_user.py
+++ b/openerp/addons/base/res/res_user.py
@@ -632,9 +632,7 @@ class user_preferences_config(osv.osv_memory):
 
     def execute(self, cr, uid, ids, context=None):
         usr_obj = self.pool.get("res.users")
-        res = self.read(cr, uid, ids, ['company_id', 'context_tz', 'context_lang', 'view', 'menu_tips'], context=context)[0]
         get_val = self.browse(cr, uid, ids)[0]
-        company_id = get_val.company_id.id
         data_ids = usr_obj.search(cr,uid,[('company_id','=',get_val.company_id.id)])
         if data_ids:
             for w_id in data_ids:

From 25c33f92d08090173073d1284dd47a9614bb47dd Mon Sep 17 00:00:00 2001
From: "aag (OpenERP)" <aag@tinyerp.co.in>
Date: Wed, 6 Apr 2011 12:10:14 +0530
Subject: [PATCH 06/12] [IMP]Base:ADD Report Button and Upload Logo wiz

bzr revid: aag@tinyerp.co.in-20110406064014-mknizxp8g0s4vva3
---
 openerp/addons/base/base_update.xml    | 37 +++++++++++++++++++++++
 openerp/addons/base/res/res_company.py | 41 ++++++++++++++++++++++++++
 2 files changed, 78 insertions(+)

diff --git a/openerp/addons/base/base_update.xml b/openerp/addons/base/base_update.xml
index 1c19ba180aa..c3cde80f8b6 100644
--- a/openerp/addons/base/base_update.xml
+++ b/openerp/addons/base/base_update.xml
@@ -180,6 +180,40 @@
                 </search>
             </field>
         </record>
+        
+             <!--
+    ======================
+    Logo wiz
+    ======================
+    -->
+        
+        <record id="view_res_company_logo" model="ir.ui.view">
+            <field name="name">res.company.logo.form</field>
+            <field name="model">res.company.logo</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Upload Logo">
+                    <separator string="Upload your company logo in JPG or PNG with a format similar to 450*150 pixels" colspan="4"/>
+                    <field colspan="4" height="150" name="logo" widget="image"/>
+                    <separator colspan="4"/>
+                    <group colspan="4" col="6">
+                       <label string="" colspan="2"/>
+                       <button icon="gtk-cancel" special="cancel" string="Cancel"/>
+                       <button icon="gtk-ok" string="Upload" name="execute" type="object"/>
+                    </group>
+                </form>
+            </field>
+        </record>
+
+        <record id="action_res_company_logo" model="ir.actions.act_window">
+            <field name="name">Set Logo</field>
+            <field name="res_model">res.company.logo</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+            <field name="view_id" ref="view_res_company_logo"/>
+            <field name="target">new</field>
+        </record>
+        
         <!--
     ======================
     Company
@@ -202,6 +236,9 @@
                             <field name="rml_footer1" colspan="4"/>
                             <field name="rml_footer2" colspan="4"/>
                             <field name="currency_id"/>
+                            <button name="createReport" string="Print" type="object" icon="gtk-print"/>
+                            <button name="%(action_res_company_logo)d"
+                    string="Upload your logo" type="action" icon="gtk-ok"/>
                             <separator colspan="4" string="Your Logo - Use a size of about 450x150 pixels."/>
                             <field colspan="4" name="logo" widget="image"/>
                         </page>
diff --git a/openerp/addons/base/res/res_company.py b/openerp/addons/base/res/res_company.py
index 0143b03fd2a..8d0fdb3c84b 100644
--- a/openerp/addons/base/res/res_company.py
+++ b/openerp/addons/base/res/res_company.py
@@ -68,6 +68,27 @@ class multi_company_default(osv.osv):
 
 multi_company_default()
 
+class res_company_logo(osv.osv_memory):
+    _name = 'res.company.logo'
+    _columns = {
+        'logo' : fields.binary('Logo'),
+    }
+    _defaults={
+    }
+
+    def execute(self, cr, uid, ids, context=None):
+        if context is None:
+            context = {}
+        comp_obj = self.pool.get("res.company")
+        get_val = self.browse(cr, uid, ids)[0]
+        comp_val = comp_obj.browse(cr, uid, ids)[0]
+        if comp_val.logo:
+            comp_obj.write(cr, uid, context['active_id'], {'logo': False})
+        if get_val.logo:      
+            comp_obj.write(cr, uid, context['active_id'], {'logo': get_val.logo})
+        return {'type': 'ir.actions.act_window_close'}
+    
+res_company_logo()
 
 class res_company(osv.osv):
     _name = "res.company"
@@ -138,6 +159,26 @@ class res_company(osv.osv):
             return []
         ids =  self.search(cr, uid, [('parent_id','child_of',[company])])
         return ids
+    
+#  For Report
+
+    def createReport(cr, uid, report, ids, name=False):
+        files = []
+        for id in ids:
+            try:
+                service = netsvc.LocalService(report)
+                (result, format) = service.create(cr, uid, [id], {}, {})
+                if not name:
+                    report_file = '/tmp/reports'+ str(id) + '.pdf'
+                else:
+                    report_file = name
+                fp = open(report_file,'wb+')
+                fp.write(result);
+                fp.close();
+                files += [report_file]    
+            except Exception,e:
+                continue        
+        return files
 
     def _get_partner_hierarchy(self, cr, uid, company_id, context={}):
         if company_id:

From 386090a16f2f0a9242d96a651bf26c48c7f48e36 Mon Sep 17 00:00:00 2001
From: "aag (OpenERP)" <aag@tinyerp.co.in>
Date: Wed, 6 Apr 2011 12:13:20 +0530
Subject: [PATCH 07/12] [IMP]Base:Rename Btn

bzr revid: aag@tinyerp.co.in-20110406064320-xa00hw8geb2tzz8o
---
 openerp/addons/base/base_update.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/openerp/addons/base/base_update.xml b/openerp/addons/base/base_update.xml
index c3cde80f8b6..d9ae041abec 100644
--- a/openerp/addons/base/base_update.xml
+++ b/openerp/addons/base/base_update.xml
@@ -236,7 +236,7 @@
                             <field name="rml_footer1" colspan="4"/>
                             <field name="rml_footer2" colspan="4"/>
                             <field name="currency_id"/>
-                            <button name="createReport" string="Print" type="object" icon="gtk-print"/>
+                            <button name="createReport" string="Preview Reports" type="object" icon="gtk-print"/>
                             <button name="%(action_res_company_logo)d"
                     string="Upload your logo" type="action" icon="gtk-ok"/>
                             <separator colspan="4" string="Your Logo - Use a size of about 450x150 pixels."/>

From feb56699b36cc97b3b979e7c712255f6459a65d9 Mon Sep 17 00:00:00 2001
From: "aag (OpenERP)" <aag@tinyerp.co.in>
Date: Wed, 6 Apr 2011 15:59:45 +0530
Subject: [PATCH 08/12] [IMP]Base:Change Fun -default set in  Define default
 users preferences confg wiz

bzr revid: aag@tinyerp.co.in-20110406102945-jw0dfand32hf7p0h
---
 openerp/addons/base/base_update.xml |  3 +--
 openerp/addons/base/res/res_user.py | 21 +++++++++------------
 2 files changed, 10 insertions(+), 14 deletions(-)

diff --git a/openerp/addons/base/base_update.xml b/openerp/addons/base/base_update.xml
index d9ae041abec..7f290611513 100644
--- a/openerp/addons/base/base_update.xml
+++ b/openerp/addons/base/base_update.xml
@@ -434,7 +434,7 @@
               </xpath>
               <xpath expr="//label[@string='description']"
                  position="attributes">
-                <attribute name="string">Set Timezone,Language,Interface,MenuTip as default for all users by company.</attribute>
+                <attribute name="string">Specify default values. These data are just default values, each user is free to change his own preferences.</attribute>
               </xpath>
               <xpath expr='//separator[@string="vsep"]' position='attributes'>
                     <attribute name='string'></attribute>
@@ -442,7 +442,6 @@
               </xpath>
                <group string="res_config_contents" position="replace">
                       <group colspan="4">
-                          <field colspan="4" name="company_id" />
                           <field colspan="4" name="context_tz" />
                           <field colspan="4" name="context_lang" />
                           <field colspan="4" name="view" />
diff --git a/openerp/addons/base/res/res_user.py b/openerp/addons/base/res/res_user.py
index d52f1763b04..1de755bccf1 100644
--- a/openerp/addons/base/res/res_user.py
+++ b/openerp/addons/base/res/res_user.py
@@ -610,13 +610,11 @@ class user_preferences_config(osv.osv_memory):
     _name = 'user.preferences.config'
     _inherit = 'res.config'
     _columns = {
-        'company_id': fields.many2one('res.company', 'Company', required=True,
-            help="Select company for configure by company ."),
         'context_tz': fields.selection(_tz_get,  'Timezone', size=64,
-            help="The company's timezone, used to perform timezone conversions "
+            help="Set default for new user's timezone, used to perform timezone conversions "
                  "between the server and the client."),
         'context_lang': fields.selection(_lang_get, 'Language', required=True,
-            help="Sets the language for the company's user interface, when UI "
+            help="Sets default language for the  new user's user interface, when UI "
                  "translations are available"),
         'view': fields.selection([('simple','Simplified'),
                                   ('extended','Extended')],
@@ -625,19 +623,18 @@ class user_preferences_config(osv.osv_memory):
                                  
     }
     _defaults={
-               'company_id':lambda self,cr,uid,c: self.pool.get('res.users').browse(cr, uid, uid, c).company_id.id,
                'view':lambda self,cr,uid,*args: self.pool.get('res.users').browse(cr, uid, uid).view or 'simple',
                'context_lang':'en_US',
     }
 
     def execute(self, cr, uid, ids, context=None):
-        usr_obj = self.pool.get("res.users")
-        get_val = self.browse(cr, uid, ids)[0]
-        data_ids = usr_obj.search(cr,uid,[('company_id','=',get_val.company_id.id)])
-        if data_ids:
-            for w_id in data_ids:
-                usr_obj.write(cr, uid, [w_id], {'context_tz': get_val.context_tz,'context_lang':get_val.context_lang,'view':get_val.view,'menu_tips':get_val.menu_tips})
-        return True
+        for o in self.browse(cr, uid, ids, context=context):
+            ir_values_obj = self.pool.get('ir.values')
+            ir_values_obj.set(cr, uid, 'default', False, 'context_tz', ['res.users'], o.context_tz)
+            ir_values_obj.set(cr, uid, 'default', False, 'context_lang', ['res.users'], o.context_lang)
+            ir_values_obj.set(cr, uid, 'default', False, 'view', ['res.users'], o.view)
+            ir_values_obj.set(cr, uid, 'default', False, 'menu_tips', ['res.users'], o.menu_tips)
+        return {}
 
 user_preferences_config()
 

From 509513f11b4a8c89e8aa33c91c751d323468f9d8 Mon Sep 17 00:00:00 2001
From: "aag (OpenERP)" <aag@tinyerp.co.in>
Date: Wed, 6 Apr 2011 18:06:07 +0530
Subject: [PATCH 09/12] [IMP]Base: save Give access to others users confg wiz

bzr revid: aag@tinyerp.co.in-20110406123607-t088sflpu6f59qxj
---
 openerp/addons/base/base_update.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/openerp/addons/base/base_update.xml b/openerp/addons/base/base_update.xml
index 7f290611513..57c0396126e 100644
--- a/openerp/addons/base/base_update.xml
+++ b/openerp/addons/base/base_update.xml
@@ -347,7 +347,7 @@
         <record id="action_config_access_other_user" model="ir.actions.act_window">
             <field name="name">Give access to others users</field>
             <field name="type">ir.actions.act_window</field>
-            <field name="res_model">res.config.users</field>
+            <field name="res_model">res.users</field>
             <field name="view_type">form</field>
             <field name="view_mode">form</field>
             <field name="view_id" ref="view_users_form"/>

From d2afc310d2b0c30d0644c7a5ec18afdfe66db07f Mon Sep 17 00:00:00 2001
From: "aag (OpenERP)" <aag@tinyerp.co.in>
Date: Wed, 6 Apr 2011 19:34:43 +0530
Subject: [PATCH 10/12] [IMP]Base: LOGO Done confg wiz

bzr revid: aag@tinyerp.co.in-20110406140443-wpprnhkwrhh7k3oh
---
 openerp/addons/base/base_update.xml    | 2 --
 openerp/addons/base/res/res_company.py | 9 ++-------
 2 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/openerp/addons/base/base_update.xml b/openerp/addons/base/base_update.xml
index 57c0396126e..04d76f80944 100644
--- a/openerp/addons/base/base_update.xml
+++ b/openerp/addons/base/base_update.xml
@@ -239,8 +239,6 @@
                             <button name="createReport" string="Preview Reports" type="object" icon="gtk-print"/>
                             <button name="%(action_res_company_logo)d"
                     string="Upload your logo" type="action" icon="gtk-ok"/>
-                            <separator colspan="4" string="Your Logo - Use a size of about 450x150 pixels."/>
-                            <field colspan="4" name="logo" widget="image"/>
                         </page>
                         <page string="Header/Footer" groups="base.group_extended">
                             <field colspan="4" name="rml_header" nolabel="1"/>
diff --git a/openerp/addons/base/res/res_company.py b/openerp/addons/base/res/res_company.py
index 8d0fdb3c84b..e5d18c00699 100644
--- a/openerp/addons/base/res/res_company.py
+++ b/openerp/addons/base/res/res_company.py
@@ -73,19 +73,14 @@ class res_company_logo(osv.osv_memory):
     _columns = {
         'logo' : fields.binary('Logo'),
     }
-    _defaults={
-    }
 
     def execute(self, cr, uid, ids, context=None):
         if context is None:
             context = {}
+        record_id = context.get('active_id', False) or False
         comp_obj = self.pool.get("res.company")
         get_val = self.browse(cr, uid, ids)[0]
-        comp_val = comp_obj.browse(cr, uid, ids)[0]
-        if comp_val.logo:
-            comp_obj.write(cr, uid, context['active_id'], {'logo': False})
-        if get_val.logo:      
-            comp_obj.write(cr, uid, context['active_id'], {'logo': get_val.logo})
+        comp_obj.write(cr, uid, record_id, {'logo': get_val.logo}, context=context)
         return {'type': 'ir.actions.act_window_close'}
     
 res_company_logo()

From e9a06c1b41c30d33c9b3047b34e5e5e4f0955ddf Mon Sep 17 00:00:00 2001
From: "aag (OpenERP)" <aag@tinyerp.co.in>
Date: Thu, 7 Apr 2011 14:59:25 +0530
Subject: [PATCH 11/12] [IMP]Base: menutip bydefault and Nolable in Logo Upload
 wiz

bzr revid: aag@tinyerp.co.in-20110407092925-vzccdcctzh4z0bd6
---
 openerp/addons/base/base_update.xml | 2 +-
 openerp/addons/base/res/res_user.py | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/openerp/addons/base/base_update.xml b/openerp/addons/base/base_update.xml
index 04d76f80944..9a4d0993a85 100644
--- a/openerp/addons/base/base_update.xml
+++ b/openerp/addons/base/base_update.xml
@@ -194,7 +194,7 @@
             <field name="arch" type="xml">
                 <form string="Upload Logo">
                     <separator string="Upload your company logo in JPG or PNG with a format similar to 450*150 pixels" colspan="4"/>
-                    <field colspan="4" height="150" name="logo" widget="image"/>
+                    <field colspan="4" height="150" name="logo" widget="image" nolabel="1"/>
                     <separator colspan="4"/>
                     <group colspan="4" col="6">
                        <label string="" colspan="2"/>
diff --git a/openerp/addons/base/res/res_user.py b/openerp/addons/base/res/res_user.py
index 1de755bccf1..5d9bf8b5f05 100644
--- a/openerp/addons/base/res/res_user.py
+++ b/openerp/addons/base/res/res_user.py
@@ -623,8 +623,9 @@ class user_preferences_config(osv.osv_memory):
                                  
     }
     _defaults={
-               'view':lambda self,cr,uid,*args: self.pool.get('res.users').browse(cr, uid, uid).view or 'simple',
-               'context_lang':'en_US',
+               'view' : lambda self,cr,uid,*args: self.pool.get('res.users').browse(cr, uid, uid).view or 'simple',
+               'context_lang' : 'en_US',
+               'menu_tips' : True
     }
 
     def execute(self, cr, uid, ids, context=None):

From d3b700742569e9c0dcb7c057e17e0d1445958e7d Mon Sep 17 00:00:00 2001
From: "aag (OpenERP)" <aag@tinyerp.co.in>
Date: Fri, 8 Apr 2011 12:12:34 +0530
Subject: [PATCH 12/12] [IMP]Base:Default Logo Set and Preview
 Reports,Upload/Change Logo btn put under Seprator

bzr revid: aag@tinyerp.co.in-20110408064234-b0jawj9ntdrmae8a
---
 openerp/addons/base/base_update.xml    | 7 +++++--
 openerp/addons/base/res/res_company.py | 3 +++
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/openerp/addons/base/base_update.xml b/openerp/addons/base/base_update.xml
index 9a4d0993a85..0680dcb4326 100644
--- a/openerp/addons/base/base_update.xml
+++ b/openerp/addons/base/base_update.xml
@@ -232,13 +232,16 @@
                     </group>
                     <notebook colspan="4">
                         <page string="General Information">
+                        <group colspan="4">
                             <field name="rml_header1" colspan="4"/>
                             <field name="rml_footer1" colspan="4"/>
                             <field name="rml_footer2" colspan="4"/>
-                            <field name="currency_id"/>
+                            <field name="currency_id" colspan="2"/>
+                         </group>
+                            <separator string="" colspan="4"/>
                             <button name="createReport" string="Preview Reports" type="object" icon="gtk-print"/>
                             <button name="%(action_res_company_logo)d"
-                    string="Upload your logo" type="action" icon="gtk-ok"/>
+                    string="Upload/Change Logo" type="action" icon="gtk-open"/>
                         </page>
                         <page string="Header/Footer" groups="base.group_extended">
                             <field colspan="4" name="rml_header" nolabel="1"/>
diff --git a/openerp/addons/base/res/res_company.py b/openerp/addons/base/res/res_company.py
index e5d18c00699..5db023d2547 100644
--- a/openerp/addons/base/res/res_company.py
+++ b/openerp/addons/base/res/res_company.py
@@ -73,6 +73,9 @@ class res_company_logo(osv.osv_memory):
     _columns = {
         'logo' : fields.binary('Logo'),
     }
+    _defaults={
+               'logo':lambda self,cr,uid,c: self.pool.get('res.company').browse(cr, uid, uid,c).logo,
+     }
 
     def execute(self, cr, uid, ids, context=None):
         if context is None: