Khushboo Bhatt(openerp) has proposed merging
lp:~openerp-dev/openobject-addons/trunk-addons25-crm-sales-kbh into
lp:openobject-addons.
Requested reviews:
OpenERP Core Team (openerp)
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-addons25-crm-sales-kbh/+merge/136385
Hello,
I have solved following points.
- Sales/Invoicing/Order Lines to Invoice:buttons at bottom
- chatter message when we merge leads/opportunities is not well formatted
- in the Order Lines to Invoice menuitem, the most recent elements should
appear first in the list
- On opportunities kanban view, action name is "Log Call" it should be
"Schedule/Log Call"
Thanks,
KBH.
--
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-addons25-crm-sales-kbh/+merge/136385
Your team OpenERP R&D Team is subscribed to branch
lp:~openerp-dev/openobject-addons/trunk-addons25-crm-sales-kbh.
=== modified file 'crm/crm_lead.py'
--- crm/crm_lead.py 2012-11-26 21:52:41 +0000
+++ crm/crm_lead.py 2012-11-27 12:11:42 +0000
@@ -457,6 +457,7 @@
def _mail_body(self, cr, uid, lead, fields, title=False, context=None):
body = []
+ str = ""
if title:
body.append("%s\n" % (title))
for field_name in fields:
@@ -472,13 +473,20 @@
else:
key = field.selection
value = dict(key).get(lead[field_name], lead[field_name])
+ body.append("%s: %s" % (field.string, value or ''))
elif field._type == 'many2one':
if lead[field_name]:
value = lead[field_name].name_get()[0][1]
+ body.append("%s: %s" % (field.string, value or ''))
+ elif field._type == 'many2many':
+ if lead[field_name]:
+ for val in lead[field_name]:
+ field_value = val.name_get()[0][1]
+ str += field_value + ","
+ body.append("%s: %s" % (field.string, str or ''))
else:
value = lead[field_name]
-
- body.append("%s: %s" % (field.string, value or ''))
+ body.append("%s: %s" % (field.string, value or ''))
return "\n".join(body + ['---'])
def _merge_notification(self, cr, uid, opportunity_id, opportunities, context=None):
=== modified file 'crm/crm_lead_view.xml'
--- crm/crm_lead_view.xml 2012-11-26 07:45:10 +0000
+++ crm/crm_lead_view.xml 2012-11-27 12:11:42 +0000
@@ -308,7 +308,7 @@
<t t-if="widget.view.is_action_enabled('edit')"><li><a type="edit">Edit...</a></li></t>
<t t-if="widget.view.is_action_enabled('delete')"><li><a type="delete">Delete</a></li></t>
<li><a name="%(mail.action_email_compose_message_wizard)d" type="action">Send Email</a></li>
- <li><a name="%(opportunity2phonecall_act)d" type="action">Log Call</a></li>
+ <li><a name="%(opportunity2phonecall_act)d" type="action">Schedule/Log Call</a></li>
<li><a name="action_makeMeeting" type="object">Schedule Meeting</a></li>
<li><ul class="oe_kanban_colorpicker" data-field="color"/></li>
</ul>
=== modified file 'sale/sale.py'
--- sale/sale.py 2012-11-26 15:51:39 +0000
+++ sale/sale.py 2012-11-27 12:11:42 +0000
@@ -763,7 +763,7 @@
'salesman_id':fields.related('order_id', 'user_id', type='many2one', relation='res.users', store=True, string='Salesperson'),
'company_id': fields.related('order_id', 'company_id', type='many2one', relation='res.company', string='Company', store=True, readonly=True),
}
- _order = 'sequence, id'
+ _order = 'sequence, order_id desc'
_defaults = {
'product_uom' : _get_uom_id,
'discount': 0.0,
=== modified file 'sale/wizard/sale_line_invoice.xml'
--- sale/wizard/sale_line_invoice.xml 2012-08-09 06:05:16 +0000
+++ sale/wizard/sale_line_invoice.xml 2012-11-27 12:11:42 +0000
@@ -6,11 +6,11 @@
<field name="model">sale.order.line.make.invoice</field>
<field name="arch" type="xml">
<form string="Create invoices" version="7.0">
- <header>
+ <footer>
<button name="make_invoices" string="Create Invoices" type="object" class="oe_highlight"/>
or
<button string="Cancel" class="oe_link" special="cancel" />
- </header>
+ </footer>
<separator string="Do you really want to create the invoice(s)?" />
</form>
</field>
_______________________________________________
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
