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

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

Browse Source
This commit is contained in:
Nabin Hait 2013-07-29 12:18:47 +05:30
commit bb7c82ab5b
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
install_erpnext.py
View File

@ -47,7 +47,7 @@ def validate_install():
# check distribution # check distribution
distribution = platform.linux_distribution()[0].lower().replace('"', '') distribution = platform.linux_distribution()[0].lower().replace('"', '')
print "Distribution = ", distribution 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") is_debian = distribution in ("debian", "ubuntu", "elementary os")
if not (is_redhat or is_debian): if not (is_redhat or is_debian):
@ -104,6 +104,7 @@ def update_config_for_redhat():
exec_in_shell("service %s restart" % service) exec_in_shell("service %s restart" % service)
def install_using_apt(): def install_using_apt():
exec_in_shell("apt-get update")
packages = "python python-setuptools python-mysqldb apache2 git memcached ntp vim screen htop" packages = "python python-setuptools python-mysqldb apache2 git memcached ntp vim screen htop"
print "-"*80 print "-"*80
print "Installing Packages: (This may take some time)" print "Installing Packages: (This may take some time)"

1
utilities/transaction_base.py
View File

@ -129,6 +129,7 @@ class TransactionBase(StatusUpdater):
supplier = webnotes.doc("Supplier", self.doc.supplier) supplier = webnotes.doc("Supplier", self.doc.supplier)
out["supplier_name"] = supplier.supplier_name out["supplier_name"] = supplier.supplier_name
if supplier.default_currency:
out["currency"] = supplier.default_currency out["currency"] = supplier.default_currency
return out return out