From 733f236a4fdb48bc11d13326a7bf485c77204e44 Mon Sep 17 00:00:00 2001
From: Tejas Tank <tta@openerp.com>
Date: Wed, 30 May 2012 19:16:13 +0530
Subject: config wizard cleanup

bzr revid: tta@openerp.com-20120530134613-bv6x9be14yho6nqr
---
 addons/base_setup/res_config.py       | 11 ++++-------
 addons/base_setup/res_config_view.xml |  5 +++++
 2 files changed, 9 insertions(+), 7 deletions(-)

(limited to 'addons/base_setup')

diff --git a/addons/base_setup/res_config.py b/addons/base_setup/res_config.py
index 92914f8f7a3..461347aee3a 100644
--- a/addons/base_setup/res_config.py
+++ b/addons/base_setup/res_config.py
@@ -28,13 +28,10 @@ class base_config_settings(osv.osv_memory):
         'module_multi_company': fields.boolean('Multi Company',
             help="""Work in multi-company environments, with appropriate security access between companies.
                 This installs the module multi_company."""),
-        'module_portal': fields.boolean('Portal',
-            help="""Define a portal for your customers or suppliers.  The portal is a group of
-                external users that has specific access rights and rules.
-                This installs the module portal."""),
-        'module_share': fields.boolean('Share',
-            help="""Share OpenERP documents (records) with external users.
-                This installs the module share."""),
+        'module_portal': fields.boolean('Activate Customer Portal',
+            help="""The portal will give access to a series of documents for your  customers; his quotations, his invoices, his projects, etc."""),
+        'module_share': fields.boolean('Allow Sharing Resources to External Users',
+            help="""As an example, you will be able to share a project or some tasks to  your customers, or quotes/sales to several persons at your customer  company, or your agenda availabilities to your contacts."""),
     }
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/base_setup/res_config_view.xml b/addons/base_setup/res_config_view.xml
index 0281263397a..464c11af4c7 100644
--- a/addons/base_setup/res_config_view.xml
+++ b/addons/base_setup/res_config_view.xml
@@ -23,6 +23,11 @@
                         <field name="module_share"/>
                         <newline/>
                         <field name="module_portal"/>
+                        <group col="4" colspan="4" >
+                            <p>You will also find several configuration options on your company data; address for the header and footer, overdue payments texts, etc.</p>
+                            <newline/>
+                            <p><button string="Configure Your Company Data"/></p>
+                        </group>
                     </sheet>
                 </form>
             </field>
-- 
cgit v1.2.3


From df1bf6336457285c7ee445672450e366f6174000 Mon Sep 17 00:00:00 2001
From: Tejas Tank <tta@openerp.com>
Date: Thu, 31 May 2012 13:07:26 +0530
Subject: Add Button : Configure your company data.

bzr revid: tta@openerp.com-20120531073726-00c9wpokzx6dtvhh
---
 addons/base_setup/res_config.py       | 19 ++++++++++++++++++-
 addons/base_setup/res_config_view.xml |  2 +-
 2 files changed, 19 insertions(+), 2 deletions(-)

(limited to 'addons/base_setup')

diff --git a/addons/base_setup/res_config.py b/addons/base_setup/res_config.py
index 461347aee3a..d18fda4fbcd 100644
--- a/addons/base_setup/res_config.py
+++ b/addons/base_setup/res_config.py
@@ -33,5 +33,22 @@ class base_config_settings(osv.osv_memory):
         'module_share': fields.boolean('Allow Sharing Resources to External Users',
             help="""As an example, you will be able to share a project or some tasks to  your customers, or quotes/sales to several persons at your customer  company, or your agenda availabilities to your contacts."""),
     }
-
+    
+    def open_company(self, cr, uid, ids, context=None):
+        if context is None:
+            context = {}
+            
+        company_obj = self.pool.get('res.company')        
+        company_id = company_obj.browse(cr, uid, uid, context=context).id
+                            
+        return {
+            'name': 'Your Company',
+            'view_type': 'form',
+            'view_mode': 'form,tree',
+            'res_model': 'res.company',
+            'res_id': company_id,
+            'view_id': False,
+            'type': 'ir.actions.act_window',
+         }
+         
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/base_setup/res_config_view.xml b/addons/base_setup/res_config_view.xml
index 464c11af4c7..737bc6fb72b 100644
--- a/addons/base_setup/res_config_view.xml
+++ b/addons/base_setup/res_config_view.xml
@@ -26,7 +26,7 @@
                         <group col="4" colspan="4" >
                             <p>You will also find several configuration options on your company data; address for the header and footer, overdue payments texts, etc.</p>
                             <newline/>
-                            <p><button string="Configure Your Company Data"/></p>
+                            <p><button type="object" name="open_company" string="Configure Your Company Data" icon="gtk-execute"/></p>
                         </group>
                     </sheet>
                 </form>
-- 
cgit v1.2.3


From 63a3d0fe188a6817e0cbfbabf2e8791215153062 Mon Sep 17 00:00:00 2001
From: Tejas Tank <tta@openerp.com>
Date: Fri, 1 Jun 2012 14:51:08 +0530
Subject: [fix] label are now bold

bzr revid: tta@openerp.com-20120601092108-zmh8qxqexqibb0lp
---
 addons/base_setup/res_config_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'addons/base_setup')

diff --git a/addons/base_setup/res_config_view.xml b/addons/base_setup/res_config_view.xml
index 737bc6fb72b..b8acd43dff3 100644
--- a/addons/base_setup/res_config_view.xml
+++ b/addons/base_setup/res_config_view.xml
@@ -16,7 +16,7 @@
                         <field name="module_multi_company"/>
 
                         <separator string="Others" colspan="4"/>
-                        <label string="Outgoing Mail Servers"/>
+                        <b><label string="Outgoing Mail Servers"/></b>
                         <button type="action" name="%(base.action_ir_mail_server_list)d"
                             string="Configure" icon="gtk-execute"/>
                         <newline/>
-- 
cgit v1.2.3


From ed652905be9c3ae71fe613b2bee005a54539a9b3 Mon Sep 17 00:00:00 2001
From: "Nimesh (Open ERP)" <nco@tinyerp.com>
Date: Thu, 7 Jun 2012 12:29:39 +0530
Subject: [IMP] set the view make make readonly false when plugins are
 installed and do the same when lead and claims are configured.

bzr revid: nco@tinyerp.com-20120607065939-72dz9tsmc318u53k
---
 addons/base_setup/base_setup_views.xml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'addons/base_setup')

diff --git a/addons/base_setup/base_setup_views.xml b/addons/base_setup/base_setup_views.xml
index 0692b4f651c..26019e556f9 100644
--- a/addons/base_setup/base_setup_views.xml
+++ b/addons/base_setup/base_setup_views.xml
@@ -51,7 +51,7 @@
                     <button string="Cancel" special="cancel"/>
                 </header>
                 <sheet layout="auto">
-                    <group>
+                    <group col="4">
                         <group name="config_sale" colspan="4"/>
 
                         <!-- this part is necessary to allow the plugins to extend the view -->
@@ -59,11 +59,11 @@
                         <group name="config_fetchmail" colspan="4" attrs="{'invisible': [('module_crm','=',False)]}">
                             <separator string="Emails"/>
                         </group>
-                        <field name="module_plugin_thunderbird" attrs="{'invisible': [('module_crm','=',False)]}"/>
                         <newline/>
-                        <field name="module_plugin_outlook" attrs="{'invisible': [('module_crm','=',False)]}"/>
-
-                        <group name="config_crm" colspan="4"/>
+                        <field name="module_plugin_thunderbird" attrs="{'invisible': [('module_crm','=',False)],'readonly': [('module_plugin_thunderbird','=',False)]}"/>
+                        <newline/>
+                        <field name="module_plugin_outlook" attrs="{'invisible': [('module_crm','=',False)],'readonly': [('module_plugin_outlook','=',False)]}"/>
+                        <group name="config_crm"/>
                     </group>
                 </sheet>
             </form>
-- 
cgit v1.2.3


From 0a377b68c8a93eada4e94ffadb9259c7e15572ba Mon Sep 17 00:00:00 2001
From: "Jalpesh Patel (OpenERP)" <pja@tinyerp.com>
Date: Thu, 7 Jun 2012 16:01:54 +0530
Subject: [IMP]improve general apply button red color in configuration wizard

bzr revid: pja@tinyerp.com-20120607103154-db1r7fzlz82prgb8
---
 addons/base_setup/base_setup_views.xml | 2 +-
 addons/base_setup/res_config_view.xml  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'addons/base_setup')

diff --git a/addons/base_setup/base_setup_views.xml b/addons/base_setup/base_setup_views.xml
index 0692b4f651c..4955a185771 100644
--- a/addons/base_setup/base_setup_views.xml
+++ b/addons/base_setup/base_setup_views.xml
@@ -47,7 +47,7 @@
         <field name="arch" type="xml">
             <form string="Configure Sales" layout="manual">
                 <header>
-                    <button string="Apply" type="object" name="execute"/>
+                    <button string="Apply" type="object" name="execute" class="oe_form_button_hi"/>
                     <button string="Cancel" special="cancel"/>
                 </header>
                 <sheet layout="auto">
diff --git a/addons/base_setup/res_config_view.xml b/addons/base_setup/res_config_view.xml
index ccf231924fe..0902793a52d 100644
--- a/addons/base_setup/res_config_view.xml
+++ b/addons/base_setup/res_config_view.xml
@@ -8,7 +8,7 @@
             <field name="arch" type="xml">
                 <form string="General Settings" layout="manual">
                     <header>
-                        <button string="Apply" type="object" name="execute"/>
+                        <button string="Apply" type="object" name="execute" class="oe_form_button_hi"/>
                         <button string="Cancel" special="cancel"/>
                     </header>
                     <sheet layout="auto">
-- 
cgit v1.2.3


From f14a2e573b685eeba2f80e275711dd2243e351bc Mon Sep 17 00:00:00 2001
From: "Nimesh (Open ERP)" <nco@tinyerp.com>
Date: Thu, 7 Jun 2012 18:06:21 +0530
Subject: [IMP] chage the help for plugins and make the plugin button visible
 when selected.

bzr revid: nco@tinyerp.com-20120607123621-rzgujw7bjes6yxlu
---
 addons/base_setup/base_setup.py        | 12 ++++++------
 addons/base_setup/base_setup_views.xml |  6 +++---
 2 files changed, 9 insertions(+), 9 deletions(-)

(limited to 'addons/base_setup')

diff --git a/addons/base_setup/base_setup.py b/addons/base_setup/base_setup.py
index 7a048a50eb4..ef80774c09c 100644
--- a/addons/base_setup/base_setup.py
+++ b/addons/base_setup/base_setup.py
@@ -105,17 +105,17 @@ class sale_config_settings(osv.osv_memory):
     _inherit = 'res.config.settings'
     _columns = {
         'module_crm': fields.boolean('CRM'),
-        'module_plugin_thunderbird': fields.boolean('Thunderbird Plugin',
+        'module_plugin_thunderbird': fields.boolean('Thunderbird Plugin', readonly= False,
             help="""The plugin allows you archive email and its attachments to the selected
-                OpenERP objects. You can select a partner, a task, a project, an analytical
-                account, or any other object and attach the selected mail as a .eml file in
+                OpenERP objects. You can select a partner, or a lead and 
+                attach the selected mail as a .eml file in
                 the attachment of a selected record. You can create documents for CRM Lead,
-                HR Applicant and Project Issue from the selected emails.
+                Partner from the selected emails.
                 This installs the module plugin_thunderbird."""),
         'module_plugin_outlook': fields.boolean('Outlook Plugin',
             help="""The Outlook plugin allows you to select an object that you would like to add
-                to your email and its attachments from MS Outlook. You can select a partner, a task,
-                a project, an analytical account, or any other object and archive a selected
+                to your email and its attachments from MS Outlook. You can select a partner, 
+                or a lead object and archive a selected
                 email into an OpenERP mail message with attachments.
                 This installs the module plugin_outlook."""),
     }
diff --git a/addons/base_setup/base_setup_views.xml b/addons/base_setup/base_setup_views.xml
index 26019e556f9..a23076e858c 100644
--- a/addons/base_setup/base_setup_views.xml
+++ b/addons/base_setup/base_setup_views.xml
@@ -60,9 +60,9 @@
                             <separator string="Emails"/>
                         </group>
                         <newline/>
-                        <field name="module_plugin_thunderbird" attrs="{'invisible': [('module_crm','=',False)],'readonly': [('module_plugin_thunderbird','=',False)]}"/>
-                        <newline/>
-                        <field name="module_plugin_outlook" attrs="{'invisible': [('module_crm','=',False)],'readonly': [('module_plugin_outlook','=',False)]}"/>
+	                        <field name="module_plugin_thunderbird" attrs="{'invisible': [('module_crm','=',False)]}"/>
+	                        <newline/>
+	                        <field name="module_plugin_outlook" attrs="{'invisible': [('module_crm','=',False)]}"/>
                         <group name="config_crm"/>
                     </group>
                 </sheet>
-- 
cgit v1.2.3


From d738cb519fb435934e2726c35f9294f999f893fe Mon Sep 17 00:00:00 2001
From: "Nimesh (Open ERP)" <nco@tinyerp.com>
Date: Fri, 8 Jun 2012 11:57:11 +0530
Subject: [IMP] set visible true for config fetchmail lead.

bzr revid: nco@tinyerp.com-20120608062711-67ank4egz40imr2p
---
 addons/base_setup/base_setup.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'addons/base_setup')

diff --git a/addons/base_setup/base_setup.py b/addons/base_setup/base_setup.py
index ef80774c09c..dd9bed97327 100644
--- a/addons/base_setup/base_setup.py
+++ b/addons/base_setup/base_setup.py
@@ -105,7 +105,7 @@ class sale_config_settings(osv.osv_memory):
     _inherit = 'res.config.settings'
     _columns = {
         'module_crm': fields.boolean('CRM'),
-        'module_plugin_thunderbird': fields.boolean('Thunderbird Plugin', readonly= False,
+        'module_plugin_thunderbird': fields.boolean('Thunderbird Plugin',
             help="""The plugin allows you archive email and its attachments to the selected
                 OpenERP objects. You can select a partner, or a lead and 
                 attach the selected mail as a .eml file in
-- 
cgit v1.2.3


From a266145cec713f31864e425c082e1bf9035b25a9 Mon Sep 17 00:00:00 2001
From: "Atul Patel (OpenERP)" <atp@tinyerp.com>
Date: Wed, 13 Jun 2012 12:27:47 +0530
Subject: [IMP]: Improve view based on new changes.

bzr revid: atp@tinyerp.com-20120613065747-22h2sqz915rzwx1f
---
 addons/base_setup/base_setup_views.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'addons/base_setup')

diff --git a/addons/base_setup/base_setup_views.xml b/addons/base_setup/base_setup_views.xml
index fa7385efae8..962498f9e72 100644
--- a/addons/base_setup/base_setup_views.xml
+++ b/addons/base_setup/base_setup_views.xml
@@ -43,7 +43,7 @@
                     <button string="Cancel" special="cancel"/>
                 </header>
                 <sheet>
-                    <group>
+                    <group col="4">
                         <group name="config_sale" colspan="4"/>
                         <!-- this part is necessary to allow the plugins to extend the view -->
                         <field name="module_crm" invisible="1"/>
-- 
cgit v1.2.3


From a2167e7184677418a1e0e54601d763943a9ded27 Mon Sep 17 00:00:00 2001
From: "Atul Patel (OpenERP)" <atp@tinyerp.com>
Date: Wed, 13 Jun 2012 13:32:57 +0530
Subject: [IMP]: Improve view

bzr revid: atp@tinyerp.com-20120613080257-gh8wydqnum6c9h46
---
 addons/base_setup/base_setup_views.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'addons/base_setup')

diff --git a/addons/base_setup/base_setup_views.xml b/addons/base_setup/base_setup_views.xml
index 962498f9e72..551a48f1b6c 100644
--- a/addons/base_setup/base_setup_views.xml
+++ b/addons/base_setup/base_setup_views.xml
@@ -47,7 +47,7 @@
                         <group name="config_sale" colspan="4"/>
                         <!-- this part is necessary to allow the plugins to extend the view -->
                         <field name="module_crm" invisible="1"/>
-                        <group name="config_fetchmail" colspan="2" attrs="{'invisible': [('module_crm','=',False)]}">
+                        <group name="config_fetchmail" colspan="4" attrs="{'invisible': [('module_crm','=',False)]}">
                             <separator string="Emails"/>
                         </group>
                             <newline/>
-- 
cgit v1.2.3


From ea65a49a94e51b9bc92b7541f5b7ab1bf19dd856 Mon Sep 17 00:00:00 2001
From: Raphael Collet <rco@openerp.com>
Date: Fri, 22 Jun 2012 11:49:40 +0200
Subject: [IMP] base_setup: move all res_config wizards to res_config files,
 and change xml id of sale.config.settings view

bzr revid: rco@openerp.com-20120622094940-jacovvqfyym0zjov
---
 addons/base_setup/base_setup.py        | 23 -----------------------
 addons/base_setup/base_setup_views.xml | 33 ---------------------------------
 addons/base_setup/res_config.py        | 33 ++++++++++++++++++++++++++++-----
 addons/base_setup/res_config_view.xml  | 33 +++++++++++++++++++++++++++++++++
 4 files changed, 61 insertions(+), 61 deletions(-)

(limited to 'addons/base_setup')

diff --git a/addons/base_setup/base_setup.py b/addons/base_setup/base_setup.py
index dd9bed97327..9c1d7d9fa8e 100644
--- a/addons/base_setup/base_setup.py
+++ b/addons/base_setup/base_setup.py
@@ -97,27 +97,4 @@ class specify_partner_terminology(osv.osv_memory):
                 self.make_translations(cr, uid, ids, act_ref, 'model', act_id.help, _case_insensitive_replace(act_id.help,'Customer',o.partner), res_id=act_id.id, context=context)
         return {}
 
-# Preferences wizard for Sales & CRM.
-# It is defined here because it is inherited independently in modules sale, crm,
-# plugin_outlook and plugin_thunderbird.
-class sale_config_settings(osv.osv_memory):
-    _name = 'sale.config.settings'
-    _inherit = 'res.config.settings'
-    _columns = {
-        'module_crm': fields.boolean('CRM'),
-        'module_plugin_thunderbird': fields.boolean('Thunderbird Plugin',
-            help="""The plugin allows you archive email and its attachments to the selected
-                OpenERP objects. You can select a partner, or a lead and 
-                attach the selected mail as a .eml file in
-                the attachment of a selected record. You can create documents for CRM Lead,
-                Partner from the selected emails.
-                This installs the module plugin_thunderbird."""),
-        'module_plugin_outlook': fields.boolean('Outlook Plugin',
-            help="""The Outlook plugin allows you to select an object that you would like to add
-                to your email and its attachments from MS Outlook. You can select a partner, 
-                or a lead object and archive a selected
-                email into an OpenERP mail message with attachments.
-                This installs the module plugin_outlook."""),
-    }
-
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/base_setup/base_setup_views.xml b/addons/base_setup/base_setup_views.xml
index 631e4a10e07..eb59d918681 100644
--- a/addons/base_setup/base_setup_views.xml
+++ b/addons/base_setup/base_setup_views.xml
@@ -43,38 +43,5 @@
           <field name="target">new</field>
       </record>
 
-    <!-- Sale config wizard -->
-    <record id="base.view_sale_config_settings" model="ir.ui.view">
-        <field name="name">sale settings</field>
-        <field name="model">sale.config.settings</field>
-        <field name="type">form</field>
-        <field name="arch" type="xml">
-            <form string="Configure Sales" version="7.0">
-                <header>
-                    <button string="Apply" type="object" name="execute" class="oe_highlight"/>
-                    <button string="Cancel" special="cancel"/>
-                </header>
-                <sheet>
-                    <field name="module_crm" invisible="1"/>
-                    <group name="config_sale"/>
-                    <group name="config_fetchmail" string="Emails" attrs="{'invisible': [('module_crm','=',False)]}">
-                        <field name="module_plugin_thunderbird"/>
-                        <field name="module_plugin_outlook"/>
-                    </group>
-                    <group name="config_crm"/>
-                </sheet>
-            </form>
-        </field>
-    </record>
-
-    <record id="base.action_sale_config" model="ir.actions.act_window">
-        <field name="name">Configure Sales</field>
-        <field name="type">ir.actions.act_window</field>
-        <field name="res_model">sale.config.settings</field>
-        <field name="view_id" ref="base.view_sale_config_settings"/>
-        <field name="view_mode">form</field>
-        <field name="target">inline</field>
-    </record>
-
   </data>
 </openerp>
diff --git a/addons/base_setup/res_config.py b/addons/base_setup/res_config.py
index d18fda4fbcd..00e2a8a9fa4 100644
--- a/addons/base_setup/res_config.py
+++ b/addons/base_setup/res_config.py
@@ -33,14 +33,14 @@ class base_config_settings(osv.osv_memory):
         'module_share': fields.boolean('Allow Sharing Resources to External Users',
             help="""As an example, you will be able to share a project or some tasks to  your customers, or quotes/sales to several persons at your customer  company, or your agenda availabilities to your contacts."""),
     }
-    
+
     def open_company(self, cr, uid, ids, context=None):
         if context is None:
             context = {}
-            
-        company_obj = self.pool.get('res.company')        
+
+        company_obj = self.pool.get('res.company')
         company_id = company_obj.browse(cr, uid, uid, context=context).id
-                            
+
         return {
             'name': 'Your Company',
             'view_type': 'form',
@@ -50,5 +50,28 @@ class base_config_settings(osv.osv_memory):
             'view_id': False,
             'type': 'ir.actions.act_window',
          }
-         
+
+# Preferences wizard for Sales & CRM.
+# It is defined here because it is inherited independently in modules sale, crm,
+# plugin_outlook and plugin_thunderbird.
+class sale_config_settings(osv.osv_memory):
+    _name = 'sale.config.settings'
+    _inherit = 'res.config.settings'
+    _columns = {
+        'module_crm': fields.boolean('CRM'),
+        'module_plugin_thunderbird': fields.boolean('Thunderbird Plugin',
+            help="""The plugin allows you archive email and its attachments to the selected
+                OpenERP objects. You can select a partner, or a lead and
+                attach the selected mail as a .eml file in
+                the attachment of a selected record. You can create documents for CRM Lead,
+                Partner from the selected emails.
+                This installs the module plugin_thunderbird."""),
+        'module_plugin_outlook': fields.boolean('Outlook Plugin',
+            help="""The Outlook plugin allows you to select an object that you would like to add
+                to your email and its attachments from MS Outlook. You can select a partner,
+                or a lead object and archive a selected
+                email into an OpenERP mail message with attachments.
+                This installs the module plugin_outlook."""),
+    }
+
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/base_setup/res_config_view.xml b/addons/base_setup/res_config_view.xml
index 5707dac82e9..81f83a1dde1 100644
--- a/addons/base_setup/res_config_view.xml
+++ b/addons/base_setup/res_config_view.xml
@@ -43,5 +43,38 @@
         <menuitem id="menu_general_configuration" parent="base.menu_config"
             sequence="100" action="action_general_configuration"/>
 
+        <!-- Sale config wizard -->
+        <record id="view_sale_config_settings" model="ir.ui.view">
+            <field name="name">sale settings</field>
+            <field name="model">sale.config.settings</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Configure Sales" version="7.0">
+                    <header>
+                        <button string="Apply" type="object" name="execute" class="oe_highlight"/>
+                        <button string="Cancel" special="cancel"/>
+                    </header>
+                    <sheet>
+                        <field name="module_crm" invisible="1"/>
+                        <group name="config_sale"/>
+                        <group name="config_fetchmail" string="Emails" attrs="{'invisible': [('module_crm','=',False)]}">
+                            <field name="module_plugin_thunderbird"/>
+                            <field name="module_plugin_outlook"/>
+                        </group>
+                        <group name="config_crm"/>
+                    </sheet>
+                </form>
+            </field>
+        </record>
+
+        <record id="action_sale_config" model="ir.actions.act_window">
+            <field name="name">Configure Sales</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">sale.config.settings</field>
+            <field name="view_id" ref="view_sale_config_settings"/>
+            <field name="view_mode">form</field>
+            <field name="target">inline</field>
+        </record>
+
     </data>
 </openerp>
-- 
cgit v1.2.3


From f5f50124be3603b4048a8e898ab2da676844c7c8 Mon Sep 17 00:00:00 2001
From: Raphael Collet <rco@openerp.com>
Date: Fri, 22 Jun 2012 11:56:57 +0200
Subject: [FIX] base_setup: 'uid' is not a company id

bzr revid: rco@openerp.com-20120622095657-cq3u3l3xgdwm1zo3
---
 addons/base_setup/res_config.py | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

(limited to 'addons/base_setup')

diff --git a/addons/base_setup/res_config.py b/addons/base_setup/res_config.py
index 00e2a8a9fa4..24995e8134d 100644
--- a/addons/base_setup/res_config.py
+++ b/addons/base_setup/res_config.py
@@ -35,20 +35,14 @@ class base_config_settings(osv.osv_memory):
     }
 
     def open_company(self, cr, uid, ids, context=None):
-        if context is None:
-            context = {}
-
-        company_obj = self.pool.get('res.company')
-        company_id = company_obj.browse(cr, uid, uid, context=context).id
-
+        user = self.pool.get('res.users').browse(cr, uid, uid, context)
         return {
+            'type': 'ir.actions.act_window',
             'name': 'Your Company',
             'view_type': 'form',
             'view_mode': 'form,tree',
             'res_model': 'res.company',
-            'res_id': company_id,
-            'view_id': False,
-            'type': 'ir.actions.act_window',
+            'res_id': user.company_id.id,
          }
 
 # Preferences wizard for Sales & CRM.
-- 
cgit v1.2.3


From 0ac4fecbf4150440046237a07cca8e2245c5ad5c Mon Sep 17 00:00:00 2001
From: Raphael Collet <rco@openerp.com>
Date: Fri, 22 Jun 2012 12:20:36 +0200
Subject: [IMP] base_setup: improve layout of general settings form

bzr revid: rco@openerp.com-20120622102036-ibnfb5pr09ooh7p8
---
 addons/base_setup/res_config.py       |  2 +-
 addons/base_setup/res_config_view.xml | 28 ++++++++++++++++------------
 2 files changed, 17 insertions(+), 13 deletions(-)

(limited to 'addons/base_setup')

diff --git a/addons/base_setup/res_config.py b/addons/base_setup/res_config.py
index 24995e8134d..f6fdcefe8fe 100644
--- a/addons/base_setup/res_config.py
+++ b/addons/base_setup/res_config.py
@@ -40,7 +40,7 @@ class base_config_settings(osv.osv_memory):
             'type': 'ir.actions.act_window',
             'name': 'Your Company',
             'view_type': 'form',
-            'view_mode': 'form,tree',
+            'view_mode': 'form',
             'res_model': 'res.company',
             'res_id': user.company_id.id,
          }
diff --git a/addons/base_setup/res_config_view.xml b/addons/base_setup/res_config_view.xml
index 81f83a1dde1..cb72509e70a 100644
--- a/addons/base_setup/res_config_view.xml
+++ b/addons/base_setup/res_config_view.xml
@@ -11,25 +11,29 @@
                         <button string="Apply" type="object" name="execute" class="oe_highlight"/>
                         <button string="Cancel" special="cancel"/>
                     </header>
-                    <group>
+                    <sheet>
                         <group string="Company Settings">
-                            <field name="module_multi_company"/>
-                        </group>
-                        <group string="Others">
-                           <b><label string="Outgoing Mail Servers"/></b>
-                            <button type="action" name="%(base.action_ir_mail_server_list)d"
-                                string="Configure" icon="gtk-execute"/>
+                            <group>
+                                <field name="module_multi_company"/>
+                            </group>
+                            <group>
+                                <div>
+                                    You will also find several configuration options on your company data:
+                                    address for the header and footer, overdue payments texts, etc.
+                                </div>
+                                <button type="object" name="open_company" string="Configure Your Company Data" icon="gtk-execute"/>
+                            </group>
                         </group>
                         <group string="External Accesses">
                             <field name="module_share"/>
                             <field name="module_portal"/>
                         </group>
-                        <group col="4" colspan="4" >
-                           <p>You will also find several configuration options on your company data; address for the header and footer, overdue payments texts, etc.</p>
-                           <newline/>
-                           <p><button type="object" name="open_company" string="Configure Your Company Data" icon="gtk-execute"/></p>
+                        <group string="Others">
+                            <label for="id" string="Outgoing Mail Servers"/>
+                            <button type="action" name="%(base.action_ir_mail_server_list)d"
+                                string="Configure" icon="gtk-execute"/>
                         </group>
-                    </group>
+                    </sheet>
                 </form>
             </field>
         </record>
-- 
cgit v1.2.3


From 12ae053fba1389f3352c4ae7de9f2f797417c246 Mon Sep 17 00:00:00 2001
From: Raphael Collet <rco@openerp.com>
Date: Mon, 25 Jun 2012 15:55:04 +0200
Subject: [IMP] in all config wizards, add class 'oe_highlight_on_dirty' on
 button 'Apply'

bzr revid: rco@openerp.com-20120625135504-0f03j2j6p7d1pp7l
---
 addons/base_setup/res_config_view.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'addons/base_setup')

diff --git a/addons/base_setup/res_config_view.xml b/addons/base_setup/res_config_view.xml
index cb72509e70a..de991fe6725 100644
--- a/addons/base_setup/res_config_view.xml
+++ b/addons/base_setup/res_config_view.xml
@@ -8,7 +8,7 @@
             <field name="arch" type="xml">
                 <form string="General Settings" version="7.0">
                     <header>
-                        <button string="Apply" type="object" name="execute" class="oe_highlight"/>
+                        <button string="Apply" type="object" name="execute" class="oe_highlight_on_dirty"/>
                         <button string="Cancel" special="cancel"/>
                     </header>
                     <sheet>
@@ -55,7 +55,7 @@
             <field name="arch" type="xml">
                 <form string="Configure Sales" version="7.0">
                     <header>
-                        <button string="Apply" type="object" name="execute" class="oe_highlight"/>
+                        <button string="Apply" type="object" name="execute" class="oe_highlight_on_dirty"/>
                         <button string="Cancel" special="cancel"/>
                     </header>
                     <sheet>
-- 
cgit v1.2.3


From 32826d52f9ecbdfd0d4e39086cb5507d44ad3605 Mon Sep 17 00:00:00 2001
From: Launchpad Translations on behalf of openerp <>
Date: Tue, 26 Jun 2012 05:36:24 +0000
Subject: Launchpad automatic translations update.

bzr revid: launchpad_translations_on_behalf_of_openerp-20120626052217-ejijeif40inxummm
bzr revid: launchpad_translations_on_behalf_of_openerp-20120626053624-27gc1r3gtzgs227c
---
 addons/base_setup/i18n/ja.po | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'addons/base_setup')

diff --git a/addons/base_setup/i18n/ja.po b/addons/base_setup/i18n/ja.po
index 92290c2dd95..8bf029ddbdb 100644
--- a/addons/base_setup/i18n/ja.po
+++ b/addons/base_setup/i18n/ja.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-06-25 05:14+0000\n"
+"X-Launchpad-Export-Date: 2012-06-26 05:22+0000\n"
 "X-Generator: Launchpad (build 15482)\n"
 
 #. module: base_setup
-- 
cgit v1.2.3


From 0806d443e823af7dbc90405ba7446dc2f4f7f2b1 Mon Sep 17 00:00:00 2001
From: Raphael Collet <rco@openerp.com>
Date: Tue, 26 Jun 2012 09:49:46 +0200
Subject: [IMP] config wizards: add an action on button 'Cancel' to get the
 expected behavior

bzr revid: rco@openerp.com-20120626074946-a1tzebh85ta6v75l
---
 addons/base_setup/res_config_view.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'addons/base_setup')

diff --git a/addons/base_setup/res_config_view.xml b/addons/base_setup/res_config_view.xml
index de991fe6725..93523f06746 100644
--- a/addons/base_setup/res_config_view.xml
+++ b/addons/base_setup/res_config_view.xml
@@ -9,7 +9,7 @@
                 <form string="General Settings" version="7.0">
                     <header>
                         <button string="Apply" type="object" name="execute" class="oe_highlight_on_dirty"/>
-                        <button string="Cancel" special="cancel"/>
+                        <button string="Cancel" type="object" name="cancel"/>
                     </header>
                     <sheet>
                         <group string="Company Settings">
@@ -56,7 +56,7 @@
                 <form string="Configure Sales" version="7.0">
                     <header>
                         <button string="Apply" type="object" name="execute" class="oe_highlight_on_dirty"/>
-                        <button string="Cancel" special="cancel"/>
+                        <button string="Cancel" type="object" name="cancel"/>
                     </header>
                     <sheet>
                         <field name="module_crm" invisible="1"/>
-- 
cgit v1.2.3


From 90094ff19b4d015cc64114467aeaf016ac36650c Mon Sep 17 00:00:00 2001
From: Jigar Amin - OpenERP <jam@tinyerp.com>
Date: Wed, 27 Jun 2012 20:20:49 +0530
Subject: [FIX] setting cancel link

bzr revid: jam@tinyerp.com-20120627145049-hu0h8x0ui3d74sz0
---
 addons/base_setup/res_config_view.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'addons/base_setup')

diff --git a/addons/base_setup/res_config_view.xml b/addons/base_setup/res_config_view.xml
index 93523f06746..4b5a4b0344b 100644
--- a/addons/base_setup/res_config_view.xml
+++ b/addons/base_setup/res_config_view.xml
@@ -9,7 +9,8 @@
                 <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"/>
+                        or
+                        <button string="Cancel" type="object" name="cancel" class="oe_link"/>
                     </header>
                     <sheet>
                         <group string="Company Settings">
-- 
cgit v1.2.3


From c44963d631fe49eed02aacbabe97924e5a00e26c Mon Sep 17 00:00:00 2001
From: Jigar Amin - OpenERP <jam@tinyerp.com>
Date: Thu, 28 Jun 2012 11:47:20 +0530
Subject: [FIX] added missing or and removed duplicate class

bzr revid: jam@tinyerp.com-20120628061720-1y5oacjqehjlplqc
---
 addons/base_setup/res_config_view.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'addons/base_setup')

diff --git a/addons/base_setup/res_config_view.xml b/addons/base_setup/res_config_view.xml
index 4b5a4b0344b..0ad8bc45335 100644
--- a/addons/base_setup/res_config_view.xml
+++ b/addons/base_setup/res_config_view.xml
@@ -57,7 +57,8 @@
                 <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"/>
+                        or
+                        <button string="Cancel" type="object" name="cancel" class="oe_link"/>
                     </header>
                     <sheet>
                         <field name="module_crm" invisible="1"/>
-- 
cgit v1.2.3


From 1702b2335d7febda80f38846cec386053c0e41a0 Mon Sep 17 00:00:00 2001
From: "Sanjay Gohel (Open ERP)" <sgo@tinyerp.com>
Date: Thu, 28 Jun 2012 12:10:05 +0530
Subject: [IMP]remove tabs and add spaces instead of them

bzr revid: sgo@tinyerp.com-20120628064005-zuerrpazumf5lf1q
---
 addons/base_setup/base_setup_views.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'addons/base_setup')

diff --git a/addons/base_setup/base_setup_views.xml b/addons/base_setup/base_setup_views.xml
index eb59d918681..8be9aa0e2e3 100644
--- a/addons/base_setup/base_setup_views.xml
+++ b/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>
-- 
cgit v1.2.3


From 5133bee1d529722cd690188d61d51debd2d91968 Mon Sep 17 00:00:00 2001
From: Raphael Collet <rco@openerp.com>
Date: Fri, 29 Jun 2012 10:30:24 +0200
Subject: [FIX] in form views, replace class 'oe_highlight_on_dirty' by
 'oe_highlight'

bzr revid: rco@openerp.com-20120629083024-rqhtbf9melkygg0m
---
 addons/base_setup/res_config_view.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'addons/base_setup')

diff --git a/addons/base_setup/res_config_view.xml b/addons/base_setup/res_config_view.xml
index 0ad8bc45335..85a20bddf52 100644
--- a/addons/base_setup/res_config_view.xml
+++ b/addons/base_setup/res_config_view.xml
@@ -8,7 +8,7 @@
             <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="Apply" type="object" name="execute" class="oe_highlight"/>
                         or
                         <button string="Cancel" type="object" name="cancel" class="oe_link"/>
                     </header>
@@ -56,7 +56,7 @@
             <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="Apply" type="object" name="execute" class="oe_highlight"/>
                         or
                         <button string="Cancel" type="object" name="cancel" class="oe_link"/>
                     </header>
-- 
cgit v1.2.3


From 2937ed7a6a06e27c98314231bea9184b542670d7 Mon Sep 17 00:00:00 2001
From: Raphael Collet <rco@openerp.com>
Date: Fri, 29 Jun 2012 14:54:11 +0200
Subject: [IMP] make base_setup not auto-installable

bzr revid: rco@openerp.com-20120629125411-7bxv2akfc1413fog
---
 addons/base_setup/__openerp__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'addons/base_setup')

diff --git a/addons/base_setup/__openerp__.py b/addons/base_setup/__openerp__.py
index 9e2be5976f6..35505ea853f 100644
--- a/addons/base_setup/__openerp__.py
+++ b/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',],
 }
-- 
cgit v1.2.3


From 863a810f1580cfdf7b698cb8698fc30759af6da6 Mon Sep 17 00:00:00 2001
From: Raphael Collet <rco@openerp.com>
Date: Fri, 29 Jun 2012 15:41:51 +0200
Subject: [FIX] base_setup, fetchmail: add target in action methods opening a
 form view

bzr revid: rco@openerp.com-20120629134151-oqharq4xhylq3fze
---
 addons/base_setup/res_config.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'addons/base_setup')

diff --git a/addons/base_setup/res_config.py b/addons/base_setup/res_config.py
index f6fdcefe8fe..6a73eb786ea 100644
--- a/addons/base_setup/res_config.py
+++ b/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,
-- 
cgit v1.2.3