[MERGE] merge with trunk addons

bzr revid: mra@mra-laptop-20100626070939-6whcffnrj4x8ndsi

5 files changed, 271 insertions, 303 deletions

diff --git a/addons/project_issue/__openerp__.py b/addons/project_issue/__openerp__.py
index 7339399cc08..97f9e96afa0 100644
--- a/addons/project_issue/__openerp__.py
+++ b/addons/project_issue/__openerp__.py
@@ -34,7 +34,7 @@
         'crm',
         'project',
         'hr_timesheet_sheet',
-        'project_long_term',
+        'resource'
     ],
     'init_xml': [
         'project_issue_data.xml'
diff --git a/addons/project_issue/project_issue.py b/addons/project_issue/project_issue.py
index 3523485f542..b9d7baed6dd 100644
--- a/addons/project_issue/project_issue.py
+++ b/addons/project_issue/project_issue.py
@@ -183,6 +183,8 @@ class project_issue(osv.osv, crm.crm_case):
                                 method=True, multi='working_days_close', type="float", store=True),
         'message_ids': fields.one2many('mailgate.message', 'res_id', 'Messages', domain=[('history', '=', True),('model','=',_name)]),
         'log_ids': fields.one2many('mailgate.message', 'res_id', 'Logs', domain=[('history', '=', False),('model','=',_name)]),
+        'date_action_last': fields.datetime('Last Action', readonly=1),
+        'date_action_next': fields.datetime('Next Action', readonly=1),
     }
 
     def _get_project(self, cr, uid, context):
@@ -332,7 +334,7 @@ class project_issue(osv.osv, crm.crm_case):
         if res:
             vals.update(res)
         res = self.create(cr, uid, vals, context)
-        
+        self.convert_to_bug(cr, uid, [res], context=context)
         
         attachents = msg.get('attachments', [])
         for attactment in attachents or []:
@@ -383,36 +385,6 @@ class project_issue(osv.osv, crm.crm_case):
         res = self.write(cr, uid, ids, vals)
         return res
 
-    def emails_get(self, cr, uid, ids, context=None):
-
-        """ 
-        Get Emails
-        @param self: The object pointer
-        @param cr: the current row, from the database cursor,
-        @param uid: the current user’s ID for security checks,
-        @param ids: List of email’s IDs
-        @param context: A standard dictionary for contextual values
-        """
-        res = {}
-
-        if isinstance(ids, (str, int, long)):
-            select = [long(ids)]
-        else:
-            select = ids
-
-        for thread in self.browse(cr, uid, select, context=context):
-            values = collections.defaultdict(set)
-
-            for message in thread.message_ids:
-                user_email = (message.user_id and message.user_id.address_id and message.user_id.address_id.email) or False
-                values['user_email'].add(user_email)
-                values['email_from'].add(message.email_from)
-                values['email_cc'].add(message.email_cc or False)
-            values['priority'] = thread.priority
-
-            res[thread.id] = dict((key,list(values[key])) for key, value in values.iteritems())
-
-        return res
 
     def msg_send(self, cr, uid, id, *args, **argv):
 
@@ -428,3 +400,11 @@ class project_issue(osv.osv, crm.crm_case):
 
 project_issue()
 
+class project(osv.osv):
+    _inherit = "project.project"
+    _columns = {
+        'resource_calendar_id': fields.many2one('resource.calendar', 'Working Time', help="Timetable working hours to adjust the gantt diagram report"),
+    }
+project()
+
+
diff --git a/addons/project_issue/project_issue_demo.xml b/addons/project_issue/project_issue_demo.xml
index ed031672360..aee12ccf01e 100644
--- a/addons/project_issue/project_issue_demo.xml
+++ b/addons/project_issue/project_issue_demo.xml
@@ -1,290 +1,278 @@
 <?xml version="1.0"?>
 <openerp>
 <data noupdate="1">
-	<!--
-		((((((((((( Demo Cases )))))))))))
-	-->
-<!--For Issue Tracking-->
-	<record id="crm_case_buginaccountsmodule0" model="project.issue">
-		<field name="partner_address_id" ref="base.res_partner_address_8"/>
-		<field eval="time.strftime('%Y-%m-08 10:15:00')" name="date"/>
-		<field name="type_id" ref="type1"/>
-		<field eval="&quot;5&quot;" name="priority"/>
-		<field name="user_id" ref="base.user_root"/>
-		<field name="partner_id" ref="base.res_partner_agrolait"/>
-		<field eval="&quot;open&quot;" name="state"/>
-		<field name="section_id" ref="crm.section_sales_department"/>
-		<field eval="1" name="active"/>
-		<field name="categ_id" ref="bug_categ"/>
-		<field name="stage_id" ref="stage1"/>
-		<field name="project_id" ref="project.project_project_22"/>
-		<field eval="15.0" name="duration"/>
-		<field eval="&quot;Bug in Accounts module&quot;" name="name"/>
-		<field eval="&quot;agr@agrolait.com&quot;" name="email_from"/>
-	</record>
-	<record id="crm_case_log_takecorrectiveactions0" model="mailgate.message">
-		<field eval="time.strftime('%Y-%m-08')" name="date"/>
-		<field name="case_id" ref="crm_case_buginaccountsmodule0"/>
-		<field name="som" ref="base.som_normal"/>
-		<field eval="&quot;Take corrective actions&quot;" name="name"/>
-		<field model="res.partner.canal" name="canal_id" search="[('name','=','website')]"/>
-	</record>
+    <record id="crm_case_buginaccountsmodule0" model="project.issue">
+        <field name="partner_address_id" ref="base.res_partner_address_8"/>
+        <field eval="time.strftime('%Y-%m-08 10:15:00')" name="date"/>
+        <field name="type_id" ref="type1"/>
+        <field eval="&quot;5&quot;" name="priority"/>
+        <field name="user_id" ref="base.user_root"/>
+        <field name="partner_id" ref="base.res_partner_agrolait"/>
+        <field eval="&quot;open&quot;" name="state"/>
+        <field name="section_id" ref="crm.section_sales_department"/>
+        <field eval="1" name="active"/>
+        <field name="categ_id" ref="bug_categ"/>
+        <field name="stage_id" ref="stage1"/>
+        <field name="project_id" ref="project.project_project_22"/>
+        <field eval="15.0" name="duration"/>
+        <field eval="&quot;Bug in Accounts module&quot;" name="name"/>
+        <field eval="&quot;agr@agrolait.com&quot;" name="email_from"/>
+    </record>
 
-	<record id="crm_case_programnotgivingproperoutput0" model="project.issue">
-		<field name="partner_address_id" ref="base.res_partner_address_tang"/>
-		<field eval="time.strftime('%Y-%m-15  12:50:00')" name="date"/>
-		<field name="type_id" ref="type2"/>
-		<field eval="&quot;3&quot;" name="priority"/>
-		<field name="user_id" ref="base.user_root"/>
-		<field name="partner_id" ref="base.res_partner_asus"/>
-		<field eval="&quot;done&quot;" name="state"/>
-		<field name="section_id" ref="crm.section_sales_department"/>
-		<field eval="1" name="active"/>
-		<field eval="3.5" name="duration"/>
-		<field name="categ_id" ref="bug_categ"/>
-		<field name="stage_id" ref="stage2"/>
-		<field eval="&quot;Program not giving proper output&quot;" name="name"/>
-		<field name="project_id" ref="project.project_project_22"/>
-	</record>
+    <record id="crm_case_programnotgivingproperoutput0" model="project.issue">
+        <field name="partner_address_id" ref="base.res_partner_address_tang"/>
+        <field eval="time.strftime('%Y-%m-15  12:50:00')" name="date"/>
+        <field name="type_id" ref="type2"/>
+        <field eval="&quot;3&quot;" name="priority"/>
+        <field name="user_id" ref="base.user_root"/>
+        <field name="partner_id" ref="base.res_partner_asus"/>
+        <field eval="&quot;done&quot;" name="state"/>
+        <field name="section_id" ref="crm.section_sales_department"/>
+        <field eval="1" name="active"/>
+        <field eval="3.5" name="duration"/>
+        <field name="categ_id" ref="bug_categ"/>
+        <field name="stage_id" ref="stage2"/>
+        <field eval="&quot;Program not giving proper output&quot;" name="name"/>
+        <field name="project_id" ref="project.project_project_22"/>
+    </record>
 
-	<record id="crm_case_outputincorrect0" model="project.issue">
-		<field name="partner_address_id" ref="base.res_partner_address_9"/>
-		<field eval="time.strftime('%Y-%m-18 14:30:00')" name="date"/>
-		<field name="type_id" ref="type1"/>
-		<field eval="&quot;4&quot;" name="priority"/>
-		<field name="user_id" ref="base.user_demo"/>
-		<field eval="&quot;cancel&quot;" name="state"/>
-		<field name="section_id" ref="crm.section_sales_department"/>
-		<field eval="1" name="active"/>
-		<field eval="2.3" name="duration"/>
-		<field name="categ_id" ref="bug_categ"/>
-		<field name="stage_id" ref="stage3"/>
-		<field name="project_id" ref="project.project_project_23"/>
-		<field eval="&quot;Output incorrect&quot;" name="name"/>
-	</record>
+    <record id="crm_case_outputincorrect0" model="project.issue">
+        <field name="partner_address_id" ref="base.res_partner_address_9"/>
+        <field eval="time.strftime('%Y-%m-18 14:30:00')" name="date"/>
+        <field name="type_id" ref="type1"/>
+        <field eval="&quot;4&quot;" name="priority"/>
+        <field name="user_id" ref="base.user_demo"/>
+        <field eval="&quot;cancel&quot;" name="state"/>
+        <field name="section_id" ref="crm.section_sales_department"/>
+        <field eval="1" name="active"/>
+        <field eval="2.3" name="duration"/>
+        <field name="categ_id" ref="bug_categ"/>
+        <field name="stage_id" ref="stage3"/>
+        <field name="project_id" ref="project.project_project_23"/>
+        <field eval="&quot;Output incorrect&quot;" name="name"/>
+    </record>
 
-	<record id="crm_case_problemloadingpage0" model="project.issue">
-		<field name="partner_address_id" ref="base.res_partner_address_13"/>
-		<field eval="time.strftime('%Y-%m-20  15:25:05')" name="date"/>
-		<field name="type_id" ref="type1"/>
-		<field eval="&quot;3&quot;" name="priority"/>
-		<field name="user_id" ref="base.user_root"/>
-		<field name="partner_id" ref="base.res_partner_14"/>
-		<field eval="&quot;cancel&quot;" name="state"/>
-		<field name="section_id" ref="crm.section_sales_department"/>
-		<field eval="1" name="active"/>
-		<field eval="4.0" name="duration"/>
-		<field name="categ_id" ref="bug_categ"/>
-		<field name="stage_id" ref="stage4"/>
-		<field name="project_id" ref="project.project_project_22"/>
-		<field eval="&quot;Problem loading page&quot;" name="name"/>
-	</record>
+    <record id="crm_case_problemloadingpage0" model="project.issue">
+        <field name="partner_address_id" ref="base.res_partner_address_13"/>
+        <field eval="time.strftime('%Y-%m-20  15:25:05')" name="date"/>
+        <field name="type_id" ref="type1"/>
+        <field eval="&quot;3&quot;" name="priority"/>
+        <field name="user_id" ref="base.user_root"/>
+        <field name="partner_id" ref="base.res_partner_14"/>
+        <field eval="&quot;cancel&quot;" name="state"/>
+        <field name="section_id" ref="crm.section_sales_department"/>
+        <field eval="1" name="active"/>
+        <field eval="4.0" name="duration"/>
+        <field name="categ_id" ref="bug_categ"/>
+        <field name="stage_id" ref="stage4"/>
+        <field name="project_id" ref="project.project_project_22"/>
+        <field eval="&quot;Problem loading page&quot;" name="name"/>
+    </record>
 
-	<record id="crm_case_pagenotfound0" model="project.issue">
-		<field eval="time.strftime('%Y-%m-22  18:15:00')" name="date"/>
-		<field name="type_id" ref="type1"/>
-		<field eval="&quot;3&quot;" name="priority"/>
-		<field name="user_id" ref="base.user_root"/>
-		<field name="partner_id" ref="base.res_partner_desertic_hispafuentes"/>
-		<field eval="&quot;draft&quot;" name="state"/>
-		<field name="section_id" ref="crm.section_sales_department"/>
-		<field eval="1" name="active"/>
-		<field eval="1.0" name="duration"/>
-		<field name="categ_id" ref="bug_categ"/>
-		<field name="stage_id" ref="stage5"/>
-		<field name="project_id" ref="project.project_project_22"/>
-		<field eval="&quot;Page not Found&quot;" name="name"/>
-	</record>
+    <record id="crm_case_pagenotfound0" model="project.issue">
+        <field eval="time.strftime('%Y-%m-22  18:15:00')" name="date"/>
+        <field name="type_id" ref="type1"/>
+        <field eval="&quot;3&quot;" name="priority"/>
+        <field name="user_id" ref="base.user_root"/>
+        <field name="partner_id" ref="base.res_partner_desertic_hispafuentes"/>
+        <field eval="&quot;draft&quot;" name="state"/>
+        <field name="section_id" ref="crm.section_sales_department"/>
+        <field eval="1" name="active"/>
+        <field eval="1.0" name="duration"/>
+        <field name="categ_id" ref="bug_categ"/>
+        <field name="stage_id" ref="stage5"/>
+        <field name="project_id" ref="project.project_project_22"/>
+        <field eval="&quot;Page not Found&quot;" name="name"/>
+    </record>
 
-	<record id="crm_case_programmingerror0" model="project.issue">
-		<field name="partner_address_id" ref="base.res_partner_address_10"/>
-		<field eval="time.strftime('%Y-%m-24  09:45:00')" name="date"/>
-		<field name="type_id" ref="type2"/>
-		<field eval="&quot;3&quot;" name="priority"/>
-		<field name="user_id" ref="base.user_root"/>
-		<field name="partner_id" ref="base.res_partner_5"/>
-		<field eval="&quot;pending&quot;" name="state"/>
-		<field name="section_id" ref="crm.section_sales_department"/>
-		<field eval="1" name="active"/>
-		<field eval="4.0" name="duration"/>
-		<field name="categ_id" ref="bug_categ"/>
-		<field name="stage_id" ref="stage6"/>
-		<field name="project_id" ref="project.project_project_22"/>
-		<field eval="&quot;Programming Error&quot;" name="name"/>
-	</record>
+    <record id="crm_case_programmingerror0" model="project.issue">
+        <field name="partner_address_id" ref="base.res_partner_address_10"/>
+        <field eval="time.strftime('%Y-%m-24  09:45:00')" name="date"/>
+        <field name="type_id" ref="type2"/>
+        <field eval="&quot;3&quot;" name="priority"/>
+        <field name="user_id" ref="base.user_root"/>
+        <field name="partner_id" ref="base.res_partner_5"/>
+        <field eval="&quot;pending&quot;" name="state"/>
+        <field name="section_id" ref="crm.section_sales_department"/>
+        <field eval="1" name="active"/>
+        <field eval="4.0" name="duration"/>
+        <field name="categ_id" ref="bug_categ"/>
+        <field name="stage_id" ref="stage6"/>
+        <field name="project_id" ref="project.project_project_22"/>
+        <field eval="&quot;Programming Error&quot;" name="name"/>
+    </record>
 
-	<record id="crm_case_logicalerrorinprogram0" model="project.issue">
-		<field name="partner_address_id" ref="base.res_partner_address_6"/>
-		<field eval="time.strftime('%Y-%m-26  11:10:00')" name="date"/>
-		<field name="type_id" ref="type1"/>
-		<field eval="&quot;2&quot;" name="priority"/>
-		<field name="user_id" ref="base.user_root"/>
-		<field name="partner_id" ref="base.res_partner_6"/>
-		<field eval="&quot;pending&quot;" name="state"/>
-		<field name="section_id" ref="crm.section_sales_department"/>
-		<field eval="1" name="active"/>
-		<field eval="2.0" name="duration"/>
-		<field name="categ_id" ref="bug_categ"/>
-		<field name="stage_id" ref="stage6"/>
-		<field name="project_id" ref="project.project_project_9"/>
-		<field eval="&quot;Logical Error in Program&quot;" name="name"/>
-	</record>
+    <record id="crm_case_logicalerrorinprogram0" model="project.issue">
+        <field name="partner_address_id" ref="base.res_partner_address_6"/>
+        <field eval="time.strftime('%Y-%m-26  11:10:00')" name="date"/>
+        <field name="type_id" ref="type1"/>
+        <field eval="&quot;2&quot;" name="priority"/>
+        <field name="user_id" ref="base.user_root"/>
+        <field name="partner_id" ref="base.res_partner_6"/>
+        <field eval="&quot;pending&quot;" name="state"/>
+        <field name="section_id" ref="crm.section_sales_department"/>
+        <field eval="1" name="active"/>
+        <field eval="2.0" name="duration"/>
+        <field name="categ_id" ref="bug_categ"/>
+        <field name="stage_id" ref="stage6"/>
+        <field name="project_id" ref="project.project_project_9"/>
+        <field eval="&quot;Logical Error in Program&quot;" name="name"/>
+    </record>
 
-	<record id="crm_case_constrainterror0" model="project.issue">
-		<field name="partner_address_id" ref="base.res_partner_address_6"/>
-		<field eval="time.strftime('%Y-%m-25  13:35:00')" name="date"/>
-		<field name="type_id" ref="type1"/>
-		<field eval="&quot;2&quot;" name="priority"/>
-		<field name="user_id" ref="base.user_root"/>
-		<field name="partner_id" ref="base.res_partner_6"/>
-		<field eval="&quot;pending&quot;" name="state"/>
-		<field name="section_id" ref="crm.section_sales_department"/>
-		<field eval="1" name="active"/>
-		<field eval="7.3" name="duration"/>
-		<field name="categ_id" ref="bug_categ"/>
-		<field name="stage_id" ref="stage5"/>
-		<field name="project_id" ref="project.project_project_9"/>
-		<field eval="&quot;Constraint Error&quot;" name="name"/>
-	</record>
+    <record id="crm_case_constrainterror0" model="project.issue">
+        <field name="partner_address_id" ref="base.res_partner_address_6"/>
+        <field eval="time.strftime('%Y-%m-25  13:35:00')" name="date"/>
+        <field name="type_id" ref="type1"/>
+        <field eval="&quot;2&quot;" name="priority"/>
+        <field name="user_id" ref="base.user_root"/>
+        <field name="partner_id" ref="base.res_partner_6"/>
+        <field eval="&quot;pending&quot;" name="state"/>
+        <field name="section_id" ref="crm.section_sales_department"/>
+        <field eval="1" name="active"/>
+        <field eval="7.3" name="duration"/>
+        <field name="categ_id" ref="bug_categ"/>
+        <field name="stage_id" ref="stage5"/>
+        <field name="project_id" ref="project.project_project_9"/>
+        <field eval="&quot;Constraint Error&quot;" name="name"/>
+    </record>
 
-	<record id="crm_case_errorinprogram0" model="project.issue">
-		<field name="partner_address_id" ref="base.res_partner_address_10"/>
-		<field eval="time.strftime('%Y-%m-28  15:40:00')" name="date"/>
-		<field name="type_id" ref="type2"/>
-		<field eval="&quot;2&quot;" name="priority"/>
-		<field name="user_id" ref="base.user_demo"/>
-		<field name="partner_id" ref="base.res_partner_5"/>
-		<field eval="&quot;open&quot;" name="state"/>
-		<field eval="1" name="active"/>
-		<field eval="1.3" name="duration"/>
-		<field name="categ_id" ref="feature_request_categ"/>
-		<field name="stage_id" ref="stage5"/>
-		<field name="project_id" ref="project.project_project_22"/>
-		<field eval="&quot;Error in Program&quot;" name="name"/>
-	</record>
+    <record id="crm_case_errorinprogram0" model="project.issue">
+        <field name="partner_address_id" ref="base.res_partner_address_10"/>
+        <field eval="time.strftime('%Y-%m-28  15:40:00')" name="date"/>
+        <field name="type_id" ref="type2"/>
+        <field eval="&quot;2&quot;" name="priority"/>
+        <field name="user_id" ref="base.user_demo"/>
+        <field name="partner_id" ref="base.res_partner_5"/>
+        <field eval="&quot;open&quot;" name="state"/>
+        <field eval="1" name="active"/>
+        <field eval="1.3" name="duration"/>
+        <field name="categ_id" ref="feature_request_categ"/>
+        <field name="stage_id" ref="stage5"/>
+        <field name="project_id" ref="project.project_project_22"/>
+        <field eval="&quot;Error in Program&quot;" name="name"/>
+    </record>
 
-	<record id="crm_case_patcheserrorinprogram0" model="project.issue">
-		<field name="partner_address_id" ref="base.res_partner_address_9"/>
-		<field eval="time.strftime('%Y-%m-28  16:30:00')" name="date"/>
-		<field name="type_id" ref="type2"/>
-		<field eval="&quot;2&quot;" name="priority"/>
-		<field name="user_id" ref="base.user_root"/>
-		<field name="partner_id" ref="base.res_partner_2"/>
-		<field eval="&quot;open&quot;" name="state"/>
-		<field name="section_id" ref="crm.section_sales_department"/>
-		<field eval="1" name="active"/>
-		<field eval="13.0" name="duration"/>
-		<field name="categ_id" ref="feature_request_categ"/>
-		<field name="stage_id" ref="stage5"/>
-		<field name="project_id" ref="project.project_project_9"/>
-		<field eval="&quot;Patches Error in Program&quot;" name="name"/>
-	</record>
+    <record id="crm_case_patcheserrorinprogram0" model="project.issue">
+        <field name="partner_address_id" ref="base.res_partner_address_9"/>
+        <field eval="time.strftime('%Y-%m-28  16:30:00')" name="date"/>
+        <field name="type_id" ref="type2"/>
+        <field eval="&quot;2&quot;" name="priority"/>
+        <field name="user_id" ref="base.user_root"/>
+        <field name="partner_id" ref="base.res_partner_2"/>
+        <field eval="&quot;open&quot;" name="state"/>
+        <field name="section_id" ref="crm.section_sales_department"/>
+        <field eval="1" name="active"/>
+        <field eval="13.0" name="duration"/>
+        <field name="categ_id" ref="feature_request_categ"/>
+        <field name="stage_id" ref="stage5"/>
+        <field name="project_id" ref="project.project_project_9"/>
+        <field eval="&quot;Patches Error in Program&quot;" name="name"/>
+    </record>
 
-	<record id="crm_case_newfeaturestobeadded0" model="project.issue">
-		<field name="partner_address_id" ref="base.res_partner_address_wong"/>
-		<field eval="time.strftime('%Y-%m-01 12:15:10')" name="date"/>
-		<field name="type_id" ref="type1"/>
-		<field eval="&quot;4&quot;" name="priority"/>
-		<field name="user_id" ref="base.user_root"/>
-		<field name="partner_id" ref="base.res_partner_maxtor"/>
-		<field eval="&quot;open&quot;" name="state"/>
-		<field name="section_id" ref="crm.section_sales_department"/>
-		<field eval="1" name="active"/>
-		<field eval="3.2" name="duration"/>
-		<field name="categ_id" ref="feature_request_categ"/>
-		<field name="stage_id" ref="stage1"/>
-		<field name="project_id" ref="project.project_project_21"/>
-		<field eval="&quot;New Features To Be Added&quot;" name="name"/>
-	</record>
+    <record id="crm_case_newfeaturestobeadded0" model="project.issue">
+        <field name="partner_address_id" ref="base.res_partner_address_wong"/>
+        <field eval="time.strftime('%Y-%m-01 12:15:10')" name="date"/>
+        <field name="type_id" ref="type1"/>
+        <field eval="&quot;4&quot;" name="priority"/>
+        <field name="user_id" ref="base.user_root"/>
+        <field name="partner_id" ref="base.res_partner_maxtor"/>
+        <field eval="&quot;open&quot;" name="state"/>
+        <field name="section_id" ref="crm.section_sales_department"/>
+        <field eval="1" name="active"/>
+        <field eval="3.2" name="duration"/>
+        <field name="categ_id" ref="feature_request_categ"/>
+        <field name="stage_id" ref="stage1"/>
+        <field name="project_id" ref="project.project_project_21"/>
+        <field eval="&quot;New Features To Be Added&quot;" name="name"/>
+    </record>
 
-	<record id="crm_case_addmenustothemodule0" model="project.issue">
-		<field name="partner_address_id" ref="base.res_partner_address_1"/>
-		<field eval="time.strftime('%Y-%m-05 18:00:00')" name="date"/>
-		<field name="type_id" ref="type2"/>
-		<field eval="&quot;1&quot;" name="priority"/>
-		<field name="user_id" ref="base.user_demo"/>
-		<field name="partner_id" ref="base.res_partner_9"/>
-		<field eval="&quot;done&quot;" name="state"/>
-		<field name="section_id" ref="crm.section_sales_department"/>
-		<field eval="1" name="active"/>
-		<field eval="3.0" name="duration"/>
-		<field name="categ_id" ref="feature_request_categ"/>
-		<field name="stage_id" ref="stage2"/>
-		<field name="project_id" ref="project.project_project_21"/>
-		<field eval="&quot;Add menus to the module&quot;" name="name"/>
-		<field eval="&quot;info@opensides.be&quot;" name="email_from"/>
-	</record>
+    <record id="crm_case_addmenustothemodule0" model="project.issue">
+        <field name="partner_address_id" ref="base.res_partner_address_1"/>
+        <field eval="time.strftime('%Y-%m-05 18:00:00')" name="date"/>
+        <field name="type_id" ref="type2"/>
+        <field eval="&quot;1&quot;" name="priority"/>
+        <field name="user_id" ref="base.user_demo"/>
+        <field name="partner_id" ref="base.res_partner_9"/>
+        <field eval="&quot;done&quot;" name="state"/>
+        <field name="section_id" ref="crm.section_sales_department"/>
+        <field eval="1" name="active"/>
+        <field eval="3.0" name="duration"/>
+        <field name="categ_id" ref="feature_request_categ"/>
+        <field name="stage_id" ref="stage2"/>
+        <field name="project_id" ref="project.project_project_21"/>
+        <field eval="&quot;Add menus to the module&quot;" name="name"/>
+        <field eval="&quot;info@opensides.be&quot;" name="email_from"/>
+    </record>
 
-	<record id="crm_case_includeattendancesheetinproject0" model="project.issue">
-		<field name="partner_address_id" ref="base.res_partner_address_2"/>
-		<field eval="time.strftime('%Y-%m-10 17:05:30')" name="date"/>
-		<field name="type_id" ref="type1"/>
-		<field eval="&quot;3&quot;" name="priority"/>
-		<field name="user_id" ref="base.user_root"/>
-		<field name="partner_id" ref="base.res_partner_10"/>
-		<field eval="&quot;cancel&quot;" name="state"/>
-		<field name="section_id" ref="crm.section_sales_department"/>
-		<field eval="1" name="active"/>
-		<field eval="2.0" name="duration"/>
-		<field name="categ_id" ref="feature_request_categ"/>
-		<field name="stage_id" ref="stage3"/>
-		<field name="project_id" ref="project.project_project_9"/>
-		<field eval="&quot;Include Attendance sheet in Project&quot;" name="name"/>
-		<field eval="&quot;contact@tecsas.fr&quot;" name="email_from"/>
-	</record>
+    <record id="crm_case_includeattendancesheetinproject0" model="project.issue">
+        <field name="partner_address_id" ref="base.res_partner_address_2"/>
+        <field eval="time.strftime('%Y-%m-10 17:05:30')" name="date"/>
+        <field name="type_id" ref="type1"/>
+        <field eval="&quot;3&quot;" name="priority"/>
+        <field name="user_id" ref="base.user_root"/>
+        <field name="partner_id" ref="base.res_partner_10"/>
+        <field eval="&quot;cancel&quot;" name="state"/>
+        <field name="section_id" ref="crm.section_sales_department"/>
+        <field eval="1" name="active"/>
+        <field eval="2.0" name="duration"/>
+        <field name="categ_id" ref="feature_request_categ"/>
+        <field name="stage_id" ref="stage3"/>
+        <field name="project_id" ref="project.project_project_9"/>
+        <field eval="&quot;Include Attendance sheet in Project&quot;" name="name"/>
+        <field eval="&quot;contact@tecsas.fr&quot;" name="email_from"/>
+    </record>
 
-	<record id="crm_case_createnewobject0" model="project.issue">
-		<field model="res.partner.canal" name="canal_id" search="[('name','=','phone')]"/>
-		<field name="partner_address_id" ref="base.res_partner_address_6"/>
-		<field name="som" ref="base.som_happy"/>
-		<field eval="time.strftime('%Y-%m-15 10:35:15')" name="date"/>
-		<field name="type_id" ref="type1"/>
-		<field eval="&quot;3&quot;" name="priority"/>
-		<field name="user_id" ref="base.user_root"/>
-		<field name="partner_id" ref="base.res_partner_6"/>
-		<field eval="&quot;draft&quot;" name="state"/>
-		<field name="section_id" ref="crm.section_sales_department"/>
-		<field eval="1" name="active"/>
-		<field eval="2.45" name="duration"/>
-		<field name="categ_id" ref="feature_request_categ"/>
-		<field name="stage_id" ref="stage5"/>
-		<field name="project_id" ref="project.project_project_22"/>
-		<field eval="&quot;Create new object&quot;" name="name"/>
-	</record>
+    <record id="crm_case_createnewobject0" model="project.issue">
+        <field model="res.partner.canal" name="canal_id" search="[('name','=','phone')]"/>
+        <field name="partner_address_id" ref="base.res_partner_address_6"/>
+        <field eval="time.strftime('%Y-%m-15 10:35:15')" name="date"/>
+        <field name="type_id" ref="type1"/>
+        <field eval="&quot;3&quot;" name="priority"/>
+        <field name="user_id" ref="base.user_root"/>
+        <field name="partner_id" ref="base.res_partner_6"/>
+        <field eval="&quot;draft&quot;" name="state"/>
+        <field name="section_id" ref="crm.section_sales_department"/>
+        <field eval="1" name="active"/>
+        <field eval="2.45" name="duration"/>
+        <field name="categ_id" ref="feature_request_categ"/>
+        <field name="stage_id" ref="stage5"/>
+        <field name="project_id" ref="project.project_project_22"/>
+        <field eval="&quot;Create new object&quot;" name="name"/>
+    </record>
 
-	<record id="crm_case_improvereportsinhrms0" model="project.issue">
-		<field name="partner_address_id" ref="base.res_partner_address_15"/>
-		<field eval="time.strftime('%Y-%m-19 12:15:00')" name="date"/>
-		<field name="type_id" ref="type1"/>
-		<field eval="&quot;4&quot;" name="priority"/>
-		<field name="user_id" ref="base.user_root"/>
-		<field name="partner_id" ref="base.res_partner_11"/>
-		<field eval="&quot;pending&quot;" name="state"/>
-		<field name="section_id" ref="crm.section_sales_department"/>
-		<field eval="1" name="active"/>
-		<field eval="15.0" name="duration"/>
-		<field name="categ_id" ref="feature_request_categ"/>
-		<field name="stage_id" ref="stage6"/>
-		<field name="project_id" ref="project.project_project_22"/>
-		<field eval="&quot;Improve Reports in HRMS&quot;" name="name"/>
-	</record>
+    <record id="crm_case_improvereportsinhrms0" model="project.issue">
+        <field name="partner_address_id" ref="base.res_partner_address_15"/>
+        <field eval="time.strftime('%Y-%m-19 12:15:00')" name="date"/>
+        <field name="type_id" ref="type1"/>
+        <field eval="&quot;4&quot;" name="priority"/>
+        <field name="user_id" ref="base.user_root"/>
+        <field name="partner_id" ref="base.res_partner_11"/>
+        <field eval="&quot;pending&quot;" name="state"/>
+        <field name="section_id" ref="crm.section_sales_department"/>
+        <field eval="1" name="active"/>
+        <field eval="15.0" name="duration"/>
+        <field name="categ_id" ref="feature_request_categ"/>
+        <field name="stage_id" ref="stage6"/>
+        <field name="project_id" ref="project.project_project_22"/>
+        <field eval="&quot;Improve Reports in HRMS&quot;" name="name"/>
+    </record>
 
-	<record id="crm_case_improvereportsinpms0" model="project.issue">
-		<field name="partner_address_id" ref="base.res_partner_address_15"/>
-		<field eval="time.strftime('%Y-%m-21 14:30:00')" name="date"/>
-		<field name="type_id" ref="type1"/>
-		<field eval="&quot;2&quot;" name="priority"/>
-		<field name="user_id" ref="base.user_demo"/>
-		<field name="partner_id" ref="base.res_partner_11"/>
-		<field eval="&quot;pending&quot;" name="state"/>
-		<field name="section_id" ref="crm.section_sales_department"/>
-		<field eval="1" name="active"/>
-		<field eval="06.15" name="duration"/>
-		<field name="categ_id" ref="feature_request_categ"/>
-		<field name="stage_id" ref="stage5"/>
-		<field name="project_id" ref="project.project_project_22"/>
-		<field eval="&quot;Improve Reports in PMS&quot;" name="name"/>
-	</record>
+    <record id="crm_case_improvereportsinpms0" model="project.issue">
+        <field name="partner_address_id" ref="base.res_partner_address_15"/>
+        <field eval="time.strftime('%Y-%m-21 14:30:00')" name="date"/>
+        <field name="type_id" ref="type1"/>
+        <field eval="&quot;2&quot;" name="priority"/>
+        <field name="user_id" ref="base.user_demo"/>
+        <field name="partner_id" ref="base.res_partner_11"/>
+        <field eval="&quot;pending&quot;" name="state"/>
+        <field name="section_id" ref="crm.section_sales_department"/>
+        <field eval="1" name="active"/>
+        <field eval="06.15" name="duration"/>
+        <field name="categ_id" ref="feature_request_categ"/>
+        <field name="stage_id" ref="stage5"/>
+        <field name="project_id" ref="project.project_project_22"/>
+        <field eval="&quot;Improve Reports in PMS&quot;" name="name"/>
+    </record>
 
 </data>
 </openerp>
diff --git a/addons/project_issue/project_issue_menu.xml b/addons/project_issue/project_issue_menu.xml
index ea902ea599f..fefdd496559 100644
--- a/addons/project_issue/project_issue_menu.xml
+++ b/addons/project_issue/project_issue_menu.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <openerp>
-<data noupdate="1">
+<data>
 
 
     ######################## ISSUE TRACKING (menu) ###########################
diff --git a/addons/project_issue/project_issue_view.xml b/addons/project_issue/project_issue_view.xml
index 973e0a1a20c..fd523ad7774 100644
--- a/addons/project_issue/project_issue_view.xml
+++ b/addons/project_issue/project_issue_view.xml
@@ -95,7 +95,7 @@
                                     <button colspan="4"
                                     string="Reply to Last Email"
                                     name="%(crm.action_crm_send_mail)d"
-                                    context="{'mail':'reply', 'model': 'project.issue'}"
+                                    context="{'mail':'reply', 'model': 'project.issue', 'include_original' : True}"
                                     icon="gtk-undo" type="action" />
                                 </form>
                                 <tree string="Communication history">