diff options
| author | Fabien Pinckaers <fp@tinyerp.com> | 2012-12-08 17:24:56 +0100 |
|---|---|---|
| committer | Fabien Pinckaers <fp@tinyerp.com> | 2012-12-08 17:24:56 +0100 |
| commit | c270aa7693db59bceb2c69cd88f945acf4f7a45c (patch) | |
| tree | 40479326570a334e2c08e94488acfba45e65c937 | |
| parent | dbe6afcb659b9ffea70ff0688daf9e853ba34e5c (diff) | |
| parent | 8b251e53ca3ea108e474301112e16988c4e19772 (diff) | |
[MERGE]
bzr revid: fp@tinyerp.com-20121208162456-f544eem3hs4sm8i7
| -rw-r--r-- | addons/crm/crm_lead.py | 10 | ||||
| -rw-r--r-- | addons/crm/crm_lead_view.xml | 2 | ||||
| -rw-r--r-- | addons/sale/sale.py | 2 | ||||
| -rw-r--r-- | addons/sale/wizard/sale_line_invoice.xml | 3 |
4 files changed, 9 insertions, 8 deletions
diff --git a/addons/crm/crm_lead.py b/addons/crm/crm_lead.py index d9701d63ba7..64c17c4be2f 100644 --- a/addons/crm/crm_lead.py +++ b/addons/crm/crm_lead.py @@ -537,7 +537,7 @@ class crm_lead(base_stage, format_address, osv.osv): if field_info is None: continue field = field_info.column - value = None + value = '' if field._type == 'selection': if hasattr(field.selection, '__call__'): @@ -548,12 +548,16 @@ class crm_lead(base_stage, format_address, osv.osv): elif field._type == 'many2one': if lead[field_name]: value = lead[field_name].name_get()[0][1] + elif field._type == 'many2many': + if lead[field_name]: + for val in lead[field_name]: + field_value = val.name_get()[0][1] + value += field_value + "," else: value = lead[field_name] body.append("%s: %s" % (field.string, value or '')) - - return "\n".join(body + ['---']) + return "<br/>".join(body + ['<br/>']) def _merge_notify(self, cr, uid, opportunity_id, opportunities, context=None): """ diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml index c64dca542b0..ce5d4555028 100644 --- a/addons/crm/crm_lead_view.xml +++ b/addons/crm/crm_lead_view.xml @@ -274,7 +274,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> diff --git a/addons/sale/sale.py b/addons/sale/sale.py index 614c0a558be..8bab265ae3b 100644 --- a/addons/sale/sale.py +++ b/addons/sale/sale.py @@ -742,7 +742,7 @@ class sale_order_line(osv.osv): '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 = 'order_id desc, sequence' _defaults = { 'product_uom' : _get_uom_id, 'discount': 0.0, diff --git a/addons/sale/wizard/sale_line_invoice.xml b/addons/sale/wizard/sale_line_invoice.xml index 6144ff489f4..720586e638c 100644 --- a/addons/sale/wizard/sale_line_invoice.xml +++ b/addons/sale/wizard/sale_line_invoice.xml @@ -6,9 +6,6 @@ <field name="model">sale.order.line.make.invoice</field> <field name="arch" type="xml"> <form string="Create invoices" version="7.0"> - <header> - <separator string="Do you want to invoice the selected sale order lines?" /> - </header> <p class="oe_grey"> All items in these order lines will be invoiced. You can also invoice a percentage of the sale order or a fixed price (for advances) directly from the sale order form if you prefer. |