From 5563434379183934877b7b9e45babc4af19d4132 Mon Sep 17 00:00:00 2001
From: "Nimesh (Open ERP)" <nco@tinyerp.com>
Date: Thu, 14 Jun 2012 18:25:59 +0530
Subject: [PATCH 1/3] [IMP] correct the spelling taks to task for Manage Task
 Delegation.

bzr revid: nco@tinyerp.com-20120614125559-4e8hdy1eoq3lap03
---
 addons/project/res_config.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/project/res_config.py b/addons/project/res_config.py
index 486f2cd746c..d2281b99ab9 100644
--- a/addons/project/res_config.py
+++ b/addons/project/res_config.py
@@ -58,7 +58,7 @@ class project_configuration(osv.osv_memory):
         'group_time_work_estimation_tasks': fields.boolean("Time Estimation on Tasks",
             implied_group='project.group_time_work_estimation_tasks',
             help="Allows you to compute Time Estimation on tasks."),
-        'group_manage_delegation_task': fields.boolean("Manage Taks Delegation",
+        'group_manage_delegation_task': fields.boolean("Manage Task Delegation",
             implied_group='project.group_delegate_task',
             help="Allows you to delegate tasks to other users."),                                
     }

From 6b859c1e91a5dcf4b3e5b8bbd3e1a0e46990237f Mon Sep 17 00:00:00 2001
From: "Nimesh (Open ERP)" <nco@tinyerp.com>
Date: Thu, 14 Jun 2012 18:57:53 +0530
Subject: [PATCH 2/3] [IMP] remove readonly from Create Issues from Incoming
 Mails field and on click make configure button is visible.

bzr revid: nco@tinyerp.com-20120614132753-c3t0s2dir63ik850
---
 addons/project_issue/res_config.py       | 2 +-
 addons/project_issue/res_config_view.xml | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/addons/project_issue/res_config.py b/addons/project_issue/res_config.py
index 21e50b21e8d..ec7080708ac 100644
--- a/addons/project_issue/res_config.py
+++ b/addons/project_issue/res_config.py
@@ -26,7 +26,7 @@ class project_issue_settings(osv.osv_memory):
     _inherit = ['project.config.settings', 'fetchmail.config.settings']
 
     _columns = {
-        'fetchmail_issue': fields.boolean("Create Issues from Incoming Mails", readonly=True,
+        'fetchmail_issue': fields.boolean("Create Issues from Incoming Mails", 
             fetchmail_model='project.issue', fetchmail_name='Incoming Issues',
             help="""Allows you to configure your incoming mail server, and create issues from incoming emails."""),
     }
diff --git a/addons/project_issue/res_config_view.xml b/addons/project_issue/res_config_view.xml
index 0a470205c24..b4e56a8d99a 100644
--- a/addons/project_issue/res_config_view.xml
+++ b/addons/project_issue/res_config_view.xml
@@ -9,8 +9,11 @@
             <field name="inherit_id" ref="project.view_config_settings"/>
             <field name="arch" type="xml">
                 <group name="support" position="after">
+                	<newline/>
                     <field name="fetchmail_issue"/>
-                    <button colspan="2" type="object" name="configure_fetchmail_issue" string="Configure" icon="gtk-execute"/>
+                    <group attrs="{'invisible': [('fetchmail_issue','=',False)]}">
+                    	<button colspan="2" type="object" name="configure_fetchmail_issue" string="Configure" icon="gtk-execute"/>
+                    </group>
                 </group>
             </field>
         </record>

From b3394e64d1690af2d28c0ef49b02836b8b438548 Mon Sep 17 00:00:00 2001
From: "Nimesh (Open ERP)" <nco@tinyerp.com>
Date: Fri, 15 Jun 2012 11:03:52 +0530
Subject: [PATCH 3/3] [IMP] put company related field in multi company gorup

bzr revid: nco@tinyerp.com-20120615053352-xwh6oscn2gbqc01b
---
 addons/account/res_config_view.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/account/res_config_view.xml b/addons/account/res_config_view.xml
index b39c01af6af..017ba098274 100644
--- a/addons/account/res_config_view.xml
+++ b/addons/account/res_config_view.xml
@@ -21,7 +21,7 @@
                         <button string="Cancel" special="cancel"/>
                     </header>
                     <sheet>
-                    <group string="Accounting Details of Company" col="4">
+                    <group string="Accounting Details of Company" col="4" groups="base.group_multi_company">
                         <field name="has_default_company" invisible="1" />
                         <field name="has_chart_of_accounts" invisible="1"/>
                         <field name="company_id" widget="selection" on_change="onchange_company_id(company_id)"
@@ -29,7 +29,7 @@
                         <field name="expects_chart_of_accounts"/>
                     </group>
 
-                    <group string="Select a Chart of Accounts to Install" col="4" attrs="{'invisible': ['|', ('expects_chart_of_accounts','=',False), ('has_chart_of_accounts','=',True)]}">
+                    <group string="Select a Chart of Accounts to Install" col="4" groups="base.group_multi_company" attrs="{'invisible': ['|', ('expects_chart_of_accounts','=',False), ('has_chart_of_accounts','=',True)]}">
                         <field name="chart_template_id" widget="selection" on_change="onchange_chart_template_id(chart_template_id)" domain="[('visible','=', True)]"/>
                         <button string="Install More Chart Templates" icon="gtk-go-forward"
                             name="%(open_account_charts_modules)d" type="action"/>