From b1b564c20f16abfdeef8d6ff1a88f5f528bd2875 Mon Sep 17 00:00:00 2001 From: Anand Doshi Date: Mon, 29 Jul 2013 11:44:26 +0530 Subject: [PATCH 1/2] [fix] [minor] erpnext installer --- install_erpnext.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/install_erpnext.py b/install_erpnext.py index a10ce10680..66138496bb 100644 --- a/install_erpnext.py +++ b/install_erpnext.py @@ -47,7 +47,7 @@ def validate_install(): # check distribution distribution = platform.linux_distribution()[0].lower().replace('"', '') print "Distribution = ", distribution - is_redhat = distribution in ("redhat", "centos", "fedora") + is_redhat = distribution in ("redhat", "centos", "centos linux", "fedora") is_debian = distribution in ("debian", "ubuntu", "elementary os") if not (is_redhat or is_debian): @@ -104,6 +104,7 @@ def update_config_for_redhat(): exec_in_shell("service %s restart" % service) def install_using_apt(): + exec_in_shell("apt-get update") packages = "python python-setuptools python-mysqldb apache2 git memcached ntp vim screen htop" print "-"*80 print "Installing Packages: (This may take some time)" From c7280b497395fee929e136e100c93b16bba0c88b Mon Sep 17 00:00:00 2001 From: Anand Doshi Date: Mon, 29 Jul 2013 11:48:28 +0530 Subject: [PATCH 2/2] [fix] [minor] fetch supplier default currency only if it exists --- utilities/transaction_base.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/utilities/transaction_base.py b/utilities/transaction_base.py index fc746c4ef5..6628601c25 100644 --- a/utilities/transaction_base.py +++ b/utilities/transaction_base.py @@ -129,7 +129,8 @@ class TransactionBase(StatusUpdater): supplier = webnotes.doc("Supplier", self.doc.supplier) out["supplier_name"] = supplier.supplier_name - out["currency"] = supplier.default_currency + if supplier.default_currency: + out["currency"] = supplier.default_currency return out