[MERGE] Merged with addons/trunk.

bzr revid: tde@openerp.com-20120813073105-pz2vdiz7gc27triz

5 files changed, 9 insertions, 9 deletions

diff --git a/addons/project/project.py b/addons/project/project.py
index 355665152a2..a3f1c85bb7e 100644
--- a/addons/project/project.py
+++ b/addons/project/project.py
@@ -788,7 +788,7 @@ class task(base_stage, osv.osv):
             }),
         'user_id': fields.many2one('res.users', 'Assigned to'),
         'delegated_user_id': fields.related('child_ids', 'user_id', type='many2one', relation='res.users', string='Delegated To'),
-        'partner_id': fields.many2one('res.partner', 'Partner'),
+        'partner_id': fields.many2one('res.partner', 'Contact'),
         'work_ids': fields.one2many('project.task.work', 'task_id', 'Work done'),
         'manager_id': fields.related('project_id', 'analytic_account_id', 'user_id', type='many2one', relation='res.users', string='Project Manager'),
         'company_id': fields.many2one('res.company', 'Company'),
diff --git a/addons/project/project_demo.xml b/addons/project/project_demo.xml
index cf3353a3750..fb4b37edb2b 100644
--- a/addons/project/project_demo.xml
+++ b/addons/project/project_demo.xml
@@ -71,7 +71,7 @@
 
         <!-- Categories -->
         <record id="project_category_01" model="project.category">
-            <field name="name">Partner's suggestion</field>
+            <field name="name">Contact's suggestion</field>
         </record>
         <record id="project_category_02" model="project.category">
             <field name="name">Feature request</field>
diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 41fdbe6a53a..41e9ae51923 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -89,7 +89,7 @@
                     <group>
                         <group>
                             <field name="user_id" string="Project Manager" attrs="{'readonly':[('state','in',['close', 'cancelled'])]}"/>
-                            <field name="partner_id" string = "Contact" on_change="onchange_partner_id(partner_id)"/>
+                            <field name="partner_id" string="Contact" on_change="onchange_partner_id(partner_id)"/>
                             <field name="privacy_visibility"/>
                             <field name="analytic_account_id" invisible="1" required="0"/>
                         </group>
@@ -171,10 +171,10 @@
                     <separator/>
                     <filter string="Project(s) Manager" domain="[('user_id','=',uid)]" help="Projects in which I am a manager" icon="terp-personal"/>
                     <field name="user_id" string="Project Manager"/>
-                    <field name="partner_id" string="Partner"/>
+                    <field name="partner_id" string="Contact"/>
                     <group expand="0" string="Group By...">
                         <filter string="Manager" name="Manager" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
-                        <filter string="Partner" name="Partner" icon="terp-partner" domain="[]" context="{'group_by':'partner_id'}"/>
+                        <filter string="Contact" name="Partner" icon="terp-partner" domain="[]" context="{'group_by':'partner_id'}"/>
                         <filter string="Parent" name="Parent" help="Parent" icon="terp-folder-blue" domain = "[]" context="{'group_by':'parent_id'}"/>
                     </group>
                 </search>
@@ -328,7 +328,7 @@
                         <field colspan="4" name="name"/>
                         <field name="hours" widget="float_time"/>
                         <field name="date"/>
-                        <field name="user_id"/>
+                        <field name="user_id" options='{"no_open": true}'/>
                         <field name="company_id" groups="base.group_multi_company" widget="selection"/>
                     </group>
                 </form>
@@ -422,7 +422,7 @@
                     <group>
                         <group>
                             <field name="project_id"  on_change="onchange_project(project_id)" context="{'default_use_tasks':1}"/>
-                            <field name="user_id" attrs="{'readonly':[('state','in',['done', 'cancelled'])]}"/>
+                            <field name="user_id" attrs="{'readonly':[('state','in',['done', 'cancelled'])]}" options='{"no_open": true}'/>
                             <field name="company_id" groups="base.group_multi_company" widget="selection"/>
                         </group>
                         <group>
diff --git a/addons/project/report/project_report.py b/addons/project/report/project_report.py
index 36e025ab509..6c1f5443835 100644
--- a/addons/project/report/project_report.py
+++ b/addons/project/report/project_report.py
@@ -53,7 +53,7 @@ class report_project_task_user(osv.osv):
         'month':fields.selection([('01','January'), ('02','February'), ('03','March'), ('04','April'), ('05','May'), ('06','June'), ('07','July'), ('08','August'), ('09','September'), ('10','October'), ('11','November'), ('12','December')], 'Month', readonly=True),
         'state': fields.selection([('draft', 'Draft'), ('open', 'In Progress'), ('pending', 'Pending'), ('cancelled', 'Cancelled'), ('done', 'Done')],'Status', readonly=True),
         'company_id': fields.many2one('res.company', 'Company', readonly=True, groups="base.group_multi_company"),
-        'partner_id': fields.many2one('res.partner', 'Partner', readonly=True),
+        'partner_id': fields.many2one('res.partner', 'Contact', readonly=True),
     }
     _order = 'name desc, project_id'
 
diff --git a/addons/project/report/project_report_view.xml b/addons/project/report/project_report_view.xml
index ab880536ced..9383a588e3a 100644
--- a/addons/project/report/project_report_view.xml
+++ b/addons/project/report/project_report_view.xml
@@ -80,7 +80,7 @@
                     <group expand="1" string="Group By...">
                         <filter string="Project" name="project" icon="terp-folder-violet" context="{'group_by':'project_id'}"/>
                         <filter string="Task" icon="terp-stock_align_left_24" context="{'group_by':'name'}" />
-                        <filter string="Partner" icon="terp-partner" context="{'group_by':'partner_id'}" />
+                        <filter string="Contact" icon="terp-partner" context="{'group_by':'partner_id'}" />
                         <filter string="Assigned to" name="User" icon="terp-personal" context="{'group_by':'user_id'}" />
                         <filter string="Status" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}"/>
                         <filter string="Company" icon="terp-go-home" context="{'group_by':'company_id'}"  groups="base.group_multi_company"/>