From b6dfde921fd940d4e2085e6cd1644a9c268bee40 Mon Sep 17 00:00:00 2001
From: "aag (OpenERP)" <aag@tinyerp.co.in>
Date: Tue, 12 Apr 2011 10:37:39 +0530
Subject: [PATCH 1/5] [IMP]Base:Type=normal, Define default users preferences
 confg wiz

bzr revid: aag@tinyerp.co.in-20110412050739-sz4ojroi41k024wj
---
 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 e1a9892aea6..0d4a4e23441 100644
--- a/openerp/addons/base/base_update.xml
+++ b/openerp/addons/base/base_update.xml
@@ -467,7 +467,7 @@
         
         <record id="config_action_user_preferences_config_form" model="ir.actions.todo">
             <field name="action_id" ref="action_user_preferences_config_form"/>
-            <field name="type">special</field>
+            <field name="type">normal</field>
         </record>
         
     </data>

From bab2da72d73b5f0390266c947ce3f4dd988bda95 Mon Sep 17 00:00:00 2001
From: "aag (OpenERP)" <aag@tinyerp.co.in>
Date: Tue, 12 Apr 2011 10:42:10 +0530
Subject: [PATCH 2/5] [IMP]Base:state=cancel, Give access to others users confg
 wiz

bzr revid: aag@tinyerp.co.in-20110412051210-nftzyzqrzk97voff
---
 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 0d4a4e23441..97eaff93627 100644
--- a/openerp/addons/base/base_update.xml
+++ b/openerp/addons/base/base_update.xml
@@ -361,7 +361,7 @@
             <field name="type">normal</field>
             <field name="target">current</field>
             <field name="sequence">1000</field>
-            <field name="state">skip</field>
+            <field name="state">cancel</field>
         </record>
 
         <record id="view_confirm_simple_view_form" model="ir.ui.view">

From 2baba06c432b24a2b2eccca545ace0d3815cbf71 Mon Sep 17 00:00:00 2001
From: "aag (OpenERP)" <aag@tinyerp.co.in>
Date: Tue, 12 Apr 2011 14:37:23 +0530
Subject: [PATCH 3/5] [IMP]Base:Remove Define default users preferences confg
 wiz From Server side

bzr revid: aag@tinyerp.co.in-20110412090723-1a9ra3js28dz93rv
---
 openerp/addons/base/base_update.xml | 52 -----------------------------
 openerp/addons/base/res/res_user.py | 35 -------------------
 2 files changed, 87 deletions(-)

diff --git a/openerp/addons/base/base_update.xml b/openerp/addons/base/base_update.xml
index 97eaff93627..eb1e34c3ce2 100644
--- a/openerp/addons/base/base_update.xml
+++ b/openerp/addons/base/base_update.xml
@@ -418,57 +418,5 @@
             <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">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>
-                    <attribute name='rowspan'>12</attribute>
-              </xpath>
-               <group string="res_config_contents" position="replace">
-                      <group colspan="4">
-                          <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="type">normal</field>
-        </record>
-        
     </data>
 </openerp>
diff --git a/openerp/addons/base/res/res_user.py b/openerp/addons/base/res/res_user.py
index 5d9bf8b5f05..261ec699659 100644
--- a/openerp/addons/base/res/res_user.py
+++ b/openerp/addons/base/res/res_user.py
@@ -604,39 +604,4 @@ 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 = {
-        'context_tz': fields.selection(_tz_get,  'Timezone', size=64,
-            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 default language for the  new user'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={
-               '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):
-        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()
-
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file

From 26adf1fb0d4429f06bfc9947e552675ea93891d6 Mon Sep 17 00:00:00 2001
From: "aag (OpenERP)" <aag@tinyerp.co.in>
Date: Tue, 12 Apr 2011 15:09:06 +0530
Subject: [PATCH 4/5] [IMP]Base:Remove Give access to others users wiz From
 Server side

bzr revid: aag@tinyerp.co.in-20110412093906-sbmq0owi23btas53
---
 openerp/addons/base/base_update.xml | 21 ---------------------
 1 file changed, 21 deletions(-)

diff --git a/openerp/addons/base/base_update.xml b/openerp/addons/base/base_update.xml
index eb1e34c3ce2..7f804b6f276 100644
--- a/openerp/addons/base/base_update.xml
+++ b/openerp/addons/base/base_update.xml
@@ -342,27 +342,6 @@
             <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.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="type">normal</field>
-            <field name="target">current</field>
-            <field name="sequence">1000</field>
-            <field name="state">cancel</field>
-        </record>
 
         <record id="view_confirm_simple_view_form" model="ir.ui.view">
             <field name="name">Configure Your Interface</field>

From ce81487410017722b387150e84d6458a86fc8d92 Mon Sep 17 00:00:00 2001
From: "aag (OpenERP)" <aag@tinyerp.co.in>
Date: Wed, 13 Apr 2011 16:19:07 +0530
Subject: [PATCH 5/5] [IMP]Base:Remove Uplode LOGO WIZ From Server side

bzr revid: aag@tinyerp.co.in-20110413104907-ppomrorkksa0fd0v
---
 openerp/addons/base/base_update.xml    | 39 --------------------------
 openerp/addons/base/res/res_company.py | 20 -------------
 2 files changed, 59 deletions(-)

diff --git a/openerp/addons/base/base_update.xml b/openerp/addons/base/base_update.xml
index 7f804b6f276..086459dbab7 100644
--- a/openerp/addons/base/base_update.xml
+++ b/openerp/addons/base/base_update.xml
@@ -181,39 +181,6 @@
             </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" nolabel="1"/>
-                    <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
@@ -232,16 +199,10 @@
                     </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" 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/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 5db023d2547..6401dc15365 100644
--- a/openerp/addons/base/res/res_company.py
+++ b/openerp/addons/base/res/res_company.py
@@ -68,26 +68,6 @@ 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={
-               '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:
-            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_obj.write(cr, uid, record_id, {'logo': get_val.logo}, context=context)
-        return {'type': 'ir.actions.act_window_close'}
-    
-res_company_logo()
-
 class res_company(osv.osv):
     _name = "res.company"
     _description = 'Companies'