From 362aabce1a03b3dabdbbb1c168b7b11672462668 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Wed, 26 Jun 2013 16:35:59 +0200
Subject: [FIX] project_long_term: fixed reference to task.state

bzr revid: tde@openerp.com-20130626143559-mxg8k5m8fbtkf06u
---
 addons/project_long_term/project_long_term_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'addons/project_long_term/project_long_term_view.xml')

diff --git a/addons/project_long_term/project_long_term_view.xml b/addons/project_long_term/project_long_term_view.xml
index e61af0c6c32..e2f47489b4a 100644
--- a/addons/project_long_term/project_long_term_view.xml
+++ b/addons/project_long_term/project_long_term_view.xml
@@ -200,7 +200,7 @@
                                     <field name="project_id" invisible="1"/>
                                     <field name="total_hours" sum='Total Hours'/>
                                     <field name="remaining_hours" widget="float_time" sum="Remaining Hours"/>
-                                    <field name="state"/>
+                                    <field name="stage_id"/>
                                   </tree>
                              </field>
                         </page>
-- 
cgit v1.2.3


From ed0a829cb337f86f2a3d9a6892290d0cf5c89214 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Wed, 4 Sep 2013 16:10:53 +0200
Subject: [MERGE] [IMP] addons: improved name and tooltips of groupby date in
 various addons.

bzr revid: tde@openerp.com-20130904141053-yustqiuzynbettq8
---
 addons/project_long_term/project_long_term_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'addons/project_long_term/project_long_term_view.xml')

diff --git a/addons/project_long_term/project_long_term_view.xml b/addons/project_long_term/project_long_term_view.xml
index e2f47489b4a..35220fdba8f 100644
--- a/addons/project_long_term/project_long_term_view.xml
+++ b/addons/project_long_term/project_long_term_view.xml
@@ -280,7 +280,7 @@
                     <group expand="0" string="Group By...">
                         <filter string="Project" icon="terp-folder-violet" domain="[]" context="{'group_by':'project_id'}" name="project"/>
                         <filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
-                        <filter string="Month" icon="terp-go-month" domain="[]" context="{'group_by':'date_start'}" help="Start Month"/>
+                        <filter string="Start Month" icon="terp-go-month" domain="[]" context="{'group_by':'date_start'}"/>
                     </group>
                 </search>
             </field>
-- 
cgit v1.2.3


From 8b48cc9520a41860ce069b7cb2d60cb82b79e1a3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Wed, 4 Sep 2013 16:11:22 +0200
Subject: [MERGE] addons: added groups when quick creating user in various
 addons.

bzr revid: tde@openerp.com-20130904141122-uaxlnu7qxzri4q3a
---
 addons/project_long_term/project_long_term_view.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'addons/project_long_term/project_long_term_view.xml')

diff --git a/addons/project_long_term/project_long_term_view.xml b/addons/project_long_term/project_long_term_view.xml
index 35220fdba8f..36fb83000ce 100644
--- a/addons/project_long_term/project_long_term_view.xml
+++ b/addons/project_long_term/project_long_term_view.xml
@@ -33,7 +33,7 @@
             <field name="arch" type="xml">
                 <form string="Project User Allocation" version="7.0">
                     <group col="4">
-                        <field name="user_id"/>
+                        <field name="user_id" context="{'default_groups_ref': ['base.group_user', 'base.group_partner_manager', 'project.group_project_user']}"/>
                         <field name="phase_id"/>
                         <field name="project_id"/>
                         <field name="date_start"/>
@@ -49,7 +49,7 @@
             <field name="priority" eval="5"/>
             <field name="arch" type="xml">
                 <tree editable="bottom" string="Project User Allocation">
-                    <field name="user_id"/>
+                    <field name="user_id" context="{'default_groups_ref': ['base.group_user', 'project.group_project_user']}"/>
                     <field name="phase_id"/>
                     <field name="project_id"/>
                 </tree>
@@ -175,7 +175,7 @@
                         <page string="Team Planning">
                             <field name="user_ids">
                                  <tree editable="bottom" string="Project Users">
-                                      <field name="user_id"/>
+                                      <field name="user_id" context="{'default_groups_ref': ['base.group_user', 'base.group_partner_manager', 'project.group_project_user']}"/>
                                       <field name="date_start"/>
                                       <field name="date_end"/>
                                   </tree>
-- 
cgit v1.2.3