[MERGE]merge with lp:~openerp-dev/openobject-addons/trunk-message-sub-type-apa

bzr revid: sgo@tinyerp.com-20120806054219-yxe9cwx4yguz7t55

6 files changed, 141 insertions, 74 deletions

diff --git a/addons/base_setup/__openerp__.py b/addons/base_setup/__openerp__.py
index 1ebc708959e..cf69933c84a 100644
--- a/addons/base_setup/__openerp__.py
+++ b/addons/base_setup/__openerp__.py
@@ -46,5 +46,6 @@ Shows you a list of applications features to install from.
     'certificate': '0086711085869',
     'images': ['images/base_setup1.jpeg','images/base_setup2.jpeg','images/base_setup3.jpeg','images/base_setup4.jpeg',],
     'js': ['static/src/js/base_setup.js'],
+    'css': ['static/src/css/base_setup.css'],
 }
 # 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 8be9aa0e2e3..0db6c173d9b 100644
--- a/addons/base_setup/base_setup_views.xml
+++ b/addons/base_setup/base_setup_views.xml
@@ -1,47 +1,48 @@
+<?xml version="1.0" encoding="utf-8"?>
 <openerp>
-  <data>
+    <data>
 
-    <!-- Show menus that are hidden in module base -->
-    <record id="base.menu_res_company_global" model="ir.ui.menu">
-        <field name="groups_id" eval="[(3, ref('base.group_no_one'))]"/>
-    </record>
-    <record id="base.menu_users" model="ir.ui.menu">
-        <field name="groups_id" eval="[(3, ref('base.group_no_one'))]"/>
-    </record>
-    <record id="base.menu_publisher_warranty" model="ir.ui.menu">
-        <field name="groups_id" eval="[(3, ref('base.group_no_one'))]"/>
-    </record>
+        <!-- Show menus that are hidden in module base -->
+        <record id="base.menu_res_company_global" model="ir.ui.menu">
+            <field name="groups_id" eval="[(3, ref('base.group_no_one'))]"/>
+        </record>
+        <record id="base.menu_users" model="ir.ui.menu">
+            <field name="groups_id" eval="[(3, ref('base.group_no_one'))]"/>
+        </record>
+        <record id="base.menu_publisher_warranty" model="ir.ui.menu">
+            <field name="groups_id" eval="[(3, ref('base.group_no_one'))]"/>
+        </record>
 
-      <!--   Specify Your Terminology Config Wiz-->
-     <record id="base_setup_terminology_form" model="ir.ui.view">
-          <field name="name">Specify Your Terminology</field>
-          <field name="model">base.setup.terminology</field>
-          <field name="type">form</field>
-          <field name="inherit_id" ref="base.res_config_view_base"/>
-         <field name="arch" type="xml">
-            <data>
-              <form position="attributes" version="7.0">
-                <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"/>
-                    <group colspan="4">
-                        <field colspan="4" name="partner"/>
-                  </group>
-              </group>
-            </data>
-          </field>
-      </record>
-      <record id="action_partner_terminology_config_form" model="ir.actions.act_window">
-          <field name="name">Use another word to say "Customer"</field>
-          <field name="type">ir.actions.act_window</field>
-          <field name="res_model">base.setup.terminology</field>
-          <field name="view_type">form</field>
-          <field name="view_id" ref="base_setup_terminology_form"/>
-          <field name="view_mode">form</field>
-          <field name="target">new</field>
-      </record>
+        <!-- Specify your terminology config wiz -->
+        <record id="base_setup_terminology_form" model="ir.ui.view">
+            <field name="name">Specify Your Terminology</field>
+            <field name="model">base.setup.terminology</field>
+            <field name="type">form</field>
+            <field name="inherit_id" ref="base.res_config_view_base"/>
+            <field name="arch" type="xml">
+                <data>
+                    <form position="attributes" version="7.0">
+                        <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"/>
+                        <group colspan="4">
+                            <field colspan="4" name="partner"/>
+                        </group>
+                    </group>
+                </data>
+            </field>
+        </record>
+        <record id="action_partner_terminology_config_form" model="ir.actions.act_window">
+            <field name="name">Use another word to say "Customer"</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">base.setup.terminology</field>
+            <field name="view_type">form</field>
+            <field name="view_id" ref="base_setup_terminology_form"/>
+            <field name="view_mode">form</field>
+            <field name="target">new</field>
+        </record>
 
-  </data>
+    </data>
 </openerp>
diff --git a/addons/base_setup/res_config.py b/addons/base_setup/res_config.py
index 6a73eb786ea..7e85925b1c9 100644
--- a/addons/base_setup/res_config.py
+++ b/addons/base_setup/res_config.py
@@ -25,12 +25,12 @@ class base_config_settings(osv.osv_memory):
     _name = 'base.config.settings'
     _inherit = 'res.config.settings'
     _columns = {
-        'module_multi_company': fields.boolean('Multi Company',
+        'module_multi_company': fields.boolean('manage multiple companies',
             help="""Work in multi-company environments, with appropriate security access between companies.
                 This installs the module multi_company."""),
-        'module_portal': fields.boolean('Activate Customer Portal',
+        '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',
+        'module_share': fields.boolean('allow documents sharing',
             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."""),
     }
 
@@ -54,14 +54,14 @@ 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('enable 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',
+        'module_plugin_outlook': fields.boolean('enable 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
diff --git a/addons/base_setup/res_config_view.xml b/addons/base_setup/res_config_view.xml
index 5227b0885a9..f4c1f1ad08b 100644
--- a/addons/base_setup/res_config_view.xml
+++ b/addons/base_setup/res_config_view.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
 
@@ -6,31 +7,45 @@
             <field name="model">base.config.settings</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="General Settings" version="7.0">
+                <form string="General Settings" version="7.0" class="oe_form_configuration">
                     <header>
                         <button string="Apply" type="object" name="execute" class="oe_highlight"/>
                         or
                         <button string="Cancel" type="object" name="cancel" class="oe_link"/>
                     </header>
+                    <separator string="General Settings"/>
+                    <div>
+                        <label string="You will also find several configuration options on your company data:
+                            address for the header and footer, overdue payments texts, etc."/>
+                        <button type="object" name="open_company" string="Configure Your Company Data" icon="gtk-execute" class="oe_inline oe_link"/>
+                    </div>
                     <group>
-                        <group string="Company Settings">
-                            <field name="module_multi_company"/>
-                            <separator string="External Accesses" colspan="2"/>
-                            <field name="module_share"/>
-                            <field name="module_portal"/>
-                        </group>
-                        <group>
+                        <label for="id" string="Options"/>
+                        <div>
+                            <div name="multi_company">
+                                <field name="module_multi_company" class="oe_inline"/>
+                                <label for="module_multi_company"/>
+                            </div>
+                        </div>
+                    </group>
+                    <group>
+                        <label for="id" string="Share Data"/>
+                        <div>
                             <div>
-                                You will also find several configuration options on your company data:
-                                address for the header and footer, overdue payments texts, etc.
+                                <field name="module_share" class="oe_inline"/>
+                                <label for="module_share"/>
                             </div>
-                            <button type="object" name="open_company" string="Configure Your Company Data" icon="gtk-execute"/>
-                            <separator string="Others" colspan="2"/>
-                            <label for="id" string="Outgoing Mail Servers"/>
-                            <button type="action" name="%(base.action_ir_mail_server_list)d"
-                            string="Configure" icon="gtk-execute"/>
-                        </group>
-                        
+                            <div>
+                                <field name="module_portal" class="oe_inline"/>
+                                <label for="module_portal"/>
+                            </div>
+                            <div>
+                                <label string="Configure outgoing email servers"/>
+                                <button type="action"
+                                    name="%(base.action_ir_mail_server_list)d"
+                                    string="Configure" icon="gtk-execute" class="oe_link"/>
+                            </div>
+                        </div>
                     </group>
                 </form>
             </field>
@@ -51,22 +66,47 @@
             <field name="model">sale.config.settings</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Configure Sales" version="7.0">
+                <form string="Configure Sales" version="7.0" class="oe_form_configuration">
                     <header>
                         <button string="Apply" type="object" name="execute" class="oe_highlight"/>
                         or
                         <button string="Cancel" type="object" name="cancel" class="oe_link"/>
                     </header>
-                        <group>
-                            <group name="config_sale">
-                                <field name="module_crm" invisible="1"/>
-                                <separator string="Emails" colspan="2" attrs="{'invisible': [('module_crm','=',False)]}"/>
-                                <field name="module_plugin_thunderbird" attrs="{'invisible': [('module_crm','=',False)]}"/>
-                                <field name="module_plugin_outlook" attrs="{'invisible': [('module_crm','=',False)]}"/>
-                            </group>
-                            <group name="config_other">
-                            </group>
+                    <div name="customer feature">
+                        <separator string="Quotations and Sales Orders"/>
+                        <group name="Customer">
+                            <label for="id" string="Customer Features"/>
+                            <div name="Customer Features"/>
+                        </group>
+                        <group name="Sale">
+                            <label for="id" string="Sale Features"/>
+                            <div name="Sale Features"/>
+                        </group>
+                    </div>
+                    <div name="config_sale">
+                        <field name="module_crm" invisible="1"/>
+                        <separator string="Emails Integration" attrs="{'invisible': [('module_crm','=',False)]}"/>
+                        <p attrs="{'invisible': [('module_crm','=',False)]}">
+                            OpenERP allows to automatically create leads (or others documents)
+                            from incoming emails. You can synchronize emails with OpenERP
+                            by connecting the mail gateway to your mail server or by manually
+                            pressing buttons in our mail clients.
+                        </p>
+                        <group name="On Mail Client" attrs="{'invisible': [('module_crm','=',False)]}">
+                            <label for="id" string="On Mail Client"/>
+                            <div>
+                                <div name="module_plugin_thunderbird" attrs="{'invisible': [('module_crm','=',False)]}" class="oe_inline">
+                                    <field name="module_plugin_thunderbird"/>
+                                    <label for="module_plugin_thunderbird"/>
+                                </div>
+                                <div name="module_plugin_outlook" attrs="{'invisible': [('module_crm','=',False)]}">
+                                    <field name="module_plugin_outlook" class="oe_inline"/>
+                                    <label for="module_plugin_outlook"/>
+                                </div>
+                            </div>
                         </group>
+                    </div>
+                    <div name="config_other"/>
                 </form>
             </field>
         </record>
diff --git a/addons/base_setup/res_partner_view.xml b/addons/base_setup/res_partner_view.xml
index 9a19a7e4666..5aa24b3474d 100644
--- a/addons/base_setup/res_partner_view.xml
+++ b/addons/base_setup/res_partner_view.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
 
diff --git a/addons/base_setup/static/src/css/base_setup.css b/addons/base_setup/static/src/css/base_setup.css
new file mode 100644
index 00000000000..4e4b8a3c00a
--- /dev/null
+++ b/addons/base_setup/static/src/css/base_setup.css
@@ -0,0 +1,24 @@
+/* Remove bold from labels in config wizards */
+.oe_form_configuration .oe_form_group td:last-child .oe_form_label_help,
+.oe_form_configuration .oe_form_group td:last-child .oe_form_label {
+    font-weight: normal;
+}
+
+/* Separate .eo_link elements from the rest of the label's text */
+.oe_form_configuration .oe_form_group td:last-child .oe_link,
+.oe_form_configuration .oe_form_group td:last-child .oe_separate-from-text {
+    position: relative;
+    left: 2em;
+}
+.oe_form_configuration .oe_form_group td:last-child .oe_link:before,
+.oe_form_configuration .oe_form_group td:last-child .oe_separate-from-text:before {
+    content:"—";
+    padding-right: 1em;
+    color: grey;
+
+    /* Prevent the pseudo element's content to behave like its parent element */
+    position: absolute;
+    right: 100%;
+    bottom: 0; /* Parent element's height can vary */
+    pointer-events: none;
+}