Commit graph

18292 commits

Author SHA1 Message Date
Frappe Bot
54e97b9ebc Merge branch 'master' into develop 2019-02-28 10:05:32 +00:00
Frappe Bot
e64757f98e Merge branch 'hotfix' 2019-02-28 10:05:31 +00:00
Frappe Bot
c72c83c400 bumped to version 11.1.12 2019-02-28 10:05:31 +00:00
Rushabh Mehta
7c8ffe730c
Merge pull request #6986 from adityahase/fix-recorder
fix(recorder): List view enhancements
2019-02-28 13:02:57 +05:30
Rushabh Mehta
c0631e4e98
Merge pull request #6924 from ElasticRun/db_query_bug_fix
[bug fix]: prepare filter condition function
2019-02-28 13:02:15 +05:30
Rushabh Mehta
abfb44a047
Merge pull request #6993 from zerodhatech/fixtures
export fixtures of a specific app
2019-02-28 13:01:21 +05:30
Rushabh Mehta
a0de1e9614
Merge pull request #6988 from rmehta/communication-in-list
fix: Comment in list view
2019-02-28 12:57:03 +05:30
Rushabh Mehta
b480c6af44
Merge pull request #6995 from Anurag810/unlink_contact
fix: Unlink user with contact during user deletion.
2019-02-28 12:51:31 +05:30
Aditya Hase
0d3cffbe90 fix(recorder): Use keep-alive for RecorderDetail component
Preserves the state of list view instead of rerendering it while
switching between RequestDetail and RecorderDetail componennts
2019-02-28 10:22:51 +05:30
Aditya Hase
4f8eb57989 fix(recorder): Show tooltip for path in list view 2019-02-28 10:22:51 +05:30
Aditya Hase
1f18782c27 fix(recorder): Show Path instead of CMD in list view 2019-02-28 10:22:51 +05:30
Suraj Shetty
1b17d7d31a
Merge pull request #6998 from rohitwaghchaure/dont_do_commit_explicitly
fix: explicit commit submitting the document even if exception is raised

due to this doc used to get submitted even if the validation failed
2019-02-27 19:18:45 +05:30
Rohit Waghchaure
0ede34aeb3 fix: explicit commit submitting the document even if exception is raised 2019-02-27 17:10:41 +05:30
Suraj Shetty
e92dae4b55 fix: Error handling in user_permission.py 2019-02-27 17:00:10 +05:30
Rushabh Mehta
cbdfae74da
Merge pull request #6997 from adityahase/fix-desk
fix(desk): Use DocType instead of Doctype
2019-02-27 15:53:06 +05:30
Aditya Hase
cf1710edf7 fix(desk): Use DocType instead of Doctype 2019-02-27 15:38:16 +05:30
Anurag Mishra
4c3f1b8b82 fix: found user 2019-02-27 15:12:30 +05:30
Anurag Mishra
6082145e55 fix: unlink contact on deleting user 2019-02-27 14:51:34 +05:30
Aditya Hase
b0fbe251df
fix(desk_load): show onboarding status by number of records (#6992)
Frappe Recorder stats: from 5500 to about 500. Thanks to @adityahase for reporting.
2019-02-27 14:03:21 +05:30
Shridhar Patil
8aadcdf73e export fixtures of a specific app 2019-02-27 12:18:46 +05:30
Rushabh Mehta
f43ecf9b60 fix: revert automation changes added by mistake 2019-02-27 12:12:30 +05:30
Rushabh Mehta
f325df71be fix(tests): class msgprint used in tests 2019-02-27 12:03:35 +05:30
Rushabh Mehta
5b5874292c fix(style): msgprint should be narrower than the usual dialog 2019-02-27 11:33:02 +05:30
Prateeksha Singh
56f7dbd95f fix(desk_load): show onboarding status by number of records 2019-02-27 09:07:45 +05:30
Deepesh Garg
c9c607b71d fix: Chat message not found on refresh issue fix (#6990)
If chat message is deleted then chat message not found error message is shown on refresh.

![chat message](https://user-images.githubusercontent.com/42651287/53424137-a55d1100-3a08-11e9-909f-1c585ddb416a.png)
2019-02-26 23:55:32 +05:30
Rushabh Mehta
c22fcc61d7 fix(typo): comment.py 2019-02-26 17:11:01 +05:30
Rushabh Mehta
7b691cdd64 fix(comment): add communication to comment 2019-02-26 17:11:01 +05:30
Sagar Vora
d11dd760f8 Merge branch 'master' into develop 2019-02-26 17:06:13 +05:30
Sagar Vora
c9d60da566 Merge branch 'hotfix' 2019-02-26 17:04:51 +05:30
Sagar Vora
e1e47a22c1 bumped to version 11.1.11 2019-02-26 17:24:51 +05:50
Rushabh Mehta
56d958f1d3 fix: add communication in _comments for list view 2019-02-26 16:43:45 +05:30
Rushabh Mehta
22acfd3f0e fix(comment): add communication to comment 2019-02-26 16:24:31 +05:30
Deepesh Garg
f1bcaf6b83 fix: Wrong indicator and status fix in sales order containing workflow (#6967)
When a DocType has a workflow, it's docstatus is now handled by the Workflow. 
This resulted in a bug where the document status shows as "To bill and deliver" (Sales Order) instead of "Draft".
2019-02-26 16:21:06 +05:30
Suraj Shetty
bce52fdd31
Merge pull request #6979 from rohitwaghchaure/removed_duplicate_page
fix: Removed duplicate page user permissions for page and report
2019-02-26 16:18:39 +05:30
Faris Ansari
0a30746007
fix: Check if value is string 2019-02-26 16:16:38 +05:30
Rohan
302f781fd8 fix(report): Fix file exports for reports that show totals (#6902)
* fix(report): Fix file exports for reports that show totals

* fix(report): Add tests for Query Report export
2019-02-26 16:11:55 +05:30
Aditya Hase
c2b8f4a267 fix(list-view): Cast docnames to string (#6980) 2019-02-26 15:46:30 +05:30
Rushabh Mehta
08d5d9ae2c fix: default None to empty string for markdown conversions 2019-02-26 15:07:08 +05:30
Rushabh Mehta
65028d3f7d fix(comments): add indexing 2019-02-26 15:00:36 +05:30
Rushabh Mehta
b131aab0e3 fix: add comments patch 2019-02-26 14:39:51 +05:30
Rushabh Mehta
c34021bca9 fix(travis): move to node 10 2019-02-26 14:26:24 +05:30
Ishan Loya
fa6707f4a1 Update timestamp (#6985)
Update timestamp to add endpoint_url field on migrate
2019-02-25 12:35:13 +05:30
Rohit Waghchaure
288dae9adc fix: test cases 2019-02-25 12:30:37 +05:30
Aldo
67eb4d7245 fix: typo in frappe.client.attach_file which resulted in error (#6977)
It returned `f.as_dict()`. `f` is not declared in the current scope.\Changed it with `_file`.
`return _file.as_dict()`
2019-02-25 11:33:26 +05:30
Rohit Waghchaure
65b646e59e fix: Removed duplicate page user permissions for page and report 2019-02-24 08:22:25 +05:30
Saurabh
0dd6c44e2b Merge branch 'master' into develop 2019-02-22 10:25:19 +05:30
Saurabh
86dab7e492 Merge branch 'hotfix' 2019-02-22 10:25:18 +05:30
Saurabh
cd618f2aec bumped to version 11.1.10 2019-02-22 10:55:18 +06:00
rohitwaghchaure
a94a429f91
Merge pull request #6973 from netchampfaris/fix-custom-report-filters
fix: Report filters in Custom Reports
2019-02-21 18:48:24 +05:30
rohitwaghchaure
052b0b7bb7
Merge pull request #6974 from netchampfaris/fix-custom-report-filters
fix: Report filters in Custom Reports
2019-02-21 18:48:11 +05:30