merge from trunk

bzr revid: rco@openerp.com-20111212095237-x8wdo5m6v1z3yivy

5 files changed, 22 insertions, 41 deletions

diff --git a/addons/project_issue/__openerp__.py b/addons/project_issue/__openerp__.py
index e77499df3d0..215e4971bf2 100644
--- a/addons/project_issue/__openerp__.py
+++ b/addons/project_issue/__openerp__.py
@@ -59,6 +59,7 @@ and decide on their status as they evolve.
     ],
     'installable': True,
     'active': False,
+    'application': True,
     'certificate' : '001236490750848623845',
 }
 
diff --git a/addons/project_issue/board_project_issue_view.xml b/addons/project_issue/board_project_issue_view.xml
index 216f01eba9f..4553276057f 100644
--- a/addons/project_issue/board_project_issue_view.xml
+++ b/addons/project_issue/board_project_issue_view.xml
@@ -56,14 +56,14 @@
             <field name="model">board.board</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="My Board">
-                    <board style="1-1">
+                <form string="Issues Dashboard">
+                    <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_state)d" string="Issues By State" />
                             <action name="%(action_project_issue_graph_stage)d" string="Issues By Stage" />
                         </column>
                     </board>
@@ -80,7 +80,7 @@
             <field name="view_id" ref="board_project_issue_form"/>
         </record>
         <menuitem id="menu_deshboard_project_issue" name="Project Issue Dashboard" parent="project.next_id_86"
-         	icon="terp-graph"
+             icon="terp-graph"
             action="open_board_project_issue"/>
 
     <!-- For Project Dashboard -->
@@ -147,12 +147,12 @@
             <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"/>
-            	</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>
+                <xpath expr="/form/board/column/action[@string='My Delegated Tasks']" position="after">
+                        <action name="%(action_view_my_project_issue_tree)d" string="My Issues"/>
+                </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>
             </field>
         </record>
 
diff --git a/addons/project_issue/project_issue.py b/addons/project_issue/project_issue.py
index b83efbc4996..22cc02b8645 100644
--- a/addons/project_issue/project_issue.py
+++ b/addons/project_issue/project_issue.py
@@ -312,7 +312,7 @@ class project_issue(crm.crm_case, osv.osv):
                 'name': bug.name,
                 'partner_id': bug.partner_id.id,
                 'description':bug.description,
-                'date': bug.date,
+                'date_deadline': bug.date,
                 'project_id': bug.project_id.id,
                 'priority': bug.priority,
                 'user_id': bug.user_id.id,
diff --git a/addons/project_issue/project_issue_menu.xml b/addons/project_issue/project_issue_menu.xml
index 5830fcb37fb..9d88418720b 100644
--- a/addons/project_issue/project_issue_menu.xml
+++ b/addons/project_issue/project_issue_menu.xml
@@ -8,13 +8,19 @@
         <field name="name">Issues</field>
         <field name="res_model">project.issue</field>
         <field name="view_type">form</field>
-        <field name="view_mode">tree,calendar,kanban</field>
-        <field name="view_id" ref="project_issue_tree_view"/>
+        <field name="view_mode">kanban,tree,calendar</field>
+        <field name="view_id" eval="False"/>
         <field name="domain" eval=""/>
         <field name="context">{"search_default_user_id": uid, "search_default_draft": 1,"search_default_todo": 1, "search_default_project_id":project_id}</field>
         <field name="search_view_id" ref="view_project_issue_filter"/>
         <field name="help">Issues such as system bugs, customer complaints, and material breakdowns are collected here. You can define the stages assigned when solving the project issue (analysis, development, done). With the mailgateway module, issues can be integrated through an email address (example: support@mycompany.com)</field>
-    	
+    </record>
+
+    <record model="ir.actions.act_window.view" id="action_crm_tag_kanban_view0">
+        <field name="sequence" eval="0"/>
+        <field name="view_mode">kanban</field>
+        <field name="view_id" ref="project_issue_kanban_view"/>
+        <field name="act_window_id" ref="project_issue_categ_act0"/>
     </record>
 
     <record model="ir.actions.act_window.view" id="action_crm_tag_tree_view0">
diff --git a/addons/project_issue/project_issue_view.xml b/addons/project_issue/project_issue_view.xml
index 2d61a599405..d50501279fd 100644
--- a/addons/project_issue/project_issue_view.xml
+++ b/addons/project_issue/project_issue_view.xml
@@ -96,7 +96,7 @@
                             <group colspan="4">
                             <field colspan="4" name="email_cc" string="Global CC" widget="url"/>
                             </group>
-                            <field name="message_ids" colspan="4" nolabel="1" mode="tree,form" readonly="1">
+                            <field name="message_ids" colspan="4" nolabel="1" mode="tree" readonly="1">
                                 <tree string="History">
                                     <field name="display_text" string="History Information"/>
                                     <field name="email_from" invisible="1"/>
@@ -106,32 +106,6 @@
                                         context="{'mail.compose.message.mode':'reply', 'message_id':active_id}"
                                         icon="terp-mail-replied" type="action" />
                                 </tree>
-                                <form string="History">
-                                    <group col="4" colspan="4">
-                                        <field name="email_from"/>
-                                        <field name="date"/>
-                                        <field name="email_to" widget="char" size="512"/>
-                                        <field name="email_cc" widget="char" size="512"/>
-                                        <field name="subject" colspan="4" widget="char" size="512"/>
-                                    </group>
-                                    <notebook colspan="4">
-                                        <page string="Details">
-                                            <group attrs="{'invisible': [('email_from', '=', False)]}">
-                                                <field name="body_text" colspan="4" nolabel="1" height="250"/>
-                                                <button colspan="4" string="Reply"
-                                                    name="%(mail.action_email_compose_message_wizard)d"
-                                                    context="{'mail.compose.message.mode':'reply', 'message_id':active_id}"
-                                                    icon="terp-mail-replied" type="action"/>
-                                            </group>
-                                            <group attrs="{'invisible': [('email_from', '!=', False)]}">
-                                                <field name="display_text" colspan="4" nolabel="1"  height="250"/>
-                                            </group>
-                                        </page>
-                                        <page string="Attachments">
-                                            <field name="attachment_ids" colspan="4" readonly="1" nolabel="1"/>
-                                        </page>
-                                    </notebook>
-                                </form>
                             </field>
                            <separator colspan="4"/>
                             <button string="Add Internal Note"