[MERGE] Mearge with main addons

bzr revid: psi@tinyerp.com-20120622055230-trqmxu7r1qtxa0ut

2 files changed, 8 insertions, 112 deletions

diff --git a/addons/project_issue/board_project_issue_view.xml b/addons/project_issue/board_project_issue_view.xml
index 495a1efe3c1..cedcd85d4fc 100644
--- a/addons/project_issue/board_project_issue_view.xml
+++ b/addons/project_issue/board_project_issue_view.xml
@@ -2,89 +2,7 @@
 <openerp>
     <data>
 
-        <record id="action_view_current_project_issue_tree" model="ir.actions.act_window">
-            <field name="name">Project issues</field>
-            <field name="res_model">project.issue</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">tree,form</field>
-            <field name="domain">[('state','in',['draft','open'])]</field>
-           <field name="view_id" ref="project_issue.project_issue_tree_view"/>
-        </record>
-
-        <record id="action_view_pending_project_issue_tree" model="ir.actions.act_window">
-            <field name="name">Project issues</field>
-            <field name="res_model">project.issue</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">tree,form</field>
-            <field name="domain">[('state','=','pending')]</field>
-           <field name="view_id" ref="project_issue.project_issue_tree_view"/>
-        </record>
-
-        <record id="action_project_issue_graph_state" model="ir.actions.act_window">
-            <field name="name">Project Issue</field>
-            <field name="res_model">project.issue.report</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">graph</field>
-            <field name="domain">[]</field>
-            <field name="view_id" ref="project_issue.view_project_issue_report_graph"/>
-        </record>
-
-        <record id="view_project_issue_graph_stage" model="ir.ui.view">
-            <field name="name">project.issue.report.graph</field>
-            <field name="model">project.issue.report</field>
-            <field name="type">graph</field>
-            <field name="arch" type="xml">
-                <graph orientation="vertical" string="Project Issue" type="bar">
-                    <field name="stage_id"/>
-                    <field name="nbr" operator="+"/>
-                    <field group="True" name="user_id"/>
-                </graph>
-            </field>
-        </record>
-
-        <record id="action_project_issue_graph_stage" model="ir.actions.act_window">
-            <field name="name">Project Issue</field>
-            <field name="res_model">project.issue.report</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">graph</field>
-            <field name="domain">[]</field>
-            <field name="view_id" ref="view_project_issue_graph_stage"/>
-        </record>
-
-        <record id="board_project_issue_form" model="ir.ui.view">
-            <field name="name">board.project.issue.form</field>
-            <field name="model">board.board</field>
-            <field name="type">form</field>
-            <field name="arch" type="xml">
-                <form string="Issues Dashboard" version="7.0">
-                    <board style="2-1">
-                        <column>
-                            <action name="%(action_view_current_project_issue_tree)d" string="Current Issues"/>
-                            <action name="%(action_view_pending_project_issue_tree)d" string="Pending Issues"/>
-                        </column>
-                        <column>
-                            <action name="%(action_project_issue_graph_state)d" string="Issues By State" />
-                            <action name="%(action_project_issue_graph_stage)d" string="Issues By Stage" />
-                        </column>
-                    </board>
-                </form>
-            </field>
-        </record>
-
-        <record id="open_board_project_issue" model="ir.actions.act_window">
-            <field name="name">Project Issue Dashboard</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_issue_form"/>
-        </record>
-        <menuitem id="menu_dashboard_project_issue" name="Project Issue Dashboard" parent="project.menu_project_dashboard"
-             icon="terp-graph"
-            action="open_board_project_issue"/>
-
-    <!-- For Project Dashboard -->
-            <record model="ir.ui.view" id="project_issue_board_tree_view">
+        <record model="ir.ui.view" id="project_issue_board_tree_view">
             <field name="name">Project Issue Board Tree</field>
             <field name="model">project.issue</field>
             <field name="type">tree</field>
@@ -105,6 +23,7 @@
                 </tree>
             </field>
         </record>
+
         <record id="action_view_my_project_issue_tree" model="ir.actions.act_window">
             <field name="name">My Project Issues</field>
             <field name="res_model">project.issue</field>
@@ -113,40 +32,17 @@
             <field name="domain">[('state','not in',('cancel','done')),('user_id','=',uid)]</field>
            <field name="view_id" ref="project_issue_board_tree_view"/>
         </record>
-         <record id="view_my_open_project_issue_graph" model="ir.ui.view">
-            <field name="name">my.open.project.issue.graph</field>
-            <field name="model">project.issue.report</field>
-            <field name="type">graph</field>
-            <field name="arch" type="xml">
-                <graph orientation="vertical" string="My Open Project Issue" type="bar">
-                    <field name="creation_date"/>
-                    <field name="nbr" operator="+"/>
-                </graph>
-            </field>
-        </record>
-        <record id="action_view_my_open_project_issue_tree" model="ir.actions.act_window">
-            <field name="name">My Open Project issues</field>
-            <field name="res_model">project.issue.report</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">graph,tree,form,</field>
-            <field name="domain">[('state','=','open'),('user_id','=',uid)]</field>
-            <field name="context">{'default_user_id': uid}</field>
-           <field name="view_id" ref="view_my_open_project_issue_graph"/>
-        </record>
-       <record id="board_my_project_issue_form" model="ir.ui.view">
+
+        <record id="board_my_project_issue_form" model="ir.ui.view">
             <field name="name">board.my.project.issue.form.inherit</field>
             <field name="model">board.board</field>
             <field name="type">form</field>
             <field name="inherit_id" ref="project.board_project_form"/>
             <field name="arch" type="xml">
-                <xpath expr="/form/board/column/action[@string='My Delegated Tasks']" position="after">
-                        <action name="%(action_view_my_project_issue_tree)d" string="My Issues" creatable="true"/>
-                </xpath>
-                <xpath expr="/form/board/column/action[@string='My Remaining Hours by Project']" position="after">
-                        <action name="%(action_view_my_open_project_issue_tree)d" string="My Open Issues by Creation Date"/>
+                <xpath expr="/form/board/column/action[@string='My Tasks']" position="after">
+                    <action name="%(action_view_my_project_issue_tree)d" string="My Issues"/>
                 </xpath>
             </field>
         </record>
-
     </data>
 </openerp>
diff --git a/addons/project_issue/project_issue_view.xml b/addons/project_issue/project_issue_view.xml
index d553fcbf129..c28f316d170 100644
--- a/addons/project_issue/project_issue_view.xml
+++ b/addons/project_issue/project_issue_view.xml
@@ -75,9 +75,9 @@
                     <field name="stage_id" widget="statusbar"/>
                 </header>
                 <sheet string="Issue">
-                    <label for="name" class="oe_form_readonly_hidden"/>
+                    <label for="name" class="oe_edit_only"/>
                     <h1><field name="name"/></h1>
-                    <label for="project_id" class="oe_form_readonly_hidden"/>
+                    <label for="project_id" class="oe_edit_only"/>
                     <h2><field name="project_id" required="True" on_change="on_change_project(project_id)"/></h2>
                     <group>
                         <group>