Merge branch 'master' into develop
diff --git a/erpnext/__init__.py b/erpnext/__init__.py
index eb69d19..ca5cf9a 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):
diff --git a/erpnext/accounts/page/pos/pos.js b/erpnext/accounts/page/pos/pos.js
index e36fa29..20b9268 100644
--- a/erpnext/accounts/page/pos/pos.js
+++ b/erpnext/accounts/page/pos/pos.js
@@ -355,8 +355,13 @@
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
})
},
diff --git a/erpnext/crm/doctype/lead/lead.py b/erpnext/crm/doctype/lead/lead.py
index a37caea..aafc128 100644
--- a/erpnext/crm/doctype/lead/lead.py
+++ b/erpnext/crm/doctype/lead/lead.py
@@ -43,7 +43,8 @@
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 getdate(self.contact_date) < getdate(nowdate()):
frappe.throw(_("Next Contact Date cannot be in the past"))