[MERGE]: Merged with lp:openobject-addons

bzr revid: atp@tinyerp.com-20120626063959-xexg3fm1iy9zdfnw

5 files changed, 90 insertions, 79 deletions

diff --git a/addons/base_setup/base_setup.py b/addons/base_setup/base_setup.py
index 7a048a50eb4..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, a task, a project, an analytical
-                account, or any other object 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.
-                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
-                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 e4b9b9dadb2..eb59d918681 100644
--- a/addons/base_setup/base_setup_views.xml
+++ b/addons/base_setup/base_setup_views.xml
@@ -43,43 +43,5 @@
           <field name="target">new</field>
       </record>
 
-    <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"/>
-                    <button string="Cancel" special="cancel"/>
-                </header>
-                <group>
-                    <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)]}">
-                        <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="2"/>
-                </group>
-            </form>
-        </field>
-    </record>
-
-    <!-- Sale config wizard -->
-    <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/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
diff --git a/addons/base_setup/res_config.py b/addons/base_setup/res_config.py
index 92914f8f7a3..f6fdcefe8fe 100644
--- a/addons/base_setup/res_config.py
+++ b/addons/base_setup/res_config.py
@@ -28,13 +28,44 @@ 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."""),
+    }
+
+    def open_company(self, cr, uid, ids, context=None):
+        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',
+            'res_model': 'res.company',
+            'res_id': user.company_id.id,
+         }
+
+# 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 0b85e13a08f..de991fe6725 100644
--- a/addons/base_setup/res_config_view.xml
+++ b/addons/base_setup/res_config_view.xml
@@ -8,24 +8,32 @@
             <field name="arch" type="xml">
                 <form string="General Settings" version="7.0">
                     <header>
-                        <button string="Apply" type="object" name="execute"/>
+                        <button string="Apply" type="object" name="execute" class="oe_highlight_on_dirty"/>
                         <button string="Cancel" special="cancel"/>
                     </header>
-                    <group>
+                    <sheet>
                         <group string="Company Settings">
-                            <field name="module_multi_company"/>
-                        </group>
-
-                        <group string="Others">
-                            <label string="Outgoing Mail Servers"/>
-                            <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>
+                        <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>
+                    </sheet>
                 </form>
             </field>
         </record>
@@ -39,5 +47,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_on_dirty"/>
+                        <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>