From 29d64cae3447e7e99484edb168a1176529b827c4 Mon Sep 17 00:00:00 2001 From: Faris Ansari Date: Tue, 23 May 2017 17:12:51 +0530 Subject: [PATCH 1/3] POS print format fix (#8973) --- erpnext/accounts/page/pos/pos.js | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/erpnext/accounts/page/pos/pos.js b/erpnext/accounts/page/pos/pos.js index da4a3b7f25..026cdc0f0a 100644 --- a/erpnext/accounts/page/pos/pos.js +++ b/erpnext/accounts/page/pos/pos.js @@ -355,8 +355,13 @@ erpnext.pos.PointOfSale = erpnext.taxes_and_totals.extend({ this.print_template_data = frappe.render_template("print_template", { content: this.print_template, - title: "POS", base_url: frappe.urllib.get_base_url(), print_css: frappe.boot.print_css, - print_settings: this.print_settings, header: this.letter_head.header, footer: this.letter_head.footer + title: "POS", + base_url: frappe.urllib.get_base_url(), + print_css: frappe.boot.print_css, + print_settings: this.print_settings, + header: this.letter_head.header, + footer: this.letter_head.footer, + landscape: false }) }, From fe0564505121333097e0527a69be2909fe3c40b3 Mon Sep 17 00:00:00 2001 From: Manas Solanki Date: Tue, 23 May 2017 17:13:26 +0530 Subject: [PATCH 2/3] fix issue when image not saved after attaching (#8957) --- erpnext/crm/doctype/lead/lead.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/erpnext/crm/doctype/lead/lead.py b/erpnext/crm/doctype/lead/lead.py index e6659f3890..ccbb5369aa 100644 --- a/erpnext/crm/doctype/lead/lead.py +++ b/erpnext/crm/doctype/lead/lead.py @@ -43,7 +43,8 @@ class Lead(SellingController): if self.email_id == self.contact_by: frappe.throw(_("Next Contact By cannot be same as the Lead Email Address")) - self.image = has_gravatar(self.email_id) + if self.is_new() or not self.image: + self.image = has_gravatar(self.email_id) if self.contact_date and self.contact_date < now(): frappe.throw(_("Next Contact Date cannot be in the past")) From 8854f8bd502a3f1582c7bd7336e57abf88fc85b8 Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Tue, 23 May 2017 17:46:19 +0600 Subject: [PATCH 3/3] bumped to version 8.0.35 --- erpnext/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/erpnext/__init__.py b/erpnext/__init__.py index eb69d19fd3..ca5cf9aaf6 100644 --- a/erpnext/__init__.py +++ b/erpnext/__init__.py @@ -2,7 +2,7 @@ from __future__ import unicode_literals import frappe -__version__ = '8.0.34' +__version__ = '8.0.35' def get_default_company(user=None):