Merge branch 'master' into develop
This commit is contained in:
commit
c9f5d84742
@ -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):
|
||||
|
@ -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
|
||||
})
|
||||
},
|
||||
|
||||
|
@ -43,6 +43,7 @@ class Lead(SellingController):
|
||||
if self.email_id == self.contact_by:
|
||||
frappe.throw(_("Next Contact By cannot be same as the Lead Email Address"))
|
||||
|
||||
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()):
|
||||
|
Loading…
x
Reference in New Issue
Block a user