From 43726bc8cfbcc033c95a39f9c33d79931d4e9bf8 Mon Sep 17 00:00:00 2001
From: "Turkesh Patel (Open ERP)" <tpa@tinyerp.com>
Date: Mon, 30 Apr 2012 16:03:56 +0530
Subject: [PATCH 1/6] [IMP] remove communication and history

bzr revid: tpa@tinyerp.com-20120430103356-hticp99o18y7ll4j
---
 addons/crm_helpdesk/crm_helpdesk_view.xml | 33 +++++++----------------
 1 file changed, 9 insertions(+), 24 deletions(-)

diff --git a/addons/crm_helpdesk/crm_helpdesk_view.xml b/addons/crm_helpdesk/crm_helpdesk_view.xml
index 48681357660..f5e009d6500 100644
--- a/addons/crm_helpdesk/crm_helpdesk_view.xml
+++ b/addons/crm_helpdesk/crm_helpdesk_view.xml
@@ -28,7 +28,8 @@
             <field name="model">crm.helpdesk</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Helpdesk Support">
+                <form string="Helpdesk Support" layout="manual">
+                <sheet layout="auto">
                     <group colspan="4" col="7">
                         <field name="name" select="1" string="Query"/>
                         <field name="section_id" widget="selection"/>
@@ -39,6 +40,9 @@
                             icon="gtk-go-forward" />
                         <field name="date" select="1"/>
                         <field name="date_deadline"/>
+                        <button string="Send New Email"
+	                        name="%(mail.action_email_compose_message_wizard)d"
+	                        icon="terp-mail-message-new" type="action"/>
                     </group>
                     <notebook colspan="4">
                         <page string="General">
@@ -89,29 +93,6 @@
                                     icon="gtk-convert" />
                             </group>
                         </page>
-                        <page string="Communication &amp; History">
-                            <group colspan="4">
-                                <field colspan="4" name="email_cc" string="Global CC" widget="char"/>
-                            </group>
-                            <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"/>
-                                    <button
-                                        string="Reply" attrs="{'invisible': [('email_from', '=', False)]}"
-                                        name="%(mail.action_email_compose_message_wizard)d"
-                                        context="{'mail.compose.message.mode':'reply', 'message_id':active_id}"
-                                        icon="terp-mail-replied" type="action" />
-                                </tree>
-                            </field>
-                             <button string="Add Internal Note"
-                                name="%(crm.action_crm_add_note)d"
-                                context="{'model': 'crm.lead' }"
-                                icon="terp-document-new" type="action" />
-                            <button string="Send New Email"
-                                name="%(mail.action_email_compose_message_wizard)d"
-                                icon="terp-mail-message-new" type="action"/>
-                        </page>
                         <page string="Extra Info">
                             <group colspan="2" col="2" groups="base.group_no_one">
                                 <separator colspan="4" string="Dates"/>
@@ -136,6 +117,10 @@
                             </group>
                         </page>
                     </notebook>
+                </sheet>
+                <div class="oe_form_sheet_width">
+                    <field name="message_ids_social" colspan="4" widget="ThreadView" nolabel="1"/>
+                </div>
                 </form>
             </field>
         </record>

From d2e89476313f0d996713a322b29fe70f33669798 Mon Sep 17 00:00:00 2001
From: "Turkesh Patel (Open ERP)" <tpa@tinyerp.com>
Date: Mon, 30 Apr 2012 16:08:03 +0530
Subject: [PATCH 2/6] [IMP] remove changes

bzr revid: tpa@tinyerp.com-20120430103803-lxo8446awo7sc7gf
---
 addons/crm_helpdesk/crm_helpdesk_view.xml | 33 ++++++++++++++++-------
 1 file changed, 24 insertions(+), 9 deletions(-)

diff --git a/addons/crm_helpdesk/crm_helpdesk_view.xml b/addons/crm_helpdesk/crm_helpdesk_view.xml
index f5e009d6500..48681357660 100644
--- a/addons/crm_helpdesk/crm_helpdesk_view.xml
+++ b/addons/crm_helpdesk/crm_helpdesk_view.xml
@@ -28,8 +28,7 @@
             <field name="model">crm.helpdesk</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Helpdesk Support" layout="manual">
-                <sheet layout="auto">
+                <form string="Helpdesk Support">
                     <group colspan="4" col="7">
                         <field name="name" select="1" string="Query"/>
                         <field name="section_id" widget="selection"/>
@@ -40,9 +39,6 @@
                             icon="gtk-go-forward" />
                         <field name="date" select="1"/>
                         <field name="date_deadline"/>
-                        <button string="Send New Email"
-	                        name="%(mail.action_email_compose_message_wizard)d"
-	                        icon="terp-mail-message-new" type="action"/>
                     </group>
                     <notebook colspan="4">
                         <page string="General">
@@ -93,6 +89,29 @@
                                     icon="gtk-convert" />
                             </group>
                         </page>
+                        <page string="Communication &amp; History">
+                            <group colspan="4">
+                                <field colspan="4" name="email_cc" string="Global CC" widget="char"/>
+                            </group>
+                            <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"/>
+                                    <button
+                                        string="Reply" attrs="{'invisible': [('email_from', '=', False)]}"
+                                        name="%(mail.action_email_compose_message_wizard)d"
+                                        context="{'mail.compose.message.mode':'reply', 'message_id':active_id}"
+                                        icon="terp-mail-replied" type="action" />
+                                </tree>
+                            </field>
+                             <button string="Add Internal Note"
+                                name="%(crm.action_crm_add_note)d"
+                                context="{'model': 'crm.lead' }"
+                                icon="terp-document-new" type="action" />
+                            <button string="Send New Email"
+                                name="%(mail.action_email_compose_message_wizard)d"
+                                icon="terp-mail-message-new" type="action"/>
+                        </page>
                         <page string="Extra Info">
                             <group colspan="2" col="2" groups="base.group_no_one">
                                 <separator colspan="4" string="Dates"/>
@@ -117,10 +136,6 @@
                             </group>
                         </page>
                     </notebook>
-                </sheet>
-                <div class="oe_form_sheet_width">
-                    <field name="message_ids_social" colspan="4" widget="ThreadView" nolabel="1"/>
-                </div>
                 </form>
             </field>
         </record>

From 8a6fdde203fea80666a926b2b1c2c62474872902 Mon Sep 17 00:00:00 2001
From: "Turkesh Patel (Open ERP)" <tpa@tinyerp.com>
Date: Mon, 30 Apr 2012 16:29:03 +0530
Subject: [PATCH 3/6] [IMP] remove communication and history

bzr revid: tpa@tinyerp.com-20120430105903-oqsh4khq0ergodgc
---
 .../crm_fundraising/crm_fundraising_view.xml  | 33 +++++--------------
 1 file changed, 9 insertions(+), 24 deletions(-)

diff --git a/addons/crm_fundraising/crm_fundraising_view.xml b/addons/crm_fundraising/crm_fundraising_view.xml
index 48eb1aa3072..02116f1536c 100644
--- a/addons/crm_fundraising/crm_fundraising_view.xml
+++ b/addons/crm_fundraising/crm_fundraising_view.xml
@@ -77,7 +77,8 @@
             <field name="model">crm.fundraising</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Funds Form">
+                <form string="Funds Form" layout="manual">
+                <sheet layout="auto">
                     <group colspan="4" col="6">
                         <field name="name" select="1" string="Name"/>
                         <field name="section_id" colspan="1" widget="selection"/>
@@ -85,6 +86,9 @@
                         <field name="date"/>
                         <field name="categ_id" select="1" widget="selection" domain="[('object_id.model', '=', 'crm.fundraising')]"/>
                         <field name="type_id" string="Payment Mode" select="1" widget="selection"/>
+                        <button string="Send New Email"
+	                        name="%(mail.action_email_compose_message_wizard)d"
+	                        icon="terp-mail-message-new" type="action"/>
                     </group>
                     <notebook colspan="4">
                         <page string="Funds">
@@ -126,29 +130,6 @@
                                     type="object" icon="gtk-convert" />
                             </group>
                         </page>
-                        <page string="Communication &amp; History">
-                            <group colspan="4">
-                                <field colspan="4" name="email_cc" string="Global CC" widget="char"/>
-                            </group>
-                            <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"/>
-                                    <button
-                                        string="Reply" attrs="{'invisible': [('email_from', '=', False)]}"
-                                        name="%(mail.action_email_compose_message_wizard)d"
-                                        context="{'mail.compose.message.mode':'reply', 'message_id':active_id}"
-                                        icon="terp-mail-replied" type="action" />
-                                </tree>
-                            </field>
-                             <button string="Add Internal Note"
-                                name="%(crm.action_crm_add_note)d"
-                                context="{'model': 'crm.lead' }"
-                                icon="terp-document-new" type="action" />
-                            <button string="Send New Email"
-                                name="%(mail.action_email_compose_message_wizard)d"
-                                icon="terp-mail-message-new" type="action"/>
-                        </page>
                         <page string="Extra Info">
                             <group col="2" colspan="2">
                                 <separator colspan="4" string="Misc"/>
@@ -170,6 +151,10 @@
                             </group>
                         </page>
                     </notebook>
+                </sheet>
+                <div class="oe_form_sheet_width">
+                    <field name="message_ids_social" colspan="4" widget="ThreadView" nolabel="1"/>
+                </div>
                 </form>
             </field>
         </record>

From 2c688759ac144cdbae6fa8e15b283d0e36285c0f Mon Sep 17 00:00:00 2001
From: "Turkesh Patel (Open ERP)" <tpa@tinyerp.com>
Date: Mon, 30 Apr 2012 16:38:41 +0530
Subject: [PATCH 4/6] [IMP] improved code for create send not and prefix

bzr revid: tpa@tinyerp.com-20120430110841-kv2m6352bedtca6l
---
 addons/crm_fundraising/crm_fundraising.py | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/addons/crm_fundraising/crm_fundraising.py b/addons/crm_fundraising/crm_fundraising.py
index 76d0ca8fdd5..53217fea73e 100644
--- a/addons/crm_fundraising/crm_fundraising.py
+++ b/addons/crm_fundraising/crm_fundraising.py
@@ -108,6 +108,19 @@ class crm_fundraising(crm.crm_case, osv.osv):
             'planned_revenue': 0.0,
     }
 
+    def case_get_note_msg_prefix(self, cr, uid, id, context=None):
+        return 'Fund'
+
+    def create(self, cr, uid, vals, context=None):
+        obj_id = super(crm_fundraising, self).create(cr, uid, vals, context)
+        self.create_send_note(cr, uid, [obj_id], context=context)
+        return obj_id
+
+    def create_send_note(self, cr, uid, ids, context=None):
+        for id in ids:
+            msg = '%s has been <b>created</b>.' % (self.case_get_note_msg_prefix(cr, uid, id, context=context))
+            self.message_append_note(cr, uid, [id], body=msg, context=context)
+        return True
 
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

From e26135121ffec3d49ebda680b45af74a69fdcb6e Mon Sep 17 00:00:00 2001
From: "Turkesh Patel (Open ERP)" <tpa@tinyerp.com>
Date: Thu, 3 May 2012 11:01:26 +0530
Subject: [PATCH 5/6] [IMP] crm_helpdesk: rename message_ids_social to
 message_ids

bzr revid: tpa@tinyerp.com-20120503053126-wzgqhamf2hcd10pw
---
 addons/crm_fundraising/crm_fundraising_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/crm_fundraising/crm_fundraising_view.xml b/addons/crm_fundraising/crm_fundraising_view.xml
index 02116f1536c..8de4482f4df 100644
--- a/addons/crm_fundraising/crm_fundraising_view.xml
+++ b/addons/crm_fundraising/crm_fundraising_view.xml
@@ -153,7 +153,7 @@
                     </notebook>
                 </sheet>
                 <div class="oe_form_sheet_width">
-                    <field name="message_ids_social" colspan="4" widget="ThreadView" nolabel="1"/>
+                    <field name="message_ids" colspan="4" widget="ThreadView" nolabel="1"/>
                 </div>
                 </form>
             </field>

From 205a7eed6db6dd9f69ea9a4233e556b7cd24b95f Mon Sep 17 00:00:00 2001
From: "Turkesh Patel (Open ERP)" <tpa@tinyerp.com>
Date: Mon, 7 May 2012 16:46:55 +0530
Subject: [PATCH 6/6] [IMP] remove send mail button.

bzr revid: tpa@tinyerp.com-20120507111655-ce8kxrtqf38ufhtq
---
 addons/crm_fundraising/crm_fundraising_view.xml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/addons/crm_fundraising/crm_fundraising_view.xml b/addons/crm_fundraising/crm_fundraising_view.xml
index 8de4482f4df..80f51a9dfee 100644
--- a/addons/crm_fundraising/crm_fundraising_view.xml
+++ b/addons/crm_fundraising/crm_fundraising_view.xml
@@ -86,9 +86,6 @@
                         <field name="date"/>
                         <field name="categ_id" select="1" widget="selection" domain="[('object_id.model', '=', 'crm.fundraising')]"/>
                         <field name="type_id" string="Payment Mode" select="1" widget="selection"/>
-                        <button string="Send New Email"
-	                        name="%(mail.action_email_compose_message_wizard)d"
-	                        icon="terp-mail-message-new" type="action"/>
                     </group>
                     <notebook colspan="4">
                         <page string="Funds">