Turkesh Patel (openERP) has proposed merging
lp:~openerp-dev/openobject-addons/trunk-social-crm_fundraising-tpa into
lp:~openerp-dev/openobject-addons/trunk-openchatter.
Requested reviews:
OpenERP R&D Team (openerp-dev)
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-social-crm_fundraising-tpa/+merge/104226
crm_fundraising
=============================================
[IMP]: improved code to add chatter and remove communication and history.
--
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-social-crm_fundraising-tpa/+merge/104226
Your team OpenERP R&D Team is requested to review the proposed merge of
lp:~openerp-dev/openobject-addons/trunk-social-crm_fundraising-tpa into
lp:~openerp-dev/openobject-addons/trunk-openchatter.
=== modified file 'crm_fundraising/crm_fundraising.py'
--- crm_fundraising/crm_fundraising.py 2012-03-06 12:34:12 +0000
+++ crm_fundraising/crm_fundraising.py 2012-05-01 10:25:27 +0000
@@ -108,6 +108,19 @@
'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:
=== modified file 'crm_fundraising/crm_fundraising_view.xml'
--- crm_fundraising/crm_fundraising_view.xml 2012-04-25 11:51:39 +0000
+++ crm_fundraising/crm_fundraising_view.xml 2012-05-01 10:25:27 +0000
@@ -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 & 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>
_______________________________________________
Mailing list: https://launchpad.net/~openerp-dev-gtk
Post to : [email protected]
Unsubscribe : https://launchpad.net/~openerp-dev-gtk
More help : https://help.launchpad.net/ListHelp
