From 438e590d9c4408cab607f474e0398d15ef2be785 Mon Sep 17 00:00:00 2001
From: "Nimesh (Open ERP)" <nco@tinyerp.com>
Date: Wed, 6 Jun 2012 15:01:13 +0530
Subject: [PATCH 01/12] [IMP] improve sequence and arrangement for sale
 configration wizrd.

bzr revid: nco@tinyerp.com-20120606093113-cx65cjiwts0yv4qq
---
 addons/sale/res_config_view.xml | 64 ++++++++++++++++-----------------
 1 file changed, 32 insertions(+), 32 deletions(-)

diff --git a/addons/sale/res_config_view.xml b/addons/sale/res_config_view.xml
index fa8aa2baa8e..477107b431c 100644
--- a/addons/sale/res_config_view.xml
+++ b/addons/sale/res_config_view.xml
@@ -9,38 +9,38 @@
             <field name="inherit_id" ref="base.view_sale_config_settings"/>
             <field name="arch" type="xml">
                 <group name="config_sale" position="after">
-                    <separator string="Invoicing Policy" colspan="4"/>
-                    <field name="module_project_timesheet" invisible="1"/>
-                    <field name="module_project_mrp" invisible="1"/>
-                    <field name="group_invoice_so_lines" on_change="onchange_invoice_methods(group_invoice_so_lines, group_invoice_deli_orders)"/>
-                    <field name="default_order_policy" attrs="{'invisible':['|',('group_invoice_so_lines','=',False),('group_invoice_deli_orders','=',False)],'required': ['|',('group_invoice_so_lines','=',True),('group_invoice_deli_orders','=',True)]}"/>
-                    <newline/>
-                    <field name="group_invoice_deli_orders" on_change="onchange_invoice_methods(group_invoice_so_lines, group_invoice_deli_orders)"/>
-                    <field name="module_delivery" attrs="{'invisible':[('group_invoice_so_lines','=',False), ('group_invoice_deli_orders','=',False)]}"/>
-                    <newline/>
-                    <field name="task_work" on_change="onchange_task_work(task_work)"/>
-                    <newline/>
-                    <field name="timesheet" on_change="onchange_timesheet(timesheet)"/>
-                    <field name="time_unit" domain="[('category_id.name','=','Working Time')]"
-                        attrs="{'invisible': [('task_work','=',False), ('module_account_analytic_analysis','=',False)],'required': ['|', ('task_work','=',True), ('module_account_analytic_analysis','=',True)]}"/>
-
-                    <separator string="Sale Order" colspan="4"/>
-                    <field name="group_sale_pricelist"/>
-                    <field name="group_uom"/>
-                    <field name="group_sale_delivery_address"/>
-                    <field name="group_discount_per_so_line"/>
-                    <field name="module_sale_margin"/>
-                    <field name="module_sale_layout"/>
-                    <field name="module_warning"/>
-                    <field name="module_sale_journal"/>
-                    <field name="group_multiple_shops"/>
-                    <field name="decimal_precision"/>
-                    <field name="default_picking_policy" attrs="{'invisible':[('group_invoice_deli_orders','=',False)]}"/>
-
-                    <separator string="Contracts" colspan="4"/>
-                    <field name="module_account_analytic_analysis" on_change="onchange_timesheet(module_account_analytic_analysis)"/>
-                    <field name="module_analytic_user_function" attrs="{'invisible':[('module_account_analytic_analysis','=',False)]}"/>
-                    <field name="module_analytic_journal_billing_rate" attrs="{'invisible':[('module_account_analytic_analysis','=',False)]}"/>
+                	<group col="4">
+		             	<separator string="Sale Order" colspan="4"/>
+	             		<field name="group_uom"/>
+	             		<field name="default_picking_policy" attrs="{'invisible':[('group_invoice_deli_orders','=',False)]}"/>
+	             		<field name="group_sale_delivery_address"/>
+	             		<field name="group_discount_per_so_line"/>
+	                    <field name="group_sale_pricelist"/>
+	                    <field name="module_sale_margin"/>
+	                    <field name="group_multiple_shops"/>
+	                    <field name="module_sale_layout"/>
+	                    <field name="decimal_precision"/>
+	                    <field name="module_sale_journal"/>
+	                    <field name="module_warning"/>
+	                    
+	                    <separator string="Invoicing Policy" colspan="4"/>
+	                    <field name="module_project_timesheet" invisible="1"/>
+	                    <field name="module_project_mrp" invisible="1"/>
+	                    <field name="group_invoice_so_lines" on_change="onchange_invoice_methods(group_invoice_so_lines, group_invoice_deli_orders)"/>
+	                    <field name="default_order_policy" attrs="{'invisible':['|',('group_invoice_so_lines','=',False),('group_invoice_deli_orders','=',False)],'required': ['|',('group_invoice_so_lines','=',True),('group_invoice_deli_orders','=',True)]}"/>
+	                    <field name="group_invoice_deli_orders" on_change="onchange_invoice_methods(group_invoice_so_lines, group_invoice_deli_orders)"/>
+	                    <field name="module_delivery" attrs="{'invisible':[('group_invoice_so_lines','=',False), ('group_invoice_deli_orders','=',False)]}"/>
+	                    <field name="task_work" on_change="onchange_task_work(task_work)"/>
+	                    <newline/>
+	                    <field name="timesheet" on_change="onchange_timesheet(timesheet)"/>
+	                    <field name="time_unit" domain="[('category_id.name','=','Working Time')]"
+	                        attrs="{'invisible': [('task_work','=',False), ('module_account_analytic_analysis','=',False)],'required': ['|', ('task_work','=',True), ('module_account_analytic_analysis','=',True)]}"/>
+	
+	                    <separator string="Contracts" colspan="4"/>
+	                    <field name="module_account_analytic_analysis" on_change="onchange_timesheet(module_account_analytic_analysis)"/>
+	                    <field name="module_analytic_user_function" attrs="{'invisible':[('module_account_analytic_analysis','=',False)]}"/>
+	                    <field name="module_analytic_journal_billing_rate" attrs="{'invisible':[('module_account_analytic_analysis','=',False)]}"/>
+                    </group>
                 </group>
             </field>
         </record>

From 5fc01fb74a711aca1f4295d30151dc78528e624d Mon Sep 17 00:00:00 2001
From: "Nimesh (Open ERP)" <nco@tinyerp.com>
Date: Wed, 6 Jun 2012 15:14:21 +0530
Subject: [PATCH 02/12] [IMP] set the decimial precision between 0 to 20.

bzr revid: nco@tinyerp.com-20120606094421-h069ask81mvr6u6n
---
 addons/sale/res_config.py | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/addons/sale/res_config.py b/addons/sale/res_config.py
index 1007107f1a0..33f2afae07d 100644
--- a/addons/sale/res_config.py
+++ b/addons/sale/res_config.py
@@ -103,7 +103,14 @@ class sale_configuration(osv.osv_memory):
         'module_project': fields.boolean("Project"),
         'decimal_precision': fields.integer('Decimal Precision on Price'),
     }
-
+    def _check_decimal(self, cr, uid, ids, context=None):
+        decimal = self.browse(cr, uid, ids, context=context)[0].decimal_precision
+        if decimal > 20:
+            return False
+        return True
+    _constraints = [
+        (_check_decimal, 'Digits must be between 0 and  20 ', ['decimal_precision']),
+    ]
     def default_get(self, cr, uid, fields, context=None):
         ir_model_data = self.pool.get('ir.model.data')
         res = super(sale_configuration, self).default_get(cr, uid, fields, context)

From 74bd52202ef0d13d0e278a303aeac6c461f6015f Mon Sep 17 00:00:00 2001
From: "Jalpesh Patel (OpenERP)" <pja@tinyerp.com>
Date: Wed, 6 Jun 2012 18:07:22 +0530
Subject: [PATCH 03/12] [IMP]purchase:improve purchase and stock wizard
 configration

bzr revid: pja@tinyerp.com-20120606123722-w9f6gt62y1kio2j2
---
 addons/purchase/res_config.py       | 19 +++++++++------
 addons/purchase/res_config_view.xml | 23 ++++++++++++++---
 addons/stock/res_config_view.xml    | 38 +++++++++++++++++------------
 3 files changed, 53 insertions(+), 27 deletions(-)

diff --git a/addons/purchase/res_config.py b/addons/purchase/res_config.py
index d4baa2d6099..8ee97f52030 100644
--- a/addons/purchase/res_config.py
+++ b/addons/purchase/res_config.py
@@ -48,13 +48,7 @@ class purchase_config_settings(osv.osv_memory):
             help="""Allow to configure warnings on products and trigger them when a user wants to purchase a given product or a given supplier. 
             Example: Product: this product is deprecated, do not purchase more than 5.
                     Supplier: don't forget to ask for an express delivery."""),
-        'module_product_manufacturer': fields.boolean("Define Manufacturers on Products",
-            help="""This allows you to define the following for a product:
-                    * Manufacturer
-                    * Manufacturer Product Name
-                    * Manufacturer Product Code
-                    * Product Attributes.
-                This installs the module product_manufacturer."""),
+        
         'module_purchase_double_validation': fields.boolean("Two Levels of Approval",
             help="""Provide a double validation mechanism for purchases exceeding minimum amount.
                 This installs the module purchase_double_validation."""),
@@ -89,5 +83,16 @@ class account_config_settings(osv.osv_memory):
             implied_group='purchase.group_analytic_accounting',
             help="Allows you to specify an analytic account on purchase orders."),
     }
+class stock_config_settings(osv.osv_memory):
+    _inherit = 'stock.config.settings'
+    _columns = {
+        'module_product_manufacturer': fields.boolean("Define Manufacturers on Products",
+            help="""This allows you to define the following for a product:
+                    * Manufacturer
+                    * Manufacturer Product Name
+                    * Manufacturer Product Code
+                    * Product Attributes.
+                This installs the module product_manufacturer."""),
+     }           
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/purchase/res_config_view.xml b/addons/purchase/res_config_view.xml
index 575863fddc4..3b6acff5340 100644
--- a/addons/purchase/res_config_view.xml
+++ b/addons/purchase/res_config_view.xml
@@ -15,7 +15,7 @@
                         <separator string="Invoicing" colspan="4"/>
                         <field name="default_invoice_method"/>
                         <field name="decimal_precision"/>
-
+                      <group>
                         <separator string="Purchase Order" colspan="4"/>
                         <field name="group_purchase_pricelist"/>
                         <field name="group_uom"/>
@@ -23,9 +23,8 @@
                         <field name="module_purchase_requisition"/>
                         <field name="module_warning"/>
                         <field name="module_purchase_analytic_plans"/>
-
-                        <separator string="Products" colspan="4"/>
-                        <field name="module_product_manufacturer"/>
+                      </group>  
+                     
                     </sheet>
                 </form>
             </field>
@@ -58,6 +57,22 @@
                 </group>
             </field>
         </record>
+        
+        <record id="view_stock_config" model="ir.ui.view">
+            <field name="name">stock settings</field>
+            <field name="model">stock.config.settings</field>
+            <field name="type">form</field>
+            <field name="inherit_id" ref="stock.view_stock_config_settings"/>
+            <field name="priority" eval="18"/>
+            <field name="arch" type="xml">
+               	<group name="module_claim" position="after">
+               		<separator string="Products" colspan="4"/>
+               		<group>
+               			<field name="module_product_manufacturer"/>
+               		</group>
+               	</group>        
+            </field>
+        </record>
 
     </data>
 </openerp>
diff --git a/addons/stock/res_config_view.xml b/addons/stock/res_config_view.xml
index 7d17d9eec50..6929154986c 100644
--- a/addons/stock/res_config_view.xml
+++ b/addons/stock/res_config_view.xml
@@ -14,27 +14,33 @@
                     </header>
                     <sheet layout="auto">
                         <separator string="Traceability" colspan="4"/>
-                        <field name="group_stock_production_lot"/>
-                        <field name="module_product_expiry"
-                            attrs="{'invisible': [('group_stock_production_lot','=',False)]}"/>
+                        <group> 
+                        	<field name="group_stock_production_lot"/>
+                        	<field name="module_product_expiry"
+                            	attrs="{'invisible': [('group_stock_production_lot','=',False)]}"/>
                         <newline/>
                         <field name="group_stock_tracking_lot"/>
-
+                        </group> 
                         <separator string="Logistics" colspan="4"/>
-                        <field name="group_stock_multiple_locations"/>
-                        <field name="module_stock_location"/>
-                        <field name="module_stock_invoice_directly"/>
-                        <field name="decimal_precision"/>
-
+                        <group>
+                        	<field name="group_stock_multiple_locations"/>
+                        	<field name="module_stock_location"/>
+                        	<field name="module_stock_invoice_directly"/>
+                        	<field name="decimal_precision"/>
+						</group>
                         <separator string="Products" colspan="4"/>
-                        <field name="group_stock_packaging"/>
-                        <field name="group_stock_inventory_valuation"/>
-                        <field name="group_uom"/>
-                        <field name="group_uos"/>
-                        <field name="group_product_variant"/>
-
+                        <group>
+                        	<field name="group_stock_packaging"/>
+                        	<field name="group_stock_inventory_valuation"/>
+                        	<field name="group_uom"/>
+                        	<field name="group_uos"/>
+                        	<field name="group_product_variant"/>
+						</group>
                         <separator string="Partners" colspan="4"/>
-                        <field name="module_claim_from_delivery"/>
+                        <group name="module_claim">
+                        	<field name="module_claim_from_delivery"/>
+                        </group>
+                       
                     </sheet>
                 </form>
             </field>

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: [PATCH 04/12] [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 ++---
 addons/crm_claim/res_config_view.xml   |  2 +-
 addons/sale/res_config_view.xml        | 60 +++++++++++++-------------
 3 files changed, 35 insertions(+), 37 deletions(-)

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>
diff --git a/addons/crm_claim/res_config_view.xml b/addons/crm_claim/res_config_view.xml
index 72632c1afef..584ec93ea06 100644
--- a/addons/crm_claim/res_config_view.xml
+++ b/addons/crm_claim/res_config_view.xml
@@ -10,7 +10,7 @@
             <field name="priority" eval="12"/>       <!-- to put fetchmail_lead before fetchmail_claim -->
             <field name="arch" type="xml">
                 <group name="config_fetchmail" position="after">
-                    <field name="fetchmail_claim"/>
+                    <field name="fetchmail_claim" attrs="{'readonly': [('fetchmail_claim','=',False)]}"/>
                     <button colspan="2" type="object" name="configure_fetchmail_claim" string="Configure" icon="gtk-execute"/>
                 </group>
             </field>
diff --git a/addons/sale/res_config_view.xml b/addons/sale/res_config_view.xml
index 477107b431c..1cfa80e4208 100644
--- a/addons/sale/res_config_view.xml
+++ b/addons/sale/res_config_view.xml
@@ -9,38 +9,36 @@
             <field name="inherit_id" ref="base.view_sale_config_settings"/>
             <field name="arch" type="xml">
                 <group name="config_sale" position="after">
-                	<group col="4">
-		             	<separator string="Sale Order" colspan="4"/>
-	             		<field name="group_uom"/>
-	             		<field name="default_picking_policy" attrs="{'invisible':[('group_invoice_deli_orders','=',False)]}"/>
-	             		<field name="group_sale_delivery_address"/>
-	             		<field name="group_discount_per_so_line"/>
-	                    <field name="group_sale_pricelist"/>
-	                    <field name="module_sale_margin"/>
-	                    <field name="group_multiple_shops"/>
-	                    <field name="module_sale_layout"/>
-	                    <field name="decimal_precision"/>
-	                    <field name="module_sale_journal"/>
-	                    <field name="module_warning"/>
-	                    
-	                    <separator string="Invoicing Policy" colspan="4"/>
-	                    <field name="module_project_timesheet" invisible="1"/>
-	                    <field name="module_project_mrp" invisible="1"/>
-	                    <field name="group_invoice_so_lines" on_change="onchange_invoice_methods(group_invoice_so_lines, group_invoice_deli_orders)"/>
-	                    <field name="default_order_policy" attrs="{'invisible':['|',('group_invoice_so_lines','=',False),('group_invoice_deli_orders','=',False)],'required': ['|',('group_invoice_so_lines','=',True),('group_invoice_deli_orders','=',True)]}"/>
-	                    <field name="group_invoice_deli_orders" on_change="onchange_invoice_methods(group_invoice_so_lines, group_invoice_deli_orders)"/>
-	                    <field name="module_delivery" attrs="{'invisible':[('group_invoice_so_lines','=',False), ('group_invoice_deli_orders','=',False)]}"/>
-	                    <field name="task_work" on_change="onchange_task_work(task_work)"/>
-	                    <newline/>
-	                    <field name="timesheet" on_change="onchange_timesheet(timesheet)"/>
-	                    <field name="time_unit" domain="[('category_id.name','=','Working Time')]"
-	                        attrs="{'invisible': [('task_work','=',False), ('module_account_analytic_analysis','=',False)],'required': ['|', ('task_work','=',True), ('module_account_analytic_analysis','=',True)]}"/>
+	             	<separator string="Sale Order" colspan="4"/>
+	         		<field name="group_uom"/>
+	         		<field name="default_picking_policy" attrs="{'invisible':[('group_invoice_deli_orders','=',False)]}"/>
+	         		<field name="group_sale_delivery_address"/>
+	         		<field name="group_discount_per_so_line"/>
+	                <field name="group_sale_pricelist"/>
+	                <field name="module_sale_margin"/>
+	                <field name="group_multiple_shops"/>
+	                <field name="module_sale_layout"/>
+	                <field name="decimal_precision"/>
+	                <field name="module_sale_journal"/>
+	                <field name="module_warning"/>
+	                
+	                <separator string="Invoicing Policy" colspan="4"/>
+	                <field name="module_project_timesheet" invisible="1"/>
+	                <field name="module_project_mrp" invisible="1"/>
+	                <field name="group_invoice_so_lines" on_change="onchange_invoice_methods(group_invoice_so_lines, group_invoice_deli_orders)"/>
+	                <field name="default_order_policy" attrs="{'invisible':['|',('group_invoice_so_lines','=',False),('group_invoice_deli_orders','=',False)],'required': ['|',('group_invoice_so_lines','=',True),('group_invoice_deli_orders','=',True)]}"/>
+	                <field name="group_invoice_deli_orders" on_change="onchange_invoice_methods(group_invoice_so_lines, group_invoice_deli_orders)"/>
+	                <field name="module_delivery" attrs="{'invisible':[('group_invoice_so_lines','=',False), ('group_invoice_deli_orders','=',False)]}"/>
+	                <field name="task_work" on_change="onchange_task_work(task_work)"/>
+	                <newline/>
+	                <field name="timesheet" on_change="onchange_timesheet(timesheet)"/>
+	                <field name="time_unit" domain="[('category_id.name','=','Working Time')]"
+	                    attrs="{'invisible': [('task_work','=',False), ('module_account_analytic_analysis','=',False)],'required': ['|', ('task_work','=',True), ('module_account_analytic_analysis','=',True)]}"/>
 	
-	                    <separator string="Contracts" colspan="4"/>
-	                    <field name="module_account_analytic_analysis" on_change="onchange_timesheet(module_account_analytic_analysis)"/>
-	                    <field name="module_analytic_user_function" attrs="{'invisible':[('module_account_analytic_analysis','=',False)]}"/>
-	                    <field name="module_analytic_journal_billing_rate" attrs="{'invisible':[('module_account_analytic_analysis','=',False)]}"/>
-                    </group>
+	                <separator string="Contracts" colspan="4"/>
+	                <field name="module_account_analytic_analysis" on_change="onchange_timesheet(module_account_analytic_analysis)"/>
+	                <field name="module_analytic_user_function" attrs="{'invisible':[('module_account_analytic_analysis','=',False)]}"/>
+	                <field name="module_analytic_journal_billing_rate" attrs="{'invisible':[('module_account_analytic_analysis','=',False)]}"/>
                 </group>
             </field>
         </record>

From 349b2a270776954c6274e9f347ba1c735f9bd509 Mon Sep 17 00:00:00 2001
From: "Nimesh (Open ERP)" <nco@tinyerp.com>
Date: Thu, 7 Jun 2012 15:45:16 +0530
Subject: [PATCH 05/12] [IMP] correct the link of thunderbird plugin xpi file
 and outlook msi file configuration

bzr revid: nco@tinyerp.com-20120607101516-uwvenu14iwreubt8
---
 addons/plugin_outlook/plugin_outlook.py       | 19 ++++++++++---------
 .../plugin_thunderbird/plugin_thunderbird.py  | 19 +++++++++++--------
 2 files changed, 21 insertions(+), 17 deletions(-)

diff --git a/addons/plugin_outlook/plugin_outlook.py b/addons/plugin_outlook/plugin_outlook.py
index 676540dc63a..ac63e0a0d23 100644
--- a/addons/plugin_outlook/plugin_outlook.py
+++ b/addons/plugin_outlook/plugin_outlook.py
@@ -22,29 +22,30 @@
 from osv import fields
 from osv import osv
 import addons
-
 import base64
 
 class outlook_installer(osv.osv_memory):
     _name = 'outlook.installer'
     _inherit = 'res.config.installer'
-
     _columns = {
         'name':fields.char('Outlook Plug-in 32bits', size=64, readonly=True, help="outlook plug-in file. Save as this file and install this plug-in in outlook."),
         'name2':fields.char('Outlook Plug-in 64bits', size=64, readonly=True, help="outlook plug-in file. Save as this file and install this plug-in in outlook."),
         'description':fields.text('Description', readonly=True)
     }
-
-    _defaults = {
-        'name' : '/plugin_outlook/static/openerp-outlook-plugin/OpenERPOutlookPluginSetup32.msi',
-        'name2' : '/plugin_outlook/static/openerp-outlook-plugin/OpenERPOutlookPluginSetup64.msi',
-        'description' : """
+    
+    def default_get(self, cr, uid, fields, context=None):
+        res = {}
+        plugin_32bit_url = self.pool.get('ir.config_parameter').get_param(cr, uid, 'web.base.url')  + '/plugin_outlook/static/openerp-outlook-plugin/OpenERPOutlookPluginSetup32.msi'
+        plugin_64bit_url = self.pool.get('ir.config_parameter').get_param(cr, uid, 'web.base.url')  + '/plugin_outlook/static/openerp-outlook-plugin/OpenERPOutlookPluginSetup64.msi'
+        description = """
 Click on icon next to the link above to download the installer either for 32 or 64 bits and execute it.
 
 System requirements:
     1.  MS Outlook 2005 or above.
     2.  MS .Net Framework 3.5 or above.
 """
-        }
-
+        res['name'] = plugin_32bit_url
+        res['name2'] = plugin_64bit_url
+        res['description'] = description
+        return res
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/plugin_thunderbird/plugin_thunderbird.py b/addons/plugin_thunderbird/plugin_thunderbird.py
index 7e9b5626e5b..47233eba904 100644
--- a/addons/plugin_thunderbird/plugin_thunderbird.py
+++ b/addons/plugin_thunderbird/plugin_thunderbird.py
@@ -34,13 +34,10 @@ class plugin_thunderbird_installer(osv.osv_memory):
         'pdf_file':fields.char('Installation Manual', size=264, help="The documentation file :- how to install Thunderbird Plug-in.", readonly=True),
         'description':fields.text('Description', readonly=True)
     }
-
-    _defaults = {
-        'thunderbird' : True,
-        'name' : 'openerp_plugin.xpi',
-        'pdf_file' : 'http://doc.openerp.com/book/2/2_6_Comms/2_6_Comms_thunderbird.html',
-        'plugin_file' : '/plugin_thunderbird/static/openerp_plugin.xpi',
-        'description' : """
+    def default_get(self, cr, uid, fields, context=None):
+        res = {}
+        plugin_url = self.pool.get('ir.config_parameter').get_param(cr, uid, 'web.base.url')  + '/plugin_thunderbird/static/openerp_plugin.xpi'
+        description = """
 Thunderbird plugin installation:
     1.  Save the Thunderbird plug-in.
     2.  From the Thunderbird menubar: Tools ­> Add-ons -> Screwdriver/Wrench Icon -> Install add-on from file...
@@ -50,5 +47,11 @@ Thunderbird plugin installation:
     7.  From the Thunderbird menubar: OpenERP -> Configuration.
     8.  Configure your openerp server.
 """
-    }
+        res['thunderbird'] = True,
+        res['name'] = 'openerp_plugin.xpi'
+        res['plugin_file'] = plugin_url
+        res['pdf_file'] = 'http://doc.openerp.com/book/2/2_6_Comms/2_6_Comms_thunderbird.html',
+        res['description'] = description
+        return res
 
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file

From 978ea9506c4db7137c188197fb9197a9c2c16422 Mon Sep 17 00:00:00 2001
From: "Nimesh (Open ERP)" <nco@tinyerp.com>
Date: Thu, 7 Jun 2012 16:07:29 +0530
Subject: [PATCH 06/12] [IMP] change the string to Sale Orders.

bzr revid: nco@tinyerp.com-20120607103729-inrticxghy2bi4ja
---
 addons/sale/res_config.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/sale/res_config.py b/addons/sale/res_config.py
index 33f2afae07d..e86288b5894 100644
--- a/addons/sale/res_config.py
+++ b/addons/sale/res_config.py
@@ -27,7 +27,7 @@ class sale_configuration(osv.osv_memory):
     _inherit = 'sale.config.settings'
 
     _columns = {
-        'group_invoice_so_lines': fields.boolean('Based on Sales Orders',
+        'group_invoice_so_lines': fields.boolean('Based on Sale Orders',
             implied_group='sale.group_invoice_so_lines',
             help="To allow your salesman to make invoices for sale order lines using the menu 'Lines to Invoice'."),
         'group_invoice_deli_orders': fields.boolean('Based on Delivery Orders',

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: [PATCH 07/12] [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 +++---
 addons/plugin_thunderbird/plugin_thunderbird.xml |  2 +-
 3 files changed, 10 insertions(+), 10 deletions(-)

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>
diff --git a/addons/plugin_thunderbird/plugin_thunderbird.xml b/addons/plugin_thunderbird/plugin_thunderbird.xml
index b5601e7904a..c535527fc63 100644
--- a/addons/plugin_thunderbird/plugin_thunderbird.xml
+++ b/addons/plugin_thunderbird/plugin_thunderbird.xml
@@ -63,7 +63,7 @@
         <field name="inherit_id" ref="base.view_sale_config_settings"/>
         <field name="arch" type="xml">
             <field name="module_plugin_thunderbird" position="after">
-                <group colspan="2" attrs="{'invisible': [('module_crm','=',False)]}">
+                <group colspan="2" attrs="{'invisible': ['|',('module_crm','=',False),('module_plugin_thunderbird','=',False)]}">
                     <button name="%(action_thunderbird_installer)d" type="action"
                         string="Configure Thunderbird Plugin" icon="gtk-execute"/>
                 </group>

From d8d752f3099b82704699bec4ea07a97ee0b01589 Mon Sep 17 00:00:00 2001
From: "pankita shah (Open ERP)" <shp@tinyerp.com>
Date: Fri, 8 Jun 2012 11:53:18 +0530
Subject: [PATCH 08/12] [rearrange] Rearrange fields

bzr revid: shp@tinyerp.com-20120608062318-jmle3thwuumllh97
---
 addons/project/res_config.py       |  1 +
 addons/project/res_config_view.xml | 13 +++++++++----
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/addons/project/res_config.py b/addons/project/res_config.py
index 21281110fb9..3c396d76b3a 100644
--- a/addons/project/res_config.py
+++ b/addons/project/res_config.py
@@ -46,6 +46,7 @@ class project_configuration(osv.osv_memory):
         'module_project_issue': fields.boolean("Issues and Bug Tracking",
             help="""Provides management of issues/bugs in projects.
                 This installs the module project_issue."""),
+        'time_unit': fields.many2one('product.uom', 'Working Time Unit'),
         'module_project_issue_sheet': fields.boolean("Track and Invoice Issues Working Time",
             help="""Provides timesheet support for the issues/bugs management in project.
                 This installs the module project_issue_sheet."""),
diff --git a/addons/project/res_config_view.xml b/addons/project/res_config_view.xml
index 4914ff26e88..1a52936d055 100644
--- a/addons/project/res_config_view.xml
+++ b/addons/project/res_config_view.xml
@@ -7,28 +7,33 @@
             <field name="type">form</field>
             <field name="priority" eval="20"/>
             <field name="arch" type="xml">
+           
                 <form string="Configure Project" layout="manual">
                     <header>
                         <button string="Apply" type="object" name="execute"/>
                         <button string="Cancel" special="cancel"/>
                     </header>
+                  
                     <sheet layout="auto">
+                      <group> 
                         <separator string="Project" colspan="4"/>
+                        <field name="group_time_work_estimation_tasks"/>
+                        <field name="group_tasks_work_on_tasks"/>
+                        <field name="time_unit"/> 
                         <field name="module_project_mrp"/>
                         <field name="module_project_timesheet"/>
                         <field name="module_pad"/>
-                        <field name="group_tasks_work_on_tasks"/>
-                        <field name="group_time_work_estimation_tasks"/>
-
                         <separator string="Planning" colspan="4"/>
                         <field name="module_project_long_term"/>
-
                         <separator string="Helpdesk and Support" colspan="4"/>
                         <field name="module_project_issue"/>
                         <field name="module_project_issue_sheet"/>
                         <group name="support" colspan="4"/>
+                       </group> 
                     </sheet>
+                   
                 </form>
+              
             </field>
         </record>
 

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: [PATCH 09/12] [IMP] set visible true for config fetchmail lead.

bzr revid: nco@tinyerp.com-20120608062711-67ank4egz40imr2p
---
 addons/base_setup/base_setup.py | 2 +-
 addons/crm/res_config.py        | 2 +-
 addons/crm/res_config_view.xml  | 4 +++-
 3 files changed, 5 insertions(+), 3 deletions(-)

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
diff --git a/addons/crm/res_config.py b/addons/crm/res_config.py
index b40ed78bb16..563da4bd137 100644
--- a/addons/crm/res_config.py
+++ b/addons/crm/res_config.py
@@ -26,7 +26,7 @@ class crm_configuration(osv.osv_memory):
     _inherit = ['sale.config.settings', 'fetchmail.config.settings']
 
     _columns = {
-        'fetchmail_lead': fields.boolean("Create Leads from Incoming Mails", readonly=True,
+        'fetchmail_lead': fields.boolean("Create Leads from Incoming Mails",
             fetchmail_model='crm.lead', fetchmail_name='Incoming Leads',
             help="""Allows you to configure your incoming mail server, and create leads from incoming emails."""),
         'module_crm_caldav': fields.boolean("Caldav Synchronization",
diff --git a/addons/crm/res_config_view.xml b/addons/crm/res_config_view.xml
index a09f333076f..53cdb0a873c 100644
--- a/addons/crm/res_config_view.xml
+++ b/addons/crm/res_config_view.xml
@@ -10,7 +10,9 @@
             <field name="arch" type="xml">
                 <group name="config_fetchmail" position="after">
                     <field name="fetchmail_lead"/>
-                    <button colspan="2" type="object" name="configure_fetchmail_lead" string="Configure" icon="gtk-execute"/>
+                    <group attrs="{'invisible': [('fetchmail_lead','=',False)]}">
+                    	<button colspan="2" type="object" name="configure_fetchmail_lead" string="Configure" icon="gtk-execute"/>
+                    </group>
                 </group>
 
                 <group name="config_crm" position="after">

From 1ba85871a570979294c57668881eef4a661f73ad Mon Sep 17 00:00:00 2001
From: "Jalpesh Patel (OpenERP)" <pja@tinyerp.com>
Date: Fri, 8 Jun 2012 13:09:08 +0530
Subject: [PATCH 10/12] [IMP]improve purchase and mrp configuration wizard

bzr revid: pja@tinyerp.com-20120608073908-1zxy5s6dmin0zxir
---
 addons/mrp/res_config.py            |  7 +++++++
 addons/mrp/res_config_view.xml      | 27 ++++++++++++++++++---------
 addons/purchase/res_config.py       | 11 -----------
 addons/purchase/res_config_view.xml | 17 +----------------
 addons/stock/res_config_view.xml    |  2 +-
 5 files changed, 27 insertions(+), 37 deletions(-)

diff --git a/addons/mrp/res_config.py b/addons/mrp/res_config.py
index 1b2aa1c2732..44100c8e9c8 100644
--- a/addons/mrp/res_config.py
+++ b/addons/mrp/res_config.py
@@ -68,6 +68,13 @@ class mrp_config_settings(osv.osv_memory):
         'group_mrp_properties': fields.boolean("Allow Several BoMs per Product",
             implied_group='product.group_mrp_properties',
             help="""The selection of the right Bill of Material to use will depend on the  properties specified on the sale order and the Bill of Material."""),
+        'module_product_manufacturer': fields.boolean("Define Manufacturers on Products",
+            help="""This allows you to define the following for a product:
+                    * Manufacturer
+                    * Manufacturer Product Name
+                    * Manufacturer Product Code
+                    * Product Attributes.
+                This installs the module product_manufacturer."""),        
     }
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/mrp/res_config_view.xml b/addons/mrp/res_config_view.xml
index 258fe4f8356..7bc48f500b0 100644
--- a/addons/mrp/res_config_view.xml
+++ b/addons/mrp/res_config_view.xml
@@ -13,17 +13,26 @@
                     </header>
                     <sheet layout="auto">
                         <separator string="Manufacturing Order" colspan="4"/>
-                        <field name="module_mrp_operations"/>
-                        <field name="module_stock_planning"/>
-                        <field name="module_mrp_subproduct"/>
-                        <field name="module_mrp_repair"/>
-
+                        <group>
+                        	<field name="module_mrp_operations"/>
+                        	<field name="module_stock_planning"/>
+                        	<field name="module_mrp_subproduct"/>
+                        	<field name="module_mrp_repair"/>
+						</group>
                         <separator string="Logistics" colspan="4"/>
-                        <field name="module_mrp_jit"/>
-                        <field name="module_stock_no_autopicking"/>
+                        <group>
+                        	<field name="module_mrp_jit"/>
+                        	<field name="module_stock_no_autopicking"/>
+                        </group>	
                         <separator string="Bill Of Material" colspan="4"/>
-                        <field name="group_mrp_routings"/>
-                        <field name="group_mrp_properties"/>
+                        <group>
+                        	<field name="group_mrp_routings"/>
+                        	<field name="group_mrp_properties"/>
+                        </group>
+                        <separator string="Products" colspan="4"/>
+                        <group>
+             				<field name="module_product_manufacturer"/>
+             			</group>
                     </sheet>
                 </form>
             </field>
diff --git a/addons/purchase/res_config.py b/addons/purchase/res_config.py
index 8ee97f52030..941fe7a8f37 100644
--- a/addons/purchase/res_config.py
+++ b/addons/purchase/res_config.py
@@ -83,16 +83,5 @@ class account_config_settings(osv.osv_memory):
             implied_group='purchase.group_analytic_accounting',
             help="Allows you to specify an analytic account on purchase orders."),
     }
-class stock_config_settings(osv.osv_memory):
-    _inherit = 'stock.config.settings'
-    _columns = {
-        'module_product_manufacturer': fields.boolean("Define Manufacturers on Products",
-            help="""This allows you to define the following for a product:
-                    * Manufacturer
-                    * Manufacturer Product Name
-                    * Manufacturer Product Code
-                    * Product Attributes.
-                This installs the module product_manufacturer."""),
-     }           
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/purchase/res_config_view.xml b/addons/purchase/res_config_view.xml
index 3b6acff5340..23875ac3e29 100644
--- a/addons/purchase/res_config_view.xml
+++ b/addons/purchase/res_config_view.xml
@@ -24,7 +24,6 @@
                         <field name="module_warning"/>
                         <field name="module_purchase_analytic_plans"/>
                       </group>  
-                     
                     </sheet>
                 </form>
             </field>
@@ -58,21 +57,7 @@
             </field>
         </record>
         
-        <record id="view_stock_config" model="ir.ui.view">
-            <field name="name">stock settings</field>
-            <field name="model">stock.config.settings</field>
-            <field name="type">form</field>
-            <field name="inherit_id" ref="stock.view_stock_config_settings"/>
-            <field name="priority" eval="18"/>
-            <field name="arch" type="xml">
-               	<group name="module_claim" position="after">
-               		<separator string="Products" colspan="4"/>
-               		<group>
-               			<field name="module_product_manufacturer"/>
-               		</group>
-               	</group>        
-            </field>
-        </record>
+        
 
     </data>
 </openerp>
diff --git a/addons/stock/res_config_view.xml b/addons/stock/res_config_view.xml
index 6929154986c..c7278505f9b 100644
--- a/addons/stock/res_config_view.xml
+++ b/addons/stock/res_config_view.xml
@@ -37,7 +37,7 @@
                         	<field name="group_product_variant"/>
 						</group>
                         <separator string="Partners" colspan="4"/>
-                        <group name="module_claim">
+                        <group>
                         	<field name="module_claim_from_delivery"/>
                         </group>
                        

From c4b68a2382d36482ab78853473cbb53a9087b72c Mon Sep 17 00:00:00 2001
From: "Jalpesh Patel (OpenERP)" <pja@tinyerp.com>
Date: Fri, 8 Jun 2012 16:09:54 +0530
Subject: [PATCH 11/12] [IMP] improve purchase and mrp configuration wizard

bzr revid: pja@tinyerp.com-20120608103954-nc7j0m04x6h927xt
---
 addons/mrp/res_config_view.xml | 21 +++++++++------------
 1 file changed, 9 insertions(+), 12 deletions(-)

diff --git a/addons/mrp/res_config_view.xml b/addons/mrp/res_config_view.xml
index 7bc48f500b0..9ec358c59a8 100644
--- a/addons/mrp/res_config_view.xml
+++ b/addons/mrp/res_config_view.xml
@@ -12,27 +12,24 @@
                         <button string="Cancel" special="cancel"/>
                     </header>
                     <sheet layout="auto">
+                    <group>	
                         <separator string="Manufacturing Order" colspan="4"/>
-                        <group>
-                        	<field name="module_mrp_operations"/>
-                        	<field name="module_stock_planning"/>
-                        	<field name="module_mrp_subproduct"/>
-                        	<field name="module_mrp_repair"/>
-						</group>
+                        <field name="module_mrp_operations"/>
+                        <field name="module_stock_planning"/>
+                        <field name="module_mrp_subproduct"/>
+                        <field name="module_mrp_repair"/>
+                        
                         <separator string="Logistics" colspan="4"/>
-                        <group>
                         	<field name="module_mrp_jit"/>
                         	<field name="module_stock_no_autopicking"/>
-                        </group>	
+                        		
                         <separator string="Bill Of Material" colspan="4"/>
-                        <group>
                         	<field name="group_mrp_routings"/>
                         	<field name="group_mrp_properties"/>
-                        </group>
+                        	
                         <separator string="Products" colspan="4"/>
-                        <group>
              				<field name="module_product_manufacturer"/>
-             			</group>
+             		</group>		
                     </sheet>
                 </form>
             </field>

From 1a73402fda8a6403fc08e05d7804f25660757db2 Mon Sep 17 00:00:00 2001
From: "Atul Patel (OpenERP)" <atp@tinyerp.com>
Date: Sat, 9 Jun 2012 22:57:57 +0530
Subject: [PATCH 12/12] [IMP]: set readonly false for fetchamail applicant

bzr revid: atp@tinyerp.com-20120609172757-nucfe5sgkmnl2z4z
---
 addons/hr/res_config_view.xml             | 3 ++-
 addons/hr_recruitment/res_config.py       | 4 ++--
 addons/hr_recruitment/res_config_view.xml | 4 +++-
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/addons/hr/res_config_view.xml b/addons/hr/res_config_view.xml
index 8a7dabeabcc..52558136455 100644
--- a/addons/hr/res_config_view.xml
+++ b/addons/hr/res_config_view.xml
@@ -20,6 +20,7 @@
                         <button string="Cancel" special="cancel"/>
                     </header>
                     <sheet layout="auto">
+                      <group colspan="4" col="4">
                         <separator string="Additional Features" colspan="4"/>
                         <field name="module_hr_expense"/>
                         <field name="module_hr_recruitment"/>
@@ -35,8 +36,8 @@
                         <field name="module_hr_attendance" on_change="onchange_hr_attendance(module_hr_attendance)"/>
                         <field name="module_hr_timesheet" on_change="onchange_hr_timesheet(module_hr_timesheet)"/>
                         <field name="module_hr_timesheet_sheet"/>
-
                         <group name="config_recruitment" colspan="4"/>
+                      </group>
                     </sheet>
                 </form>
             </field>
diff --git a/addons/hr_recruitment/res_config.py b/addons/hr_recruitment/res_config.py
index 28f501c5213..4818d280879 100644
--- a/addons/hr_recruitment/res_config.py
+++ b/addons/hr_recruitment/res_config.py
@@ -29,8 +29,8 @@ class hr_applicant_settings(osv.osv_memory):
         'module_document_ftp': fields.boolean('Automatic Indexation of Resumes',
             help="""Manage your CV's and motivation letter related to all applicants.
                 This installs the module document_ftp. This will install the knowledge management  module in order to allow you to search using specific keywords through  the content of all documents (PDF, .DOCx...)"""),
-        'fetchmail_applicants': fields.boolean('Create Applicants from Incoming Mails', readonly=True,
-            fetchmail_model='hr.applicant', fetchmail_name='Incoming HR Applications',                                            
+        'fetchmail_applicants': fields.boolean('Create Applicants from Incoming Mails',
+            fetchmail_model='hr.applicant', fetchmail_name='Incoming HR Applications',   
             help ="""Allow applicants to send their job application to an email address (jobs@mycompany.com),
                 and create automatically application documents in the system."""),
     }
diff --git a/addons/hr_recruitment/res_config_view.xml b/addons/hr_recruitment/res_config_view.xml
index 659aa586d56..542f89a279f 100644
--- a/addons/hr_recruitment/res_config_view.xml
+++ b/addons/hr_recruitment/res_config_view.xml
@@ -12,7 +12,9 @@
                     <field name="module_document_ftp"/>
                     <newline/>
                     <field name="fetchmail_applicants"/>
-                    <button colspan="2" type="object" name="configure_fetchmail_applicants" string="Configure" icon="gtk-execute"/>
+                     <group attrs="{'invisible': [('fetchmail_applicants','=',False)]}">
+                        <button colspan="2" type="object" name="configure_fetchmail_applicants" string="Configure" icon="gtk-execute"/>
+                     </group>
                 </group>
             </field>
         </record>