[MERGE] trunk

bzr revid: sle@openerp.com-20140429170245-y02h8z7elx7pu5km

3 files changed, 0 insertions, 199 deletions

diff --git a/addons/project/__openerp__.py b/addons/project/__openerp__.py
index f5ba24c41cb..a503613e90b 100644
--- a/addons/project/__openerp__.py
+++ b/addons/project/__openerp__.py
@@ -29,7 +29,6 @@
     'summary': 'Projects, Tasks',
     'images': [
         'images/gantt.png',
-        'images/project_dashboard.jpeg',
         'images/project_task_tree.jpeg',
         'images/project_task.jpeg',
         'images/project.jpeg',
@@ -68,11 +67,9 @@ Dashboard / Reports for Project Management will include:
         'security/ir.model.access.csv',
         'project_data.xml',
         'project_view.xml',
-        'process/task_process.xml',
         'res_partner_view.xml',
         'report/project_report_view.xml',
         'report/project_cumulative.xml',
-        'board_project_view.xml',
         'res_config_view.xml',
     ],
     'demo': ['project_demo.xml'],
diff --git a/addons/project/board_project_view.xml b/addons/project/board_project_view.xml
deleted file mode 100644
index 3a14f7b6274..00000000000
--- a/addons/project/board_project_view.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-    <data>
-
-        <record id="view_task_tree" model="ir.ui.view">
-            <field name="name">project.task.tree</field>
-            <field name="model">project.task</field>
-            <field eval="99" name="priority"/>
-            <field name="arch" type="xml">
-                <tree colors="red:date_deadline&lt;current_date;blue:date_deadline==current_date;black:date_deadline&gt;current_date" string="My Tasks">
-                    <field name="name"/>
-                    <field name="project_id"/>
-                    <field name="date_deadline"/>
-                    <field name="priority"/>
-                    <field name="planned_hours" widget="float_time"/>
-                    <field name="effective_hours" widget="float_time"/>
-                    <field name="progress" widget="progressbar"/>
-                    <field name="stage_id" invisible="context.get('set_visible',False)"/>
-                </tree>
-            </field>
-        </record>
-
-        <record id="my_open_tasks_action" model="ir.actions.act_window">
-            <field name="name">My Tasks</field>
-            <field name="res_model">project.task</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">tree,form</field>
-            <field name="domain">[('user_id', '=', uid), ('stage_id.fold', '!=', True)]</field>
-            <field name="view_id" ref="view_task_tree"/>
-        </record>
-
-        <record id="board_project_form" model="ir.ui.view">
-            <field name="name">board.project.form</field>
-            <field name="model">board.board</field>
-            <field name="arch" type="xml">
-                <form string="My Board" version="7.0">
-                    <board style="2-1">
-                        <column>
-                            <action name="%(my_open_tasks_action)d" string="My Tasks"/>
-                        </column>
-                        <column>
-                            <action name="%(action_view_task_history_cumulative)d" string="Open Tasks"/>
-                        </column>
-                    </board>
-                </form>
-            </field>
-        </record>
-
-        <record id="open_board_project" model="ir.actions.act_window">
-            <field name="name">Project</field>
-            <field name="res_model">board.board</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">form</field>
-            <field name="usage">menu</field>
-            <field name="view_id" ref="board_project_form"/>
-        </record>
-
-        <menuitem id="menu_project_dashboard"
-                  sequence="35"
-                  parent="base.menu_reporting_dashboard"
-                  action="open_board_project"/>
-
-    </data>
-</openerp>
diff --git a/addons/project/process/task_process.xml b/addons/project/process/task_process.xml
deleted file mode 100644
index 9955fe1ffe1..00000000000
--- a/addons/project/process/task_process.xml
+++ /dev/null
@@ -1,132 +0,0 @@
-<?xml version="1.0" ?>
-<openerp>
-    <data>
-
-    <!--
-        Process
-    -->
-
-        <record id="process_process_tasksprocess0" model="process.process">
-            <field eval="1" name="active"/>
-            <field name="model_id" ref="project.model_project_task"/>
-            <field eval="&quot;&quot;&quot;Tasks&quot;&quot;&quot;" name="name"/>
-        </record>
-
-    <!--
-        Process Node
-    -->
-
-        <record id="process_node_taskbydelegate0" model="process.node">
-            <field name="menu_id" ref="project.menu_action_view_task"/>
-            <field name="model_id" ref="project.model_project_task"/>
-            <field eval="&quot;&quot;&quot;state&quot;&quot;&quot;" name="kind"/>
-            <field eval="&quot;&quot;&quot;Task by delegate&quot;&quot;&quot;" name="name"/>
-            <field eval="&quot;&quot;&quot;Delegate your task to the other user&quot;&quot;&quot;" name="note"/>
-            <field name="process_id" ref="process_process_tasksprocess0"/>
-            <field eval="&quot;&quot;&quot;object.state in ('open', 'pending')&quot;&quot;&quot;" name="model_states"/>
-            <field eval="1" name="flow_start"/>
-        </record>
-
-        <record id="process_node_drafttask0" model="process.node">
-            <field name="menu_id" ref="project.menu_action_view_task"/>
-            <field name="model_id" ref="project.model_project_task"/>
-            <field eval="&quot;&quot;&quot;state&quot;&quot;&quot;" name="kind"/>
-            <field eval="&quot;&quot;&quot;Draft task&quot;&quot;&quot;" name="name"/>
-            <field eval="&quot;&quot;&quot;Define the Requirements and Set Planned Hours.&quot;&quot;&quot;" name="note"/>
-            <field name="process_id" ref="process_process_tasksprocess0"/>
-            <field eval="&quot;&quot;&quot;object.state=='draft'&quot;&quot;&quot;" name="model_states"/>
-            <field eval="0" name="flow_start"/>
-        </record>
-
-        <record id="process_node_opentask0" model="process.node">
-            <field name="menu_id" ref="project.menu_action_view_task"/>
-            <field name="model_id" ref="project.model_project_task"/>
-            <field eval="&quot;&quot;&quot;state&quot;&quot;&quot;" name="kind"/>
-            <field eval="&quot;&quot;&quot;Open task&quot;&quot;&quot;" name="name"/>
-            <field eval="&quot;&quot;&quot;Encode your working hours.&quot;&quot;&quot;" name="note"/>
-            <field name="process_id" ref="process_process_tasksprocess0"/>
-            <field eval="&quot;&quot;&quot;object.state=='open'&quot;&quot;&quot;" name="model_states"/>
-            <field eval="0" name="flow_start"/>
-        </record>
-
-        <record id="process_node_donetask0" model="process.node">
-            <field name="menu_id" ref="project.menu_action_view_task"/>
-            <field name="model_id" ref="project.model_project_task"/>
-            <field eval="&quot;&quot;&quot;state&quot;&quot;&quot;" name="kind"/>
-            <field eval="&quot;&quot;&quot;Done task&quot;&quot;&quot;" name="name"/>
-            <field eval="&quot;&quot;&quot;Task is Completed&quot;&quot;&quot;" name="note"/>
-            <field name="process_id" ref="process_process_tasksprocess0"/>
-            <field eval="&quot;&quot;&quot;object.state=='done'&quot;&quot;&quot;" name="model_states"/>
-            <field eval="0" name="flow_start"/>
-        </record>
-
-    <!--
-        Process Transition
-    -->
-
-        <record id="process_transition_delegate0" model="process.transition">
-            <field eval="[(6,0,[])]" name="transition_ids"/>
-            <field eval="&quot;&quot;&quot;Delegate&quot;&quot;&quot;" name="name"/>
-            <field eval="&quot;&quot;&quot;Delegates tasks to the other user&quot;&quot;&quot;" name="note"/>
-            <field name="target_node_id" ref="process_node_drafttask0"/>
-            <field name="source_node_id" ref="process_node_taskbydelegate0"/>
-        </record>
-
-        <record id="process_transition_draftopentask0" model="process.transition">
-            <field eval="[(6,0,[])]" name="transition_ids"/>
-            <field eval="&quot;&quot;&quot;Draft Open task&quot;&quot;&quot;" name="name"/>
-            <field eval="&quot;&quot;&quot;From draft state, it will come into the open state.&quot;&quot;&quot;" name="note"/>
-            <field name="target_node_id" ref="process_node_opentask0"/>
-            <field name="source_node_id" ref="process_node_drafttask0"/>
-        </record>
-
-        <record id="process_transition_opendonetask0" model="process.transition">
-            <field eval="[(6,0,[])]" name="transition_ids"/>
-            <field eval="&quot;&quot;&quot;Open Done Task&quot;&quot;&quot;" name="name"/>
-            <field eval="&quot;&quot;&quot;When task is completed, it will come into the done state.&quot;&quot;&quot;" name="note"/>
-            <field name="target_node_id" ref="process_node_donetask0"/>
-            <field name="source_node_id" ref="process_node_opentask0"/>
-        </record>
-
-
-        <!--
-            Process Action
-        -->
-
-        <record id="process_transition_action_draftopentask0" model="process.transition.action">
-            <field eval="&quot;&quot;&quot;do_open&quot;&quot;&quot;" name="action"/>
-            <field eval="&quot;&quot;&quot;object&quot;&quot;&quot;" name="state"/>
-            <field eval="&quot;&quot;&quot;Open&quot;&quot;&quot;" name="name"/>
-            <field name="transition_id" ref="process_transition_draftopentask0"/>
-        </record>
-
-        <record id="process_transition_action_draftcanceltask0" model="process.transition.action">
-            <field eval="&quot;&quot;&quot;do_cancel&quot;&quot;&quot;" name="action"/>
-            <field eval="&quot;&quot;&quot;object&quot;&quot;&quot;" name="state"/>
-            <field eval="&quot;&quot;&quot;Cancel&quot;&quot;&quot;" name="name"/>
-            <field name="transition_id" ref="process_transition_draftopentask0"/>
-        </record>
-
-        <record id="process_transition_action_openpendingtask0" model="process.transition.action">
-            <field eval="&quot;&quot;&quot;do_pending&quot;&quot;&quot;" name="action"/>
-            <field eval="&quot;&quot;&quot;object&quot;&quot;&quot;" name="state"/>
-            <field eval="&quot;&quot;&quot;Set pending&quot;&quot;&quot;" name="name"/>
-            <field name="transition_id" ref="process_transition_opendonetask0"/>
-        </record>
-
-        <record id="process_transition_action_opendrafttask0" model="process.transition.action">
-            <field eval="&quot;&quot;&quot;do_draft&quot;&quot;&quot;" name="action"/>
-            <field eval="&quot;&quot;&quot;object&quot;&quot;&quot;" name="state"/>
-            <field eval="&quot;&quot;&quot;Draft&quot;&quot;&quot;" name="name"/>
-            <field name="transition_id" ref="process_transition_opendonetask0"/>
-        </record>
-
-        <record id="process_transition_action_opencanceltask0" model="process.transition.action">
-            <field eval="&quot;&quot;&quot;do_cancel&quot;&quot;&quot;" name="action"/>
-            <field eval="&quot;&quot;&quot;object&quot;&quot;&quot;" name="state"/>
-            <field eval="&quot;&quot;&quot;Cancel&quot;&quot;&quot;" name="name"/>
-            <field name="transition_id" ref="process_transition_opendonetask0"/>
-        </record>
-
-    </data>
-</openerp>