Enhancements

GoContractPro · Jan 25, 2016 · ff5a7cb · ff5a7cb
1 parent 8dcc970
commit ff5a7cb
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 4 deletions.
diff --git a/addons-extra/genemedics/crm_helpdesk_features/__openerp__.py b/addons-extra/genemedics/crm_helpdesk_features/__openerp__.py
@@ -31,7 +31,7 @@
     """,
     'author': 'NovaPoint Group Inc',
     'website': 'www.novapointgroup.com',
-    'depends': ['base','crm', 'sale', 'project_issue', 'crm_project_issue','mail'],
+    'depends': ['base','crm', 'sale', 'project_issue', 'crm_project_issue','mail','hr_contract'],
     'init_xml': [],
     'data': [
         "views/helpdesk_issue_view.xml",

diff --git a/addons-extra/genemedics/crm_helpdesk_features/views/helpdesk_issue_view.xml b/addons-extra/genemedics/crm_helpdesk_features/views/helpdesk_issue_view.xml
@@ -50,7 +50,7 @@
             <field name="name">Help Desk Issue</field>
             <field name="model">project.issue</field>
             <field name="arch" type="xml">
-                <tree  default_order="write_date"
+                <tree  default_order="write_date desc"
                 	colors="green: age_since_update &lt; 0.5 ;blue: age_since_update &gt;= 0.5 and age_since_update &lt; 2.0 
                 	;red: age_since_update &gt;= 2.0" string="Helpdesk Issue" decoration-bf="message_needaction==True">
                     <field name="create_date" string="Created on" invisible="0"/>

diff --git a/addons-extra/genemedics/npg_mail_reply_button/static/src/js/thread.js b/addons-extra/genemedics/npg_mail_reply_button/static/src/js/thread.js
@@ -22,9 +22,16 @@ ChatThread.include({
 
     on_click_o_thread_message_reply: function(event) {
         var self = this;
-        this.open_composer();
+       // this.open_composer();
        // var message_id = $(event.currentTarget).data('message-id');
        // this.trigger("open_composer", message_id);
+      // var $thread = this.$('.o_followers_list');
+      this.$el.html(qweb.render('mail.chatter.ChatComposer',  {
+            messages: msgs,
+            options: _.extend({}, this.options, options),
+            ORDER: ORDER,
+        })).appendTo(this);
+
     },
 
     init: function(parent, dataset, options) {

diff --git a/addons-extra/genemedics/npg_mail_reply_button/static/src/xml/thread.xml b/addons-extra/genemedics/npg_mail_reply_button/static/src/xml/thread.xml
@@ -5,8 +5,12 @@
             <t t-jquery="span.pull-right" t-operation="replace">
 
                    <span class="pull-right">
-                   	<i t-if="message.message_type != 'notification'" t-att-class="'fa fa-lg o_thread_message_reply fa-mail-reply'"
+<!--                   	<i t-if="message.message_type != 'notification'" t-att-class="'fa fa-lg o_thread_message_reply fa-mail-reply'"-->
+<!--                        t-att-data-message-id="message.id" t-att-title="_t('Reply')"/>-->
+
+					<i t-if="message.message_type != 'notification'" t-att-class="'fa fa-lg o_chatter_button_new_message fa-mail-reply'"
                         t-att-data-message-id="message.id" t-att-title="_t('Reply')"/>
+
                     <i t-if="message.is_needaction &amp;&amp; options.display_needactions"
                        class="fa fa-check o_thread_message_needaction"
                        t-att-data-message-id="message.id" t-att-title="_t('Mark as Done')"/>