[MERGE] config-rework2, rpa apr

bzr revid: al@openerp.com-20110805132536-t0io1qs6iizcyl9w

14 files changed, 62 insertions, 72 deletions

diff --git a/addons/association/profile_association.py b/addons/association/profile_association.py
index 8a528177a30..0e66af14a1d 100644
--- a/addons/association/profile_association.py
+++ b/addons/association/profile_association.py
@@ -18,7 +18,7 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
 #
 ##############################################################################
-
+from lxml import etree
 from osv import fields, osv
 
 class profile_association_config_install_modules_wizard(osv.osv_memory):
@@ -35,5 +35,19 @@ class profile_association_config_install_modules_wizard(osv.osv_memory):
                  "to keep track of business knowledge and share it with "
                  "and  between your employees."),
     }
+
+    # Will be removed when rd-v61-al-config-depends will be done
+    def fields_view_get(self, cr, user, view_id=None, view_type='form', context=None, toolbar=False, submenu=False):
+        res = super(profile_association_config_install_modules_wizard, self).fields_view_get(cr, user, view_id, view_type, context, toolbar=toolbar, submenu=submenu)
+        doc = etree.XML(res['arch'])
+        for module in ['project_gtd','hr_expense']:
+            count = 0
+            for node in doc.xpath("//field[@name='%s']" % (module)):
+                count = count + 1
+                if count > 1:
+                    node.set('invisible', '1')
+        res['arch'] = etree.tostring(doc)
+        return res
+   
 profile_association_config_install_modules_wizard()
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/base_setup/base_setup_installer.xml b/addons/base_setup/base_setup_installer.xml
index c7a584bb743..91963737e12 100644
--- a/addons/base_setup/base_setup_installer.xml
+++ b/addons/base_setup/base_setup_installer.xml
@@ -143,13 +143,13 @@
           <!-- Import or create customers configartion view  -->
 
 	 <record id="action_import_create_installer" model="ir.actions.act_window">
-	     <field name="name">Import or create customers </field>
+	     <field name="name">Import or Create Customers</field>
 	     <field name="type">ir.actions.act_window</field>
 	     <field name="res_model">res.partner</field>
 	     <field name="view_type">form</field>
 	     <field name="view_mode">tree,form</field>
 	     <field name="view_id" ref="base.view_partner_tree"/>
-	     <field name="help">Create some customers, suppliers and their contacts manually or import a CSV spreadsheet by clicking on the import link</field>
+	     <field name="help">Create some Customers, Suppliers and their contacts manually from this form or you can import your existing partners by CSV spreadsheet from "Import Data" wizard</field>
 	 </record>
 
     <!--          register configuration wizard -->
@@ -269,7 +269,7 @@
       </record>
 
       <record id="action_partner_terminology_config_form" model="ir.actions.act_window">
-          <field name="name">Specify Your Terminology</field>
+          <field name="name">Customer / Partner / Patient ?</field>
           <field name="type">ir.actions.act_window</field>
           <field name="res_model">specify.partner.terminology</field>
           <field name="view_type">form</field>
diff --git a/addons/base_setup/installer.py b/addons/base_setup/installer.py
index 381164e69d0..fed316eb39e 100644
--- a/addons/base_setup/installer.py
+++ b/addons/base_setup/installer.py
@@ -262,7 +262,7 @@ class specify_partner_terminology(osv.osv_memory):
                                   ('Guest','Guest'),
                                   ('Tenant','Tenant')
                                   ],
-                                 'Choose how to call a customer', required=True ),
+                                 'Choose how to call a Customer', required=True ),
     }
     _defaults={
                'partner' :'Partner',
diff --git a/addons/crm/crm_installer.py b/addons/crm/crm_installer.py
index 1ca212d0525..595cfbc2382 100644
--- a/addons/crm/crm_installer.py
+++ b/addons/crm/crm_installer.py
@@ -30,11 +30,11 @@ class crm_installer(osv.osv_memory):
         'crm_helpdesk': fields.boolean('Helpdesk', help="Manages a Helpdesk service."),
         'crm_fundraising': fields.boolean('Fundraising', help="This may help associations in their fundraising process and tracking."),
         'crm_claim': fields.boolean('Claims', help="Manages the suppliers and customers claims, including your corrective or preventive actions."),
-        'crm_caldav': fields.boolean('Synchronization: Calendar Synchronizing', help="Helps you to synchronize the meetings with other calendar clients and mobiles."),
-        'sale_crm': fields.boolean('Opportunity to Quotation', help="This module relates sale from opportunity cases in the CRM."),
-        'fetchmail': fields.boolean('Synchronization: Fetch Emails', help="Allows you to receive E-Mails from POP/IMAP server."),
-        'thunderbird': fields.boolean('Plug-In: Thunderbird', help="Allows you to link your e-mail to OpenERP's documents. You can attach it to any existing one in OpenERP or create a new one."),
-        'outlook': fields.boolean('Plug-In: MS-Outlook', help="Allows you to link your e-mail to OpenERP's documents. You can attach it to any existing one in OpenERP or create a new one."),
+        'crm_caldav': fields.boolean('Calendar Synchronizing', help="Helps you to synchronize the meetings with other calendar clients and mobiles."),
+        'sale_crm': fields.boolean('Opportunity to Quotation', help="Create a Quotation from an Opportunity."),
+        'fetchmail': fields.boolean('Fetch Emails', help="Allows you to receive E-Mails from POP/IMAP server."),
+        'thunderbird': fields.boolean('Thunderbird Plug-In', help="Allows you to link your e-mail to OpenERP's documents. You can attach it to any existing one in OpenERP or create a new one."),
+        'outlook': fields.boolean('MS-Outlook Plug-In', help="Allows you to link your e-mail to OpenERP's documents. You can attach it to any existing one in OpenERP or create a new one."),
         'wiki_sale_faq': fields.boolean('Sale FAQ', help="Helps you manage wiki pages for Frequently Asked Questions on Sales Application."),
         'import_google': fields.boolean('Google Import', help="Imports contacts and events from your google account."),
     }
diff --git a/addons/hr/installer.py b/addons/hr/installer.py
index 93f920f3cb8..3916acaeb1e 100644
--- a/addons/hr/installer.py
+++ b/addons/hr/installer.py
@@ -24,7 +24,7 @@ class hr_installer(osv.osv_memory):
     _inherit = 'base.setup.installer'
     _columns = {
         # Human Resources Management
-        'hr_holidays': fields.boolean('Holidays / Leaves Management',
+        'hr_holidays': fields.boolean('Leaves Management',
             help="Tracks employee leaves, allocation requests and planning."),
         'hr_expense': fields.boolean('Expenses',
             help="Tracks and manages employee expenses, and can "
diff --git a/addons/hr_expense/hr_expense_data.xml b/addons/hr_expense/hr_expense_data.xml
index 33a7ec7604c..9660dbb2543 100644
--- a/addons/hr_expense/hr_expense_data.xml
+++ b/addons/hr_expense/hr_expense_data.xml
@@ -8,6 +8,18 @@
             <field name="parent_id" ref="product.cat0"/>
             <field name="name">Expenses</field>
         </record>
+        
+        <record id="product_product_expense_car" model="product.product">
+            <field name="list_price">0.32</field>
+            <field name="standard_price">0.32</field>
+            <field name="uom_id" ref="product.product_uom_km"/>
+            <field name="uom_po_id" ref="product.product_uom_km"/>
+            <field name="type">consu</field>
+            <field name="name">Travel Expenses</field>
+            <field name="default_code">TRA</field>
+            <field name="categ_id" ref="hr_expense.cat_expense"/>
+            <field name="hr_expense_ok" eval="True" />
+        </record>
 
     </data>
 </openerp>
\ No newline at end of file
diff --git a/addons/hr_expense/hr_expense_demo.xml b/addons/hr_expense/hr_expense_demo.xml
index 49afbd8523c..80c9cd66694 100644
--- a/addons/hr_expense/hr_expense_demo.xml
+++ b/addons/hr_expense/hr_expense_demo.xml
@@ -26,18 +26,6 @@
             <field name="hr_expense_ok" eval="True" />
         </record>
 
-        <record id="product_product_expense_car" model="product.product">
-            <field name="list_price">0.30</field>
-            <field name="standard_price">0.30</field>
-            <field name="uom_id" ref="product.product_uom_km"/>
-            <field name="uom_po_id" ref="product.product_uom_km"/>
-            <field name="type">consu</field>
-            <field name="name">Car Travel</field>
-            <field name="default_code">CAR</field>
-            <field name="categ_id" ref="product.cat2"/>
-            <field name="hr_expense_ok" eval="True" />
-        </record>
-
         <record id="hr_expense_expense_septemberexpenses0" model="hr.expense.expense">
             <field name="currency_id" ref="base.EUR"/>
             <field name="employee_id" ref="hr.employee1"/>
diff --git a/addons/hr_expense/hr_expense_installer_view.xml b/addons/hr_expense/hr_expense_installer_view.xml
index 67580d52d00..a5c378238a6 100644
--- a/addons/hr_expense/hr_expense_installer_view.xml
+++ b/addons/hr_expense/hr_expense_installer_view.xml
@@ -1,13 +1,29 @@
 <openerp>
   <data>
- <record model="ir.actions.act_window" id="product_normal_form_view_installer">
+        <record id="product_expense_installer_tree_view" model="ir.ui.view">
+            <field name="name">product.product.tree</field>
+            <field name="model">product.product</field>
+            <field name="type">tree</field>
+            <field eval="7" name="priority"/>
+            <field name="arch" type="xml">
+                <tree editable="bottom" string="Products">
+                    <field name="name"/>
+                    <field name="standard_price"/>
+                    <field name="list_price"/>
+                    <field name="uom_id" string="UoM"/>
+                </tree>
+            </field>
+        </record> 
+ 
+        <record model="ir.actions.act_window" id="product_normal_form_view_installer">
            <field name="name">Review Your Expenses Products</field>
            <field name="type">ir.actions.act_window</field>
            <field name="res_model">product.product</field>
            <field name="view_type">form</field>
            <field name="view_mode">tree,form</field>
            <field name="context" eval="'{\'default_type\':\'service\',\'default_procure_method\':\'make_to_stock\',\'default_supply_method\':\'buy\',\'default_purchase_ok\':True, \'default_sale_ok\':False, \'default_hr_expense_ok\':True,\'default_categ_id\': ' + str(ref('cat_expense')) +'}'"/>
-           <field name="view_id" ref="product.product_normal_form_view"/>
+           <field name="domain">[('hr_expense_ok','=',True)]</field>
+           <field name="view_id" ref="product_expense_installer_tree_view"/>
        </record>
 
        <record id="product_normal_form_view_todo" model="ir.actions.todo">
diff --git a/addons/hr_recruitment/hr_recruitment_view.xml b/addons/hr_recruitment/hr_recruitment_view.xml
index 28c69394e96..125d61979e9 100644
--- a/addons/hr_recruitment/hr_recruitment_view.xml
+++ b/addons/hr_recruitment/hr_recruitment_view.xml
@@ -314,7 +314,7 @@
             <tree string="Stages">
                 <field name="sequence" invisible="1"/>
                 <field name="name"/>
-                <field name="department_id"/>
+                <field name="department_id" groups="base.group_extended"/>
             </tree>
         </field>
     </record>
@@ -330,7 +330,7 @@
                 <group colspan="4" col="6">
                     <separator string="Stage Definition" colspan="6"/>
                     <field name="name" select="1"/>
-                    <field name="department_id"/>
+                    <field name="department_id" groups="base.group_extended"/>
                     <field name="sequence"/>
                 </group>
                 <separator string="Requirements" colspan="4"/>
diff --git a/addons/hr_timesheet_invoice/__openerp__.py b/addons/hr_timesheet_invoice/__openerp__.py
index 5d5e41ecbb0..95682d00ef0 100644
--- a/addons/hr_timesheet_invoice/__openerp__.py
+++ b/addons/hr_timesheet_invoice/__openerp__.py
@@ -47,7 +47,6 @@ reports, etc.""",
         'wizard/hr_timesheet_invoice_create_view.xml',
         'wizard/hr_timesheet_invoice_create_final_view.xml',
         'board_hr_timesheet_invoice.xml',
-        'hr_timesheet_invoice_installer_view.xml'
     ],
     'demo': [
         'hr_timesheet_invoice_demo.xml',
diff --git a/addons/hr_timesheet_invoice/hr_timesheet_invoice_installer_view.xml b/addons/hr_timesheet_invoice/hr_timesheet_invoice_installer_view.xml
deleted file mode 100644
index bcecb048fad..00000000000
--- a/addons/hr_timesheet_invoice/hr_timesheet_invoice_installer_view.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<openerp>
-    <data>
- 
-        <!--  Configure Your Services Config Wiz  -->
-
-        <record id="product_timesheet_invoice_tree_view" model="ir.ui.view">
-            <field name="name">product.product.tree</field>
-            <field name="model">product.product</field>
-            <field name="type">tree</field>
-            <field eval="7" name="priority"/>
-            <field name="arch" type="xml">
-                <tree colors="red:virtual_available&lt;0;blue:virtual_available&gt;=0 and state in ('draft', 'end', 'obsolete');black:virtual_available&gt;=0 and state not in ('draft', 'end', 'obsolete')" string="Products">
-                    <field name="name"/>
-                    <field name="standard_price"/>
-                    <field name="lst_price"/>
-                    <field name="uom_id" string="UoM"/>
-                </tree>
-            </field>
-        </record>       
-
-        <record model="ir.actions.act_window" id="product_services_form_view_installer">
-           <field name="name">Configure Your Services</field>
-           <field name="type">ir.actions.act_window</field>
-           <field name="res_model">product.product</field>
-           <field name="view_type">form</field>
-           <field name="view_mode">tree,form</field>
-           <field name="domain">[('type','=','service')]</field>
-           <field name="context" eval="'{\'default_type\':\'service\', \'default_sale_ok\':True, \'default_hr_expense_ok\':False,}'"/>
-           <field name="view_id" ref="product_timesheet_invoice_tree_view"/>
-       </record>
-
-       <record id="product_services_form_view_todo" model="ir.actions.todo">
-           <field name="action_id" ref="product_services_form_view_installer"/>
-           <field name="category_id" ref="hr.category_hr_management_config"/>
-           <field name="sequence">3</field>
-       </record>
-
-    </data>
-</openerp>
diff --git a/addons/product/product.py b/addons/product/product.py
index 9deaf3398b1..8e6e132296d 100644
--- a/addons/product/product.py
+++ b/addons/product/product.py
@@ -266,7 +266,7 @@ class product_template(osv.osv):
         'description': fields.text('Description',translate=True),
         'description_purchase': fields.text('Purchase Description',translate=True),
         'description_sale': fields.text('Sale Description',translate=True),
-        'type': fields.selection([('product','Stockable Product'),('consu', 'Consumable'),('service','Service')], 'Product Type', required=True, help="Will change the way procurements are processed. Consumables are stockable products with infinite stock, or for use when you have no inventory management in the system."),
+        'type': fields.selection([('product','Stockable Product'),('consu', 'Consumable'),('service','Service')], 'Product Type', required=True, help="Will change the way procurements are processed. Consumable are product where you don't manage stock."),
         'supply_method': fields.selection([('produce','Produce'),('buy','Buy')], 'Supply method', required=True, help="Produce will generate production order or tasks, according to the product type. Buy will trigger purchase orders when requested."),
         'sale_delay': fields.float('Customer Lead Time', help="This is the average delay in days between the confirmation of the customer order and the delivery of the finished products. It's the time you promise to your customers."),
         'produce_delay': fields.float('Manufacturing Lead Time', help="Average delay in days to produce this product. This is only for the production order and, if it is a multi-level bill of material, it's only for the level of this product. Different lead times will be summed for all levels and purchase orders."),
diff --git a/addons/product/wizard/product_installer.xml b/addons/product/wizard/product_installer.xml
index ce138856038..bdfbc1d32bf 100644
--- a/addons/product/wizard/product_installer.xml
+++ b/addons/product/wizard/product_installer.xml
@@ -6,8 +6,8 @@
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">product.product</field>
             <field name="view_type">form</field>
-            <field name="view_mode">form</field>
-            <field name="view_id" ref="product.product_normal_form_view"/>
+            <field name="view_mode">tree,form</field>
+            <field name="view_id" ref="product.product_product_tree_view"/>
             <field name="help">Create a product form for everything you buy or sell. Specify a supplier if the product can be purchased.</field>
         </record>
         
diff --git a/addons/sale/sale_installer.py b/addons/sale/sale_installer.py
index fa7dffc9d6d..dcac79270b2 100644
--- a/addons/sale/sale_installer.py
+++ b/addons/sale/sale_installer.py
@@ -29,12 +29,12 @@ class sale_installer(osv.osv_memory):
             help="Allows you to compute delivery costs on your quotations."),
         'sale_journal': fields.boolean('Invoicing journals',
             help="Allows you to group and invoice your delivery orders according to different invoicing types: daily, weekly, etc."),
-        'sale_layout': fields.boolean('Sales Order Layout Improvement',
+        'sale_layout': fields.boolean('Sales Orders Print Layout',
             help="Provides some features to improve the layout of the Sales Order reports."),
         'sale_margin': fields.boolean('Margins in Sales Orders',
             help="Gives the margin of profitability by calculating "
                  "the difference between Unit Price and Cost Price."),
-        'sale_order_dates': fields.boolean('Sales Order Dates',
+        'sale_order_dates': fields.boolean('Full Dates on Sales Orders',
             help="Adds commitment, requested and effective dates on Sales Orders."),
     }