X-Git-Url: http://git.inspyration.org/?a=blobdiff_plain;f=addons%2Fproject%2Fproject_view.xml;h=e521654e5a7497cab567ccd011fab487d49e949b;hb=d30d000ae3a74b73ecacb337291db616812a2f6c;hp=60cbd9c8af0324d902173e13a2612e492de80b25;hpb=e802f621a75bbe404c51889fce4a3ca8b54414a1;p=odoo%2Fodoo.git

diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 60cbd9c..e521654 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -11,6 +11,15 @@
 
         <menuitem id="menu_project_management" name="Project" parent="base.menu_main_pm" sequence="1"/>
         <menuitem id="menu_definitions" name="Configuration" parent="base.menu_main_pm" sequence="60"/>
+        
+        <act_window
+            context="{'search_default_project_id': [active_id], 'default_project_id': active_id}"
+            id="act_project_project_2_project_task_all"
+            name="Tasks"
+            res_model="project.task"
+            src_model="project.project"
+            view_mode="kanban,tree,form,calendar,graph"
+            view_type="form"/>
 
         <!-- Project -->
         <record id="edit_project" model="ir.ui.view">
@@ -19,34 +28,46 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Project" layout="manual">
-                <div class="oe_form_topbar">
-                    <button name="set_cancel" string="Cancel" type="object" states="open,pending" icon="gtk-cancel"/>
-                    <button name="set_template" string="Set as Template" type="object" states="open" icon="gtk-convert"/>
-                    <button name="set_open" string="Re-open project" type="object" states="pending,cancelled,close" icon="gtk-ok"/>
-                    <button name="set_pending" string="Pending" type="object" states="open" icon="gtk-media-pause"/>
-                    <button name="set_done" string="Done" type="object" states="open,pending" icon="terp-dialog-close"/>
-                    <button name="reset_project" string="Reset as Project" type="object" states="template" icon="gtk-convert"/>
-                    <button string="New Project Based on Template" name="duplicate_template"  type="object" states="template" icon="gtk-new" context="{'parent_id':parent_id}"/>
-                    <div class="oe_right">
-                        <field name="state" nolabel="1" widget="statusbar" statusbar_visible="open,close" statusbar_colors='{"pending":"blue"}' select="1" readonly="1"/>
-                    </div>
-                </div>
+                <header>
+                    <button name="set_done" string="Done" type="object" states="open,pending"/>
+                    <button name="set_open" string="Re-open project" type="object" states="pending,cancelled,close"/>
+                    <button name="set_pending" string="Pending" type="object" states="open"/>
+                    <button name="set_template" string="Set as Template" type="object" states="open"/>
+                    <button string="New Project Based on Template" name="duplicate_template"  type="object" states="template" context="{'parent_id':parent_id}"/>
+                    <button name="reset_project" string="Reset as Project" type="object" states="template"/>
+                    <button name="set_cancel" string="Cancel" type="object" states="open,pending"/>
+                    <field name="state" widget="statusbar" statusbar_visible="open,close" statusbar_colors='{"pending":"blue"}' readonly="1"/>
+                </header>
                 <sheet string="Project" layout="auto">
-                    <group colspan="6" col="6">
-                        <field name="name" string="Project Name" select="1"/>
-                        <field name="analytic_account_id" invisible="1" required="0"/>
-                        <field name="parent_id" string="Parent" domain="[('id','!=',analytic_account_id)]" context="{'current_model': 'project.project'}"/>
-                        <field name="user_id" string="Project Manager" select="1" attrs="{'readonly':[('state','in',['close', 'cancelled'])]}"/>
-                        <field name="date_start" string="Start Date" attrs="{'readonly':[('state','in',['close', 'cancelled'])]}"/>
-                        <field name="date" string="End Date" attrs="{'readonly':[('state','in',['close', 'cancelled'])]}"/>
-                        <field name="progress_rate" widget="progressbar"/>
+                    <group col="4" colspan="4">
+                        <group col="2" colspan="2" class="oe_form_group_label_border">
+                            <field name="name" string="Project Name" select="1"/>
+                            <field name="partner_id" on_change="onchange_partner_id(partner_id)" select="1"/>
+                            <field name="user_id" string="Project Manager" select="1" attrs="{'readonly':[('state','in',['close', 'cancelled'])]}"/>
+                            <field name="analytic_account_id" invisible="1" required="0"/>
+                            <field name="parent_id" invisible="1" string="Parent" domain="[('id','!=',analytic_account_id)]" context="{'current_model': 'project.project'}"/>
+                            <field name="privacy_visibility"/>
+                            <!--<field name="date_start" string="Start Date" attrs="{'readonly':[('state','in',['close', 'cancelled'])]}"/>-->
+                            <!--<field name="date" string="End Date" attrs="{'readonly':[('state','in',['close', 'cancelled'])]}"/>-->
+                            <!--<field name="progress_rate" widget="progressbar"/>-->
+                        </group>
+                        <group col="2" colspan="2" class="oe_form_group_label_border">
+                            <table border="0">
+                                <tr name="use_tasks_row">
+                                    <th style="border-right:1px solid #DDD;" width="140px">Tasks Management</th>
+                                    <td><field name="use_tasks" nolabel="1"/></td>
+                                    <td style="text-align:right;" width="110px"><button icon="terp-stock_align_left_24" class="oe_btn_width" name="%(act_project_project_2_project_task_all)d" string="Tasks" type="action" attrs="{'invisible':[('use_tasks','=', 0)]}"/></td>
+                                </tr>
+                                <tr name="use_attachment_row">
+                                    <th/>
+                                    <td/>
+                                    <td style="text-align:right;" width="110px"><button icon="gtk-dnd-multiple" class="oe_btn_width" name="%(base.action_attachment)d" string="Documents" type="action" /></td>
+                                </tr>
+                            </table>
+                        </group>
                     </group>
                     <notebook colspan="4">
                         <page string="Administration">
-                            <group col="2" colspan="2" name="kanban">
-                                <separator colspan="2" string="Project Management"/>
-                                    <field name="use_tasks"/>
-                            </group>
                             <group col="2" colspan="2">
                                 <separator colspan="4" string="Performance"/>
                                 <field name="planned_hours" widget="float_time"/>
@@ -62,8 +83,8 @@
                                 <field name="active" attrs="{'invisible':[('state','in',['open', 'pending', 'template'])]}"/>
                             </group>
                         </page>
-                        <page string="Members">
-                            <field colspan="4" name="members" nolabel="1">
+                        <page name="team" string="Team" attrs="{'invisible':[('use_tasks','=', 0)]}">
+                            <field colspan="4" name="members" nolabel="1" help="Project's members are users who can have an access to the tasks related to this project.">
                                 <tree string="Members">
                                     <field name="name"/>
                                     <field name="user_email"/>
@@ -71,7 +92,7 @@
                             </field>
                         </page>
                         <page string="Billing" groups="account.group_account_invoice">
-                            <field colspan="4" name="partner_id" on_change="onchange_partner_id(partner_id)" select="1" string="Customer"/>
+                            <!--<field colspan="4" name="partner_id" on_change="onchange_partner_id(partner_id)" select="1" string="Customer"/>-->
                             <field name="warn_customer"/>
                             <field name="currency_id" select="1" groups="base.group_multi_company" required="1"/>
                             <newline/>
@@ -94,14 +115,11 @@
                         <page string="Tasks Stages">
                            <field nolabel="1" name="type_ids" colspan="4"/>
                         </page>
-                        <page string="Notes">
-                            <field colspan="4" name="description" nolabel="1"/>
-                        </page>
                     </notebook>
                     <newline/>
                 </sheet>
-                <div class="oe_form_sheet_width">
-                    <field name="message_ids_social" colspan="4" widget="ThreadView" nolabel="1"/>
+                <div class="oe_form_bottom">
+                    <field name="message_ids" colspan="4" widget="ThreadView" nolabel="1"/>
                 </div>
                 </form>
             </field>
@@ -162,7 +180,7 @@
         </record>
 
         <act_window
-            context="{'search_default_project_id': [active_id], 'default_project_id': active_id}"
+            context="{'search_default_project_id': active_id, 'default_project_id': active_id}"
             id="act_project_project_2_project_task_all"
             name="Tasks"
             res_model="project.task"
@@ -170,7 +188,6 @@
             view_mode="kanban,tree,form,calendar,graph"
             view_type="form"/>
 
-
         <record model="ir.ui.view" id="view_project_kanban">
             <field name="name">project.project.kanban</field>
             <field name="model">project.project</field>
@@ -188,61 +205,39 @@
                     <field name="task_count"/>
                     <templates>
                         <t t-name="kanban-box">
-                            <div class="project_vignettes">
-                                <li t-attf-class="#{kanban_color(record.color.raw_value)} oe_project_kanban_vignette" id="oe_project_kanban_vignette">
-                                    <a href="#" class="oe_project_kanban_action dropdown-toggle"><span class="oe_i">B</span></a>
-                                    <ul class="dropdown-menu">
-                                      <li ><a type="edit" >Edit...</a></li>
-                                      <li ><a type="delete">Delete</a></li>
-                                      <li>
-                                        <ul class="color-chooser">
-                                            <li><a t-att-id="record.id.value" class="bgcolor"><span class="oe_kanban_color_0 square"></span></a></li>
-                                            <li><a t-att-id="record.id.value" class="bgcolor"><span class="oe_kanban_color_1 square"></span></a></li>
-                                            <li><a t-att-id="record.id.value" class="bgcolor"><span class="oe_kanban_color_2 square"></span></a></li>
-                                            <li><a t-att-id="record.id.value" class="bgcolor"><span class="oe_kanban_color_3 square"></span></a></li>
-                                            <li><a t-att-id="record.id.value" class="bgcolor"><span class="oe_kanban_color_4 square"></span></a></li>
-                                            <li><a t-att-id="record.id.value" class="bgcolor"><span class="oe_kanban_color_5 square"></span></a></li>
-                                        </ul>
-                                      </li>
-                                    </ul>
-                                    <h4><t t-esc="record.name.value.substr(0,33)"/><t t-if="record.name.value.length > 33">...</t></h4>
-                                    <div id="list">
-                                        <a t-if="record.use_tasks.raw_value" class="oe_project_buttons"
-                                            id="1" name="%(act_project_project_2_project_task_all)d" type="action">
+                            <div t-attf-class="oe_kanban_color_#{kanban_getcolor(record.color.raw_value)} oe_kanban_card oe_kanban_project oe_kanban_auto_height oe_kanban_global_click">
+                                <a class="oe_kanban_menuaction oe_i">B</a>
+                                <ul class="oe_kanban_menu">
+                                    <li><a type="edit">Edit...</a></li>
+                                    <li><a type="delete">Delete</a></li>
+                                    <li><ul class="oe_kanban_colorpicker" data-field="color"/></li>
+                                </ul>
+                                <div class="oe_kanban_content">
+                                    <h3 class="oe_kanban_ellipsis"><field name="name"/></h3>
+
+                                    <div class="oe_kanban_project_list">
+                                        <a t-if="record.use_tasks.raw_value"
+                                            name="%(act_project_project_2_project_task_all)d" type="action">
                                             Tasks(<field name="task_count"/>)</a>
                                     </div>
-                                    <br/>
-                                    <button class="click_button" name="dummy" type="object">
-                                        <table class="project_fields">
-                                            <tr id="deadline" t-if="record.date.raw_value">
-                                                <th align="left">Deadline</th>
-                                                <td align="left"><field name="date"/></td>
-                                            </tr>
-                                            <tr>
-                                                <th align="left" width="70px">Progress</th>
-                                                <td align="left">
-                                                    <t t-esc="Math.round(record.effective_hours.raw_value)"/> / <t t-esc="Math.round(record.planned_hours.raw_value)"/> <field name="company_uom_id"/>
-                                                </td>
-                                            </tr>
-                                        </table>
-                                        <br/>
+
+                                    <div class="oe_kanban_project_fields oe_kanban_project_deadline" t-if="record.date.raw_value">
+                                        <div>Deadline</div>
+                                        <div><field name="date"/></div>
+                                    </div>
+
+                                    <div class="oe_kanban_project_fields oe_kanban_project_progress">
+                                        <div>Progress</div>
+                                        <div><t t-esc="Math.round(record.effective_hours.raw_value)"/> / <t t-esc="Math.round(record.planned_hours.raw_value)"/> <field name="company_uom_id"/></div>
+                                    </div>
+
+                                    <div class="oe_kanban_project_avatars">
                                         <t t-foreach="record.members.raw_value" t-as="member">
-                                            <img t-att-src="kanban_image('res.users', 'avatar', member)" t-att-id="member" class="project_avatar"/>
+                                            <img t-att-src="kanban_image('res.users', 'avatar', member)" t-att-data-member_id="member"/>
                                         </t>
-                                    </button>
-                                </li>
+                                    </div>
+                                </div>
                             </div>
-                            <script type="text/javascript">
-                                //open dropdwon when click on the icon.
-                                $('.dropdown-toggle').dropdown();
-
-                                //show and hide the dropdown icon when mouseover and mouseour.
-                                $('.oe_project_kanban_vignette').mouseover(function() {
-                                    return $(this).find('.oe_project_kanban_action').show();
-                                    }).mouseout(function() {
-                                    return $(this).find('.oe_project_kanban_action').hide();
-                                });
-                            </script>
                         </t>
                     </templates>
                 </kanban>
@@ -268,7 +263,17 @@
             <field name="view_id" ref="view_project_kanban"/>
             <field name="search_view_id" ref="view_project_project_filter"/>
             <field name="context">{}</field>
-            <field name="help">A project contains a set of tasks or issues that will be performed by your resources assigned to it. A project can be hierarchically structured, as a child of a Parent Project. This allows you to design large project structures with different phases spread over the project duration cycle. Each user can set his default project in his own preferences to automatically filter the tasks or issues he usually works on. If you choose to invoice the time spent on a project task, you can find project tasks to be invoiced in the billing section.</field>
+            <field name="help" type="xml">
+                <p>Click <i>'Create'</i> to <b>start a new project</b>.</p>
+                <p>Projects are used to organize your activities; plan tasks,
+                track issues, invoice timesheets. You can define internal
+                projects (R&amp;D, Improve Sales Process), private projects (My
+                Todos) or customer ones.</p>
+                <p>
+                    You will be able collaborate with internal users on
+                    projects or invite customers to share your activities.
+                </p>
+            </field>
         </record>
 
         <record id="open_view_template_project" model="ir.actions.act_window">
@@ -316,18 +321,27 @@
             <field eval="2" name="priority"/>
             <field name="arch" type="xml">
                 <form string="Project" layout="manual">
-                    <div class="oe_form_topbar">
-                        <button name="do_cancel" states="draft,open,pending" string="Cancel" type="object" icon="gtk-cancel" groups="base.group_no_one"/>
-                        <button name="do_draft" states="open" string="Draft" type="object" icon="gtk-indent" groups="base.group_no_one"/>
-                        <button name="do_open" states="pending,draft" string="Start Task" type="object" icon="gtk-media-play" groups="base.group_no_one"/>
-                        <button name="%(action_project_task_reevaluate)d" states="done,cancelled" string="Reactivate" type="action" icon="gtk-convert" context="{'button_reactivate':True}" />
-                        <button name="do_pending" states="open" string="Pending" type="object" icon="gtk-media-pause" groups="base.group_no_one"/>
-                        <button name="%(action_project_task_delegate)d" states="pending,open,draft" string="Delegate" type="action" icon="terp-personal"/>
-                        <button name="action_close" states="pending,open" string="Done" type="object" icon="terp-dialog-close" groups="base.group_no_one"/>
-                        <div class="oe_right">
-                            <field name="state" nolabel="1" widget="statusbar" statusbar_visible="draft,open,done" statusbar_colors='{"pending":"blue"}' select="1" groups="base.group_no_one"/>
-                        </div>
-                    </div>
+                    <header>
+                        <button name="do_open" string="Start Task" type="object"
+                                states="draft,pending"/>
+                        <button name="%(action_project_task_reevaluate)d" string="Reactivate" type="action"
+                                states="done,cancelled" context="{'button_reactivate':True}"/>
+                        <button name="do_pending" string="Pending" type="object"
+                                states="open"/>
+                        <button name="action_close" string="Done" type="object"
+                                states="draft,open,pending"/>
+                        <button name="do_draft" string="Draft" type="object"
+                                states="cancel,done"/>
+                        <button name="%(action_project_task_delegate)d" string="Delegate" type="action"
+                                states="pending,open,draft"/>
+                        <button name="do_cancel" string="Cancel" type="object"
+                                states="draft,open,pending" />
+                        <button name="stage_previous" string="Previous Stage" type="object"
+                                states="open,pending" icon="gtk-go-back" attrs="{'invisible': [('stage_id','=', False)]}"/>
+                        <button name="stage_next" string="Next Stage" type="object"
+                                states="open,pending" icon="gtk-go-forward" attrs="{'invisible': [('stage_id','=', False)]}"/>
+                        <field name="stage_id" widget="statusbar"/>
+                    </header>
                     <sheet string="Task edition" layout="auto">
                     <group colspan="6" col="6">
                         <field name="name" select="1"/>
@@ -373,7 +387,7 @@
                                 <tree string="Delegated tasks">
                                     <field name="name"/>
                                     <field name="user_id"/>
-                                    <field name="type_id"/>
+                                    <field name="stage_id"/>
                                     <field name="state" groups="base.group_no_one"/>
                                     <field name="effective_hours" widget="float_time"/>
                                     <field name="progress" widget="progressbar"/>
@@ -388,23 +402,20 @@
                                 <separator string="Planning" colspan="2"/>
                                 <field name="priority"/>
                                 <field name="sequence"/>
+                                <field name="state" groups="base.group_no_one"/>
                             </group>
 
                             <separator string="Miscellaneous" colspan="4"/>
                             <field name="partner_id" />
                             <field name="company_id" select="1" groups="base.group_multi_company" widget="selection"/>
-                            <group col="4" colspan="2" attrs="{'invisible': ['|', ('project_id','=', False), ('type_id','=', False)]}">
-                                <field name="type_id" widget="selection" readonly="1"/>
-                                <button name="prev_type" string="Previous" type="object" icon="gtk-go-back" help="Change to Previous Stage"/>
-                                <button name="next_type" string="Next" type="object" icon="gtk-go-forward" help="Change to Next Stage"/>
-                            </group>
+                            <field name="state" groups="base.group_no_one"/>
                             <separator colspan="4" string="Notes"/>
                             <field colspan="4" name="notes" nolabel="1"/>
                         </page>
                     </notebook>
                     </sheet>
-                    <div class="oe_form_sheet_width">
-                        <field name="message_ids_social" colspan="4" widget="ThreadView" nolabel="1"/>
+                    <div class="oe_form_bottom">
+                        <field name="message_ids" colspan="4" widget="ThreadView" nolabel="1"/>
                     </div>
                 </form>
             </field>
@@ -416,10 +427,10 @@
             <field name="model">project.task</field>
             <field name="type">kanban</field>
             <field name="arch" type="xml">
-                <kanban default_group_by="type_id" >
+                <kanban default_group_by="stage_id" >
                     <field name="color"/>
                     <field name="priority"/>
-                    <field name="type_id"/>
+                    <field name="stage_id"/>
                     <field name="user_id"/>
                     <field name="user_email"/>
                     <field name="description"/>
@@ -475,7 +486,7 @@
                                                         type="object" class="oe_kanban_button"><t t-esc="time[0]"/></a
                                                     ><b t-if="time[1]" class="oe_kanban_button oe_kanban_button_active"><t t-esc="Math.round(hours)"/></b
                                                 ></t>
-                                                <a name="do_open" states="draft" string="Validate planned time and open task" type="object" class="oe_kanban_button oe_kanban_button_active" groups="base.group_no_one">!</a>
+                                                <a name="do_open" states="draft" string="Validate planned time and open task" type="object" class="oe_kanban_button oe_kanban_button_active">!</a>
                                             </span>
                                         </div>
                                         <div class="oe_kanban_clear"/>
@@ -485,12 +496,12 @@
                                             <a string="Edit" icon="gtk-edit" type="edit"/>
                                             <a string="Change Color" icon="color-picker" type="color" name="color"/>
                                             <a name="%(action_project_task_delegate)d" states="pending,open,draft" string="Delegate" type="action" icon="terp-personal"/>
-                                            <a name="action_close" states="draft,pending,open" string="Done" type="object" icon="terp-dialog-close" groups="base.group_no_one"/>
+                                            <a name="action_close" states="draft,pending,open" string="Done" type="object" icon="terp-dialog-close"/>
                                         </div>
                                         <div class="oe_kanban_right">
-                                            <a name="set_kanban_state_blocked" string="Mark as Blocked" kanban_states="normal,done" type="object" icon="kanban-stop"/>
-                                            <a name="set_kanban_state_normal" string="Normal" kanban_states="blocked,done" type="object" icon="gtk-media-play"/>
-                                            <a name="set_kanban_state_done" string="Done" kanban_states="blocked,normal" type="object" icon="kanban-apply"/>
+                                            <a name="set_kanban_state_blocked" string="Mark as Blocked" attrs="{'invisible' : [('kanban_state', 'not in', ('normal', 'done'))]}" type="object" icon="kanban-stop"/>
+                                            <a name="set_kanban_state_normal" string="Normal" attrs="{'invisible' : [('kanban_state', 'not in', ('blocked', 'done'))]}" type="object" icon="gtk-media-play"/>
+                                            <a name="set_kanban_state_done" string="Done" attrs="{'invisible' : [('kanban_state', 'not in', ('blocked', 'normal'))]}" type="object" icon="kanban-apply"/>
                                         </div>
                                         <div class="oe_kanban_clear"/>
                                     </div>
@@ -520,20 +531,11 @@
                     <field name="effective_hours" widget="float_time" sum="Spent Hours" invisible="1"/>
                     <field name="remaining_hours" widget="float_time" sum="Remaining Hours" on_change="onchange_remaining(remaining_hours,planned_hours)" invisible="context.get('set_visible',False)" groups="project.group_time_work_estimation_tasks"/>
                     <field name="date_deadline" invisible="context.get('deadline_visible',True)"/>
-                    <field name="type_id" invisible="context.get('set_visible',False)"/>
-                    <button name="next_type" invisible="context.get('set_visible',False)"
-                        states="open,pending"
-                        string="Change Stage"
-                        type="object"
-                        icon="gtk-go-forward"
-                        help="Change Type" attrs="{'invisible': [('type_id','=', False)]}"/>
+                    <field name="stage_id" invisible="context.get('set_visible',False)"/>
+                    <field name="state" invisible="context.get('set_visible',False)" groups="base.group_no_one"/>
                     <field name="date_start" invisible="1" groups="base.group_no_one"/>
                     <field name="date_end" invisible="1" groups="base.group_no_one"/>
                     <field name="progress" widget="progressbar" invisible="context.get('set_visible',False)"/>
-                    <field name="state" invisible="context.get('set_visible',False)" groups="base.group_no_one"/>
-                    <button name="do_open" states="pending,draft,done,cancelled" string="Start Task" type="object" icon="gtk-media-play" help="For changing to open state" invisible="context.get('set_visible',False)" groups="base.group_no_one"/>
-                    <button name="%(action_project_task_delegate)d" states="pending,open,draft" string="Delegate" type="action" icon="terp-personal" help="For changing to delegate state"/>
-                    <button name="action_close" states="draft,pending,open" string="Done" type="object" icon="terp-dialog-close" help="For changing to done state" groups="base.group_no_one"/>
                 </tree>
             </field>
         </record>
@@ -582,7 +584,6 @@
             <field name="arch" type="xml">
                <search string="Tasks">
                     <group>
-                        <filter icon="terp-check" name="inbox" string="Inbox" domain="[('message_state','=','unread')]"/>
                         <filter name="draft" string="New" domain="[('state','=','draft')]" help="New Tasks" icon="terp-check"/>
                         <filter name="open" string="In Progress" domain="[('state','=','open')]" help="In Progress Tasks" icon="terp-camera_test"/>
                         <filter string="Pending" domain="[('state','=','pending')]" context="{'show_delegated':False}" help="Pending Tasks" icon="terp-gtk-media-pause"/>
@@ -590,12 +591,12 @@
                         <filter string="Deadlines" context="{'deadline_visible': False}" domain="[('date_deadline','&lt;&gt;',False)]" help="Show only tasks having a deadline" icon="terp-gnome-cpu-frequency-applet+"/>
                         <separator orientation="vertical"/>
                         <field name="name"/>
-                        <field name="project_id" context="{'project_id':self}">
-                             <filter domain="[('project_id.user_id','=',uid)]" help="My Projects" icon="terp-personal"/>
-                        </field>
+                        <field name="project_id" invisible="1"/>
+                        <filter name="project" string="Project" domain="[('project_id.user_id','=',uid)]" help="My Projects" icon="terp-check"/>
+                        <field name="project_id"/>
                         <field name="user_id">
-                            <filter domain="[('user_id','=',uid)]"  help="My Tasks" icon="terp-personal" />
-                            <filter domain="[('user_id','=',False)]"  help="Unassigned Tasks" icon="terp-personal-" />
+                            <filter string="My Tasks" domain="[('user_id','=',uid)]"  help="My Tasks" icon="terp-personal" />
+                            <filter string="Unassigned Tasks" domain="[('user_id','=',False)]"  help="Unassigned Tasks" icon="terp-personal-" />
                         </field>
                     </group>
                     <newline/>
@@ -604,8 +605,8 @@
                         <separator orientation="vertical"/>
                         <filter string="Project" name="group_project_id" icon="terp-folder-violet" domain="[]" context="{'group_by':'project_id'}"/>
                         <separator orientation="vertical"/>
-                        <filter string="Stage" name="group_stage_id" icon="terp-stage" domain="[]" context="{'group_by':'type_id'}"/>
-                        <filter string="State" name="group_state" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}" groups="base.group_no_one"/>
+                        <filter string="Stage" name="group_stage_id" icon="terp-stage" domain="[]" context="{'group_by':'stage_id'}"/>
+                        <filter string="Status" name="group_state" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
                         <separator orientation="vertical"/>
                         <filter string="Deadline" icon="terp-gnome-cpu-frequency-applet+" domain="[]" context="{'group_by':'date_deadline'}"/>
                         <separator orientation="vertical" groups="base.group_no_one"/>
@@ -615,6 +616,22 @@
                 </search>
             </field>
         </record>
+        
+        <record id="analytic_account_inherited_form" model="ir.ui.view">
+            <field name="name">account.analytic.account.form.inherit</field>
+            <field name="model">account.analytic.account</field>
+            <field name="type">form</field>
+            <field name="inherit_id" ref="analytic.view_account_analytic_account_form"/>
+            <field eval="18" name="priority"/>
+            <field name="arch" type="xml">
+                <xpath expr='//separator[@name="project_sep"]' position='replace'>
+                    <separator colspan="2" string="Project" name="project_sep"/>
+                </xpath>
+            	<xpath expr='//group[@name="project"]' position='inside'>
+                    <field name="use_tasks" />
+                </xpath>
+            </field>
+        </record>
 
         <record id="action_view_task" model="ir.actions.act_window">
             <field name="name">Tasks</field>
@@ -623,9 +640,9 @@
             <field name="view_mode">kanban,tree,form,calendar,gantt,graph</field>
             <field eval="False" name="filter"/>
             <field name="view_id" eval="False"/>
-            <field name="context">{"search_default_project_id": project_id, 'search_default_inbox': 1}</field>
+            <field name="context">{}</field>
             <field name="search_view_id" ref="view_task_search_form"/>
-            <field name="help">A task represents a work that has to be done. Each user works in his own list of tasks where he can record his task work in hours. He can work and close the task itself or delegate it to another user. If you delegate a task to another user, you get a new task in pending state, which will be reopened when you have to review the work achieved. If you install the project_timesheet module, task work can be invoiced based on the project configuration. With the project_mrp module, sales orders can create tasks automatically when they are confirmed.</field>
+            <field name="help">Tasks allow you to organize your work into a project. Click on button "Create" to create a new task.</field>
         </record>
         <record id="open_view_task_list_kanban" model="ir.actions.act_window.view">
             <field name="sequence" eval="0"/>
@@ -675,7 +692,7 @@
             <field name="arch" type="xml">
                 <search string="Tasks Stages">
                    <group>
-                       <filter icon="terp-check" string="Common" name="common" domain="[('project_default', '=', 1)]" help="Stages common to all projects"/>
+                       <filter icon="terp-check" string="Common" name="common" domain="[('case_default', '=', 1)]" help="Stages common to all projects"/>
                        <separator orientation="vertical"/>
                        <field name="name"/>
                    </group>
@@ -689,11 +706,14 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Task Stage">
-                    <group colspan="4" col="6">
-                    <field name="name"/>
-                    <field name="project_default"/>
-                    <field name="sequence"/>
-                    <field name="state"/>
+                    <group colspan="2" col="2">
+                        <field name="name"/>
+                        <field name="state"/>
+                    </group>
+                    <group colspan="2" col="4">
+                        <field name="case_default"/>
+                        <field name="sequence"/>
+                        <field name="fold"/>
                     </group>
                     <separator string="Description" colspan="4"/>
                     <field colspan="4" name="description" nolabel="1"/>
@@ -724,12 +744,12 @@
 
         <menuitem id="menu_tasks_config" name="GTD" parent="project.menu_definitions" sequence="1"/>
 
-        <menuitem id="menu_project_config_project" name="Stages" parent="menu_definitions" sequence="1"/>
+        <menuitem id="menu_project_config_project" name="Stages" parent="project.menu_definitions" sequence="1"/>
 
-        <menuitem action="open_task_type_form" id="menu_task_types_view" parent="menu_project_config_project" sequence="2"/>
-        <menuitem action="open_view_project_all" id="menu_projects" name="Projects" parent="menu_project_management" sequence="1" groups="base.group_no_one"/>
+        <menuitem action="open_task_type_form" name="Task Stages" id="menu_task_types_view" parent="menu_project_config_project" sequence="2"/>
+        <menuitem action="open_view_project_all" id="menu_projects" name="Projects" parent="menu_project_management" sequence="1"/>
 
-        <act_window context="{'search_default_user_id': [active_id], 'default_user_id': active_id}" id="act_res_users_2_project_project" name="User's projects" res_model="project.project" src_model="res.users" view_mode="tree,form" view_type="form"/>
+        <act_window context="{'search_default_user_id': active_id, 'default_user_id': active_id}" id="act_res_users_2_project_project" name="User's projects" res_model="project.project" src_model="res.users" view_mode="tree,form" view_type="form"/>
 
          <record id="task_company" model="ir.ui.view">
             <field name="name">res.company.task.config</field>
@@ -746,31 +766,6 @@
         </record>
 
       <!--     User Form-->
-      <record id="view_project_users_form_simple" model="ir.ui.view">
-          <field name="name">res.users.project.form1</field>
-          <field name="model">res.users</field>
-          <field name="type">form</field>
-          <field name="inherit_id" ref="base.view_users_form"/>
-          <field eval="18" name="priority"/>
-          <field name="arch" type="xml">
-              <group name="default_filters" position="inside">
-                   <field name="context_project_id"/>
-              </group>
-          </field>
-     </record>
-
-     <record model="ir.ui.view" id="view_users_form_project_modif_inherited1">
-         <field name="name">view.users.form.project.modif.inherited1</field>
-         <field name="model">res.users</field>
-         <field name="inherit_id" ref="base.view_users_form_simple_modif" />
-         <field name="type">form</field>
-         <field eval="18" name="priority"/>
-         <field name="arch" type="xml">
-            <group name="default_filters" position="inside">
-                <field name="context_project_id" context="{'user_preference':True}" widget="selection" readonly="0"/>
-            </group>
-       </field>
-    </record>
-    <act_window context="{'search_default_user_id': [active_id], 'default_user_id': active_id}" domain="[('state', '&lt;&gt;', 'cancelled'),('state', '&lt;&gt;', 'done')]" id="act_res_users_2_project_task_opened" name="Assigned Tasks" res_model="project.task" src_model="res.users" view_mode="tree,form,gantt,calendar,graph" view_type="form"/>
+        <act_window context="{'search_default_user_id': [active_id], 'default_user_id': active_id}" domain="[('state', '&lt;&gt;', 'cancelled'),('state', '&lt;&gt;', 'done')]" id="act_res_users_2_project_task_opened" name="Assigned Tasks" res_model="project.task" src_model="res.users" view_mode="tree,form,gantt,calendar,graph" view_type="form"/>
     </data>
 </openerp>