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

Merge branch 'master' into staging-fixes

Browse Source
This commit is contained in:
Ameya Shenoy 2018-10-08 09:39:49 +00:00
commit ecba14e6cf
No known key found for this signature in database
GPG Key ID: AC016A555657D0A3
3 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
erpnext/__init__.py
View File

@ -5,7 +5,7 @@ import frappe
from erpnext.hooks import regional_overrides from erpnext.hooks import regional_overrides
from frappe.utils import getdate from frappe.utils import getdate
__version__ = '10.1.56' __version__ = '10.1.57'
def get_default_company(user=None): def get_default_company(user=None):
'''Get default company for user''' '''Get default company for user'''

9
erpnext/buying/doctype/supplier_quotation/supplier_quotation.py
View File

@ -60,7 +60,12 @@ class SupplierQuotation(BuyingController):
for rfq in rfq_list: for rfq in rfq_list:
doc = frappe.get_doc('Request for Quotation', rfq) doc = frappe.get_doc('Request for Quotation', rfq)
doc_sup = frappe.get_all('Request for Quotation Supplier', filters= doc_sup = frappe.get_all('Request for Quotation Supplier', filters=
{'parent': doc.name, 'supplier': self.supplier}, fields=['name', 'quote_status'])[0] {'parent': doc.name, 'supplier': self.supplier}, fields=['name', 'quote_status'])
doc_sup = doc_sup[0] if doc_sup else None
if not doc_sup:
frappe.throw(_("Supplier {0} not found in {1}").format(self.supplier,
"<a href='desk#Form/Request for Quotation/{0}'> Request for Quotation {0} </a>".format(doc.name)))
quote_status = _('Received') quote_status = _('Received')
for item in doc.items: for item in doc.items:
@ -152,4 +157,4 @@ def make_quotation(source_name, target_doc=None):
} }
}, target_doc) }, target_doc)
return doclist return doclist

2
erpnext/setup/setup_wizard/operations/taxes_setup.py
View File

@ -98,4 +98,4 @@ def get_country_wise_tax(country):
with open (os.path.join(os.path.dirname(__file__), "..", "data", "country_wise_tax.json")) as countrywise_tax: with open (os.path.join(os.path.dirname(__file__), "..", "data", "country_wise_tax.json")) as countrywise_tax:
data = json.load(countrywise_tax).get(country) data = json.load(countrywise_tax).get(country)
return data return data