schuetz3/schuetz3-erpnext
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:webnotes/erpnext into wsgi

Browse Source 
Conflicts:
	accounts/doctype/purchase_invoice/purchase_invoice.py
	accounts/doctype/sales_invoice/sales_invoice.txt
	selling/doctype/lead/lead.txt
	selling/doctype/opportunity/opportunity.txt
	stock/doctype/warehouse/warehouse.py
This commit is contained in:
Anand Doshi
2013-10-02 16:52:52 +05:30
parent ea9f845814 efa94ce1bf
commit fa228e9c9b
68 changed files with 1296 additions and 384 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
utilities/transaction_base.py
View File

@@ -143,7 +143,8 @@ class TransactionBase(StatusUpdater):
self.doc.fields.update(self.get_lead_defaults())
def get_customer_address(self, args):
args = load_json(args)
args = load_json(args)
webnotes.errprint(args)
ret = {
'customer_address' : args["address"],
'address_display' : get_address_display(args["address"]),
@@ -425,6 +426,7 @@ def get_address_territory(address_doc):
def validate_conversion_rate(currency, conversion_rate, conversion_rate_label, company):
"""common validation for currency and price list currency"""
if conversion_rate == 0:
msgprint(conversion_rate_label + _(' cannot be 0'), raise_exception=True)