From ac5f9e3296cd40f6dccb1973aba3885f7b125268 Mon Sep 17 00:00:00 2001 From: "Khushboo Bhatt (Open ERP)" Date: Mon, 26 Nov 2012 11:04:12 +0530 Subject: [PATCH 1/9] [FIX]sale:buttons position changed in footer bzr revid: kbh@tinyerp.com-20121126053412-c5s14peqlrl79gp8 --- addons/sale/wizard/sale_line_invoice.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/sale/wizard/sale_line_invoice.xml b/addons/sale/wizard/sale_line_invoice.xml index 2eb5d1ae47f..a089c543aee 100644 --- a/addons/sale/wizard/sale_line_invoice.xml +++ b/addons/sale/wizard/sale_line_invoice.xml @@ -6,11 +6,11 @@ sale.order.line.make.invoice
-
+
+
From 55747ec917227b8b6fb11cdff6aab32effdc4bc4 Mon Sep 17 00:00:00 2001 From: "Khushboo Bhatt (Open ERP)" Date: Mon, 26 Nov 2012 11:38:53 +0530 Subject: [PATCH 2/9] [FIX]sale:in the Order Lines to Invoice menuitem, the most recent elements should appear first in the list bzr revid: kbh@tinyerp.com-20121126060853-6wpuyy8ps9r30khd --- addons/sale/sale.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/sale/sale.py b/addons/sale/sale.py index 382fe093907..f26067ddeca 100644 --- a/addons/sale/sale.py +++ b/addons/sale/sale.py @@ -759,7 +759,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 = 'sequence, order_id desc' _defaults = { 'product_uom' : _get_uom_id, 'discount': 0.0, From c4bbc734ad171b155d7b08bd01594672e5c2b008 Mon Sep 17 00:00:00 2001 From: "Khushboo Bhatt (Open ERP)" Date: Mon, 26 Nov 2012 11:42:02 +0530 Subject: [PATCH 3/9] [FIX]CRM:string changed bzr revid: kbh@tinyerp.com-20121126061202-dq38zs0naqrfohwj --- addons/crm/crm_lead_view.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml index d06b6232b5e..889c0acffbf 100644 --- a/addons/crm/crm_lead_view.xml +++ b/addons/crm/crm_lead_view.xml @@ -308,7 +308,7 @@
  • Edit...
    •
  • Delete
    •
  • Send Email
    • -
  • Log Call
    • +
  • Schedule/Log Call
  • Schedule Meeting
    From bc5884e3053430c3d53f75167f33c7a78de5b8e3 Mon Sep 17 00:00:00 2001 From: "Khushboo Bhatt (Open ERP)" Date: Mon, 26 Nov 2012 14:37:33 +0530 Subject: [PATCH 4/9] [FIX]CRM:merged opportunities category bzr revid: kbh@tinyerp.com-20121126090733-qtudsnzko4sn7dqz --- addons/crm/crm_lead.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/addons/crm/crm_lead.py b/addons/crm/crm_lead.py index 4bc01047b73..fc07571f55e 100644 --- a/addons/crm/crm_lead.py +++ b/addons/crm/crm_lead.py @@ -475,6 +475,9 @@ 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]: + value = lead[field_name][0].name_get()[0][1] else: value = lead[field_name] From 6daa367cad317671c4b749e74503dd336947fb8b Mon Sep 17 00:00:00 2001 From: "Khushboo Bhatt (Open ERP)" Date: Tue, 27 Nov 2012 14:24:21 +0530 Subject: [PATCH 5/9] [FIX] chatter message when we merge leads/opportunities is not well formatted bzr revid: kbh@tinyerp.com-20121127085421-o4exf3xdcu1gt5e9 --- addons/crm/crm_lead.py | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/addons/crm/crm_lead.py b/addons/crm/crm_lead.py index fc07571f55e..824c509a0fd 100644 --- a/addons/crm/crm_lead.py +++ b/addons/crm/crm_lead.py @@ -457,6 +457,7 @@ class crm_lead(base_stage, format_address, osv.osv): 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,16 +473,20 @@ class crm_lead(base_stage, format_address, osv.osv): 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]: - value = lead[field_name][0].name_get()[0][1] + 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): From 3f626523ac7576ce5711d3274dd223996a3df07e Mon Sep 17 00:00:00 2001 From: "Khushboo Bhatt (Open ERP)" Date: Wed, 28 Nov 2012 11:06:58 +0530 Subject: [PATCH 6/9] [IMP]improve code for merge lead/opportunity message bzr revid: kbh@tinyerp.com-20121128053658-kiosagyvz7s78x4s --- addons/crm/crm_lead.py | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/addons/crm/crm_lead.py b/addons/crm/crm_lead.py index 824c509a0fd..5d73a14b692 100644 --- a/addons/crm/crm_lead.py +++ b/addons/crm/crm_lead.py @@ -457,7 +457,6 @@ class crm_lead(base_stage, format_address, osv.osv): 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: @@ -465,7 +464,7 @@ class crm_lead(base_stage, format_address, osv.osv): if field_info is None: continue field = field_info.column - value = None + value = None or '' if field._type == 'selection': if hasattr(field.selection, '__call__'): @@ -473,20 +472,18 @@ class crm_lead(base_stage, format_address, osv.osv): 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 '')) + value += field_value + "," 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): From 2a5e4e9308c903b5ad997e2e1ebdaccd70bec995 Mon Sep 17 00:00:00 2001 From: "Khushboo Bhatt (Open ERP)" Date: Wed, 28 Nov 2012 11:23:37 +0530 Subject: [PATCH 7/9] [IMP]improve code bzr revid: kbh@tinyerp.com-20121128055337-0s5cz2gkaou7unj0 --- addons/crm/crm_lead.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/crm/crm_lead.py b/addons/crm/crm_lead.py index 5d73a14b692..c66cf23c040 100644 --- a/addons/crm/crm_lead.py +++ b/addons/crm/crm_lead.py @@ -464,7 +464,7 @@ class crm_lead(base_stage, format_address, osv.osv): if field_info is None: continue field = field_info.column - value = None or '' + value = '' if field._type == 'selection': if hasattr(field.selection, '__call__'): From 616cbc4b9bb49eaf7d2c731c655b5f90158469f4 Mon Sep 17 00:00:00 2001 From: "Khushboo Bhatt (Open ERP)" Date: Thu, 29 Nov 2012 14:22:06 +0530 Subject: [PATCH 8/9] [REM]sale:removed unnecessary header bzr revid: kbh@tinyerp.com-20121129085206-5a1g7x3dhf15ffzv --- addons/sale/wizard/sale_line_invoice.xml | 3 --- 1 file changed, 3 deletions(-) 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 @@ sale.order.line.make.invoice
    -
    - -

    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. From 8b251e53ca3ea108e474301112e16988c4e19772 Mon Sep 17 00:00:00 2001 From: "Khushboo Bhatt (Open ERP)" Date: Thu, 29 Nov 2012 18:47:20 +0530 Subject: [PATCH 9/9] [REM]crm:message improved for merge oppertunities/lead bzr revid: kbh@tinyerp.com-20121129131720-iq54wku42h55bfdm --- addons/crm/crm_lead.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/crm/crm_lead.py b/addons/crm/crm_lead.py index c66cf23c040..cafaf87557e 100644 --- a/addons/crm/crm_lead.py +++ b/addons/crm/crm_lead.py @@ -484,7 +484,7 @@ class crm_lead(base_stage, format_address, osv.osv): value = lead[field_name] body.append("%s: %s" % (field.string, value or '')) - return "\n".join(body + ['---']) + return "
    ".join(body + ['
    ']) def _merge_notification(self, cr, uid, opportunity_id, opportunities, context=None): #TOFIX: mail template should be used instead of fix body, subject text