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

Merge branch 'develop' of https://github.com/frappe/erpnext into stock-dashboard

Browse Source
This commit is contained in:
marination 2020-05-15 01:36:30 +05:30
commit fd8e0becd0
4 changed files with 5 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
.travis.yml
View File

@ -1,6 +1,5 @@
dist: trusty
language: python language: python
dist: trusty
git: git:
depth: 1 depth: 1
@ -14,21 +13,10 @@ addons:
jobs: jobs:
include: include:
- name: "Python 2.7 Server Side Test"
python: 2.7
script: bench --site test_site run-tests --app erpnext --coverage
- name: "Python 3.6 Server Side Test" - name: "Python 3.6 Server Side Test"
python: 3.6 python: 3.6
script: bench --site test_site run-tests --app erpnext --coverage script: bench --site test_site run-tests --app erpnext --coverage
- name: "Python 2.7 Patch Test"
python: 2.7
before_script:
- wget http://build.erpnext.com/20171108_190013_955977f8_database.sql.gz
- bench --site test_site --force restore ~/frappe-bench/20171108_190013_955977f8_database.sql.gz
script: bench --site test_site migrate
- name: "Python 3.6 Patch Test" - name: "Python 3.6 Patch Test"
python: 3.6 python: 3.6
before_script: before_script:
@ -40,8 +28,7 @@ install:
- cd ~ - cd ~
- nvm install 10 - nvm install 10
- git clone https://github.com/frappe/bench --depth 1 - pip install frappe-bench
- pip install -e ./bench
- git clone https://github.com/frappe/frappe --branch $TRAVIS_BRANCH --depth 1 - git clone https://github.com/frappe/frappe --branch $TRAVIS_BRANCH --depth 1
- bench init --skip-assets --frappe-path ~/frappe --python $(which python) frappe-bench - bench init --skip-assets --frappe-path ~/frappe --python $(which python) frappe-bench

2
erpnext/accounts/dashboard_chart_source/account_balance_timeline/account_balance_timeline.py
View File

@ -14,7 +14,7 @@ from frappe.utils.nestedset import get_descendants_of
@frappe.whitelist() @frappe.whitelist()
@cache_source @cache_source
def get(chart_name = None, chart = None, no_cache = None, filters = None, from_date = None, def get(chart_name = None, chart = None, no_cache = None, filters = None, from_date = None,
to_date = None, timespan = None, time_interval = None): to_date = None, timespan = None, time_interval = None, heatmap_year = None):
if chart_name: if chart_name:
chart = frappe.get_doc('Dashboard Chart', chart_name) chart = frappe.get_doc('Dashboard Chart', chart_name)
else: else:

2
erpnext/accounts/report/general_ledger/general_ledger.js
View File

@ -53,7 +53,7 @@ frappe.query_reports["General Ledger"] = {
"label": __("Voucher No"), "label": __("Voucher No"),
"fieldtype": "Data", "fieldtype": "Data",
on_change: function() { on_change: function() {
frappe.query_report.set_filter_value('group_by', ""); frappe.query_report.set_filter_value('group_by', "Group by Voucher (Consolidated)");
} }
}, },
{ {

4
erpnext/setup/doctype/company/test_company.py
View File

@ -47,9 +47,7 @@ class TestCompany(unittest.TestCase):
frappe.delete_doc("Company", "COA from Existing Company") frappe.delete_doc("Company", "COA from Existing Company")
def test_coa_based_on_country_template(self): def test_coa_based_on_country_template(self):
countries = ["India", "Brazil", "United Arab Emirates", "Canada", "Germany", "France", countries = ["Canada", "Germany", "France"]
"Guatemala", "Indonesia", "Italy", "Mexico", "Nicaragua", "Netherlands", "Singapore",
"Brazil", "Argentina", "Hungary", "Taiwan"]
for country in countries: for country in countries:
templates = get_charts_for_country(country) templates = get_charts_for_country(country)