[Merge] with: lp:openobject-addons

bzr revid: dbr@tinyerp.com-20120702070001-rr2aj3cqpzhmozn8

addons/base_setup/__openerp__.py

@@ -38,7 +38,7 @@ Shows you a list of applications features to install from.
     'update_xml': ['security/ir.model.access.csv', 'base_setup_views.xml', 'res_config_view.xml'],
     'demo_xml': [],
     'installable': True,
-    'auto_install': True,
+    'auto_install': False,
     'certificate': '0086711085869',
     'images': ['images/base_setup1.jpeg','images/base_setup2.jpeg','images/base_setup3.jpeg','images/base_setup4.jpeg',],
 }

addons/base_setup/base_setup_views.xml

@@ -24,8 +24,8 @@
                 <attribute name="string">Specify Your Terminology</attribute>
               </form>
              <group string="res_config_contents" position="replace">
-             	<label string="You can use this wizard to change the terminologies for customers in the whole application."/>
-                	<separator string="Specify Your Terminology"/>
+                 <label string="You can use this wizard to change the terminologies for customers in the whole application."/>
+                    <separator string="Specify Your Terminology"/>
                     <group colspan="4">
                         <field colspan="4" name="partner"/>
                   </group>

addons/base_setup/res_config.py

@@ -43,7 +43,8 @@ class base_config_settings(osv.osv_memory):
             'view_mode': 'form',
             'res_model': 'res.company',
             'res_id': user.company_id.id,
-         }
+            'target': 'current',
+        }
 
 # Preferences wizard for Sales & CRM.
 # It is defined here because it is inherited independently in modules sale, crm,

addons/base_setup/res_config_view.xml

@@ -8,8 +8,9 @@
             <field name="arch" type="xml">
                 <form string="General Settings" version="7.0">
                     <header>
-                        <button string="Apply" type="object" name="execute" class="oe_highlight_on_dirty"/>
-                        <button string="Cancel" type="object" name="cancel"/>
+                        <button string="Apply" type="object" name="execute" class="oe_highlight"/>
+                        or
+                        <button string="Cancel" type="object" name="cancel" class="oe_link"/>
                     </header>
                     <sheet>
                         <group string="Company Settings">
@@ -55,8 +56,9 @@
             <field name="arch" type="xml">
                 <form string="Configure Sales" version="7.0">
                     <header>
-                        <button string="Apply" type="object" name="execute" class="oe_highlight_on_dirty"/>
-                        <button string="Cancel" type="object" name="cancel"/>
+                        <button string="Apply" type="object" name="execute" class="oe_highlight"/>
+                        or
+                        <button string="Cancel" type="object" name="cancel" class="oe_link"/>
                     </header>
                     <sheet>
                         <field name="module_crm" invisible="1"/>