Merge branch 'master' of github.com:webnotes/erpnext
diff --git a/install_erpnext.py b/install_erpnext.py
index a10ce10..6613849 100644
--- a/install_erpnext.py
+++ b/install_erpnext.py
@@ -47,7 +47,7 @@
# 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 @@
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)"
diff --git a/utilities/transaction_base.py b/utilities/transaction_base.py
index fc746c4..6628601 100644
--- a/utilities/transaction_base.py
+++ b/utilities/transaction_base.py
@@ -129,7 +129,8 @@
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