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

Revert bench-init changes (#15463)

Browse Source 
* Revert bench-init changes

* Fix test

* Remove debug flag
This commit is contained in:
Suraj Shetty 2018-09-21 15:46:44 +05:30 committed by Nabin Hait
parent bfc195dd8b
commit dabaec0dc5
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
erpnext/accounts/utils.py
View File

@ -127,7 +127,7 @@ def get_balance_on(account=None, date=None, party_type=None, party=None, company
)""" % (cc.lft, cc.rgt)) )""" % (cc.lft, cc.rgt))
else: 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: if account:

6
travis/bench_init.sh
View File

@ -1,8 +1,8 @@
#!/bin/bash #!/bin/bash
cd ~/ 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; read response;
[ $response == '200' ] && branch='pg-poc' || branch='develop'; [ $response == '200' ] && branch=$TRAVIS_BRANCH || branch='develop';
bench init frappe-bench --frappe-path https://github.com/surajshetty3416/frappe.git --frappe-branch $branch --python $(which python) bench init frappe-bench --frappe-path https://github.com/frappe/frappe.git --frappe-branch $branch --python $(which python)
) )