Shiloh/brotherton-erpnext
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into develop

Browse Source
This commit is contained in:
Nabin Hait 2017-05-23 17:16:19 +05:30
commit c9f5d84742
3 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
erpnext/__init__.py
View File

@ -2,7 +2,7 @@
from __future__ import unicode_literals from __future__ import unicode_literals
import frappe import frappe
__version__ = '8.0.34' __version__ = '8.0.35'
def get_default_company(user=None): def get_default_company(user=None):

9
erpnext/accounts/page/pos/pos.js
View File

@ -355,8 +355,13 @@ erpnext.pos.PointOfSale = erpnext.taxes_and_totals.extend({
this.print_template_data = frappe.render_template("print_template", { this.print_template_data = frappe.render_template("print_template", {
content: this.print_template, content: this.print_template,
title: "POS", base_url: frappe.urllib.get_base_url(), print_css: frappe.boot.print_css, title: "POS",
print_settings: this.print_settings, header: this.letter_head.header, footer: this.letter_head.footer 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
}) })
}, },

1
erpnext/crm/doctype/lead/lead.py
View File

@ -43,6 +43,7 @@ class Lead(SellingController):
if self.email_id == self.contact_by: if self.email_id == self.contact_by:
frappe.throw(_("Next Contact By cannot be same as the Lead Email Address")) 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) self.image = has_gravatar(self.email_id)
if self.contact_date and getdate(self.contact_date) < getdate(nowdate()): if self.contact_date and getdate(self.contact_date) < getdate(nowdate()):