Shiloh/brotherton-erpnext
1
0
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 2016-12-14 14:33:06 +05:30
commit a9ecc0b700
3 changed files with 7 additions and 3 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
import frappe
__version__ = '7.1.24'
__version__ = '7.1.25'
def get_default_company(user=None):
'''Get default company for user'''

2
erpnext/accounts/doctype/pricing_rule/pricing_rule.py
View File

@ -138,7 +138,7 @@ def get_pricing_rule_for_item(args):
})
if args.ignore_pricing_rule or not args.item_code:
if args.name and args.get("pricing_rule"):
if frappe.db.exists(args.doctype, args.name) and args.get("pricing_rule"):
item_details = remove_pricing_rule(args, item_details)
return item_details

6
erpnext/utilities/doctype/address/address.py
View File

@ -10,6 +10,7 @@ from frappe.utils import cstr
from frappe.model.document import Document
from jinja2 import TemplateSyntaxError
from frappe.utils.user import is_website_user
from frappe.model.naming import make_autoname
class Address(Document):
def __setup__(self):
@ -21,7 +22,10 @@ class Address(Document):
or self.supplier or self.sales_partner or self.lead
if self.address_title:
self.name = cstr(self.address_title).strip() + "-" + cstr(self.address_type).strip()
self.name = (cstr(self.address_title).strip() + "-" + cstr(self.address_type).strip())
if frappe.db.exists("Address", self.name):
self.name = make_autoname(cstr(self.address_title).strip() + "-" +
cstr(self.address_type).strip() + "-.#")
else:
throw(_("Address Title is mandatory."))