From dabaec0dc5f33f347f76fb8921abd2b94fe17cfc Mon Sep 17 00:00:00 2001 From: Suraj Shetty Date: Fri, 21 Sep 2018 15:46:44 +0530 Subject: [PATCH] Revert bench-init changes (#15463) * Revert bench-init changes * Fix test * Remove debug flag --- erpnext/accounts/utils.py | 2 +- travis/bench_init.sh | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/erpnext/accounts/utils.py b/erpnext/accounts/utils.py index 92ffd12e63b..d3566feaa94 100644 --- a/erpnext/accounts/utils.py +++ b/erpnext/accounts/utils.py @@ -127,7 +127,7 @@ def get_balance_on(account=None, date=None, party_type=None, party=None, company )""" % (cc.lft, cc.rgt)) else: - cond.append("""gle.cost_center = "%s" """ % (frappe.db.escape(cost_center, percent=False), )) + cond.append("""gle.cost_center = %s """ % (frappe.db.escape(cost_center, percent=False), )) if account: diff --git a/travis/bench_init.sh b/travis/bench_init.sh index 0fb7f3d6388..f96269b919c 100755 --- a/travis/bench_init.sh +++ b/travis/bench_init.sh @@ -1,8 +1,8 @@ #!/bin/bash cd ~/ -curl -I https://github.com/surajshetty3416/frappe/tree/pg-poc | head -n 1 | cut -d $' ' -f2 | ( +curl -I https://github.com/frappe/frappe/tree/$TRAVIS_BRANCH | head -n 1 | cut -d $' ' -f2 | ( read response; - [ $response == '200' ] && branch='pg-poc' || branch='develop'; - bench init frappe-bench --frappe-path https://github.com/surajshetty3416/frappe.git --frappe-branch $branch --python $(which python) + [ $response == '200' ] && branch=$TRAVIS_BRANCH || branch='develop'; + bench init frappe-bench --frappe-path https://github.com/frappe/frappe.git --frappe-branch $branch --python $(which python) )