Commit Graph

27578 Commits

Author SHA1 Message Date
Aditya Hase
c052ce61f7 fix: Set file permissions 755 on travis/run-tests.sh 2019-06-20 20:10:53 +05:30
Aditya Hase
bb5ca5a01f fix(py3): Convert filter to list 2019-06-20 20:10:53 +05:30
Aditya Hase
63ddff867a chore: Temporarily disable flake rule F821 2019-06-20 20:10:53 +05:30
Aditya Hase
f397acc936 fix(travis): Refactor .travis.yml 2019-06-20 20:10:53 +05:30
Aditya Hase
3fa112d8a7 feat(travis): Python 3.6 tests 2019-06-20 20:10:53 +05:30
Deepesh Garg
d11e481888
Merge pull request #18011 from surajshetty3416/fix-accounting-dimension-permission
fix: Get Accounting Dimension only if user has read permission on it
2019-06-20 19:44:59 +05:30
rohitwaghchaure
d2061b44dd fix: could not find company all (#17978) 2019-06-20 19:13:54 +05:30
Deepesh Garg
23deb6f79b fix: Default cost center fix for delivery note item (#17990) 2019-06-20 19:11:58 +05:30
Suraj Shetty
01f56b867e fix: Return empty array to avoid failure 2019-06-20 18:07:58 +05:30
Suraj Shetty
b663966c68 fix: Use can_read API 2019-06-20 18:00:19 +05:30
Rushabh Mehta
55c7b69afb
Merge pull request #17998 from netchampfaris/app-logo-url
fix: App logo URL
2019-06-20 17:53:40 +05:30
Deepesh Garg
ffa4ba06ec
Merge pull request #18010 from deepeshgarg007/gst_tax_rate_fixes
fix: GST report fixes
2019-06-20 17:22:59 +05:30
Suraj Shetty
da629810ad fix: Get accounting dimensions only if user has access 2019-06-20 17:20:19 +05:30
deepeshgarg007
6ef38ebf34 fix: GSTR report fixes 2019-06-20 15:55:09 +05:30
deepeshgarg007
50f4fc48a5 fix: GSTR report fixes 2019-06-20 15:53:14 +05:30
deepeshgarg007
5ff830b6f4 fix: GSTR report fixes 2019-06-20 15:50:02 +05:30
deepeshgarg007
a8e49b8afd Revert "fix: GSTR-2 Report fixes"
This reverts commit a55413cb0d3828c20ad53e54ad7abe3ca2492668.
2019-06-20 15:26:04 +05:30
deepeshgarg007
7483cb49fe Revert "fix: GSTR-1 Report fixes"
This reverts commit 7592e0b588ad72d3e79cd101e94102ab1c1829f0.
2019-06-20 15:25:06 +05:30
Rushabh Mehta
5162b7457f
Merge pull request #17918 from Alchez/develop-item-code-gen
fix(stock): Remove hardcoded validation for Item
2019-06-20 14:21:57 +05:30
Mangesh-Khairnar
8619fc7413 fix: fetch rate only if field is empty 2019-06-20 12:02:47 +05:30
Himanshu
014dc1729d
Merge branch 'develop' into sla_fix 2019-06-20 11:36:29 +05:30
Faris Ansari
23f9b6156f
fix(Opportunity): Don't assign to Guest (#17996)
If Opportunity is created from Website, it breaks because
the assign_to user is Guest
2019-06-20 11:34:14 +05:30
Himanshu Warekar
a1c1f74d84 Merge branch 'develop' of https://github.com/frappe/erpnext into sla_fix 2019-06-20 11:33:06 +05:30
Himanshu Warekar
a03aa0014e feat: update sla using custom script 2019-06-20 11:32:49 +05:30
Aditya Hase
903d5201b4
fix(tests): Do not test order of features in Location (#17983)
fix(tests): Do not test order of features in Location
2019-06-20 11:29:59 +05:30
Himanshu
d82175da36
Merge branch 'develop' into sla_fix 2019-06-20 10:54:01 +05:30
Himanshu Warekar
bbe84ac0ef feat: change apply_to to entity 2019-06-20 10:53:34 +05:30
Himanshu Warekar
ed50452800 Merge branch 'sla_fix' of https://github.com/hrwx/erpnext into sla_fix 2019-06-20 10:01:05 +05:30
Himanshu Warekar
41bf0c6855 feat: filter sla based on customer in issue 2019-06-20 10:00:11 +05:30
Aditya Hase
d5cd0a05d0
fix(tests): Timesheet tests (#17982)
fix(tests): Timesheet tests
2019-06-20 09:40:56 +05:30
Aditya Hase
b96956f35c
Merge branch 'develop' into fix-timesheet-tests 2019-06-20 09:40:23 +05:30
Deepesh Garg
12f2096846
Merge pull request #17995 from deepeshgarg007/hsn_summary_develop
fix: From date and to date filters in HSN wise summary of out ward supplies
2019-06-19 21:48:15 +05:30
Suraj Shetty
b9f346fc88
Merge branch 'develop' into call-summary-dialog 2019-06-19 19:18:52 +05:30
Faris Ansari
357592f55e fix: Remove logo replace logic 2019-06-19 19:17:50 +05:30
Faris Ansari
4a1c7ddb09 fix: App logo URL 2019-06-19 19:15:37 +05:30
Aditya Hase
6a40c491df
Merge branch 'develop' into fix-location-tests 2019-06-19 18:50:00 +05:30
deepeshgarg007
ecc670047e fix: From date and to date filters in HSN wise summary of out ward supplies 2019-06-19 18:36:24 +05:30
Suraj Shetty
16baa3b13a fix: Move back .pylintrc to root 2019-06-19 18:35:36 +05:30
Suraj Shetty
d4420afb72 chore: Remove unwanted files 2019-06-19 18:33:56 +05:30
Deepesh Garg
2b739b304e
Merge pull request #17970 from Mangesh-Khairnar/employee-benefit-application
fix(employee-benefit-application): remove query from setup
2019-06-19 18:18:47 +05:30
Mangesh-Khairnar
0ef1df72ad refactor: fetch rate directly from the account head 2019-06-19 17:50:33 +05:30
Himanshu
3caf7b80e5
Merge branch 'develop' into sla_fix 2019-06-19 16:08:35 +05:30
rohitwaghchaure
d849ce7ce0
Merge pull request #17980 from adityahase/fix-buying-items-rate
fix: Consider discount_amount only when provided to calculate rate
2019-06-19 14:47:06 +05:30
Himanshu Warekar
24cef8e26e Merge branch 'sla_fix' of https://github.com/hrwx/erpnext into sla_fix 2019-06-19 14:43:59 +05:30
Himanshu Warekar
36d6e570c4 patch: try catch to handle TableMissingError 2019-06-19 14:43:21 +05:30
rohitwaghchaure
40c5fcc9cc
Merge pull request #17967 from Alchez/develop-delivery-email
fix(delivery): Add items to context for dispatch notification email
2019-06-19 14:37:23 +05:30
Himanshu
7bb1402a37
Merge branch 'develop' into sla_fix 2019-06-19 13:42:49 +05:30
Faris Ansari
2632107129
fix: User MultiSelectList control for Party filter (#17943)
* fix: User MultiSelectList control for Party filter

The comma based filter wouldn't work for values that had comma in them

* fix: Replace with MultiSelectList in reports

* fix: Parse json instead of string split
2019-06-19 12:15:37 +05:30
Himanshu Warekar
c86954ce9b Merge branch 'sla_fix' of https://github.com/hrwx/erpnext into sla_fix 2019-06-19 12:03:24 +05:30
Himanshu Warekar
f4f7e781c5 debug: travis 2019-06-19 12:01:59 +05:30