Commit graph

19140 commits

Author SHA1 Message Date
deepeshgarg007
ba3a080fa9 Merge branch 'develop' of https://github.com/frappe/frappe into custom-reports-develop 2019-04-13 00:36:25 +05:30
deepeshgarg007
0d70fc07a0 Code cleanup and fixes 2019-04-12 22:06:49 +05:30
Suraj Shetty
0e0faaf890 fix: Remove leaderboard link from desktop (#7269)
* fix: Remove leaderboard link from desktop

* fix: Spacing in sidebar link
2019-04-12 22:05:58 +05:30
deepeshgarg007
bed72e7ab9 fix: Test case fixes 2019-04-12 22:05:30 +05:30
deepeshgarg007
590aabd971 fix: UI test case 2019-04-12 20:33:54 +05:30
deepeshgarg007
357331544f fix: Styling and codacy fixes 2019-04-12 16:49:28 +05:30
deepeshgarg007
e887e2ed80 Merge branch develop into custom-reports-develop 2019-04-12 16:21:05 +05:30
deepeshgarg007
af0c373c8a feat: Allow user to save custom reports 2019-04-12 16:17:25 +05:30
Deepesh Garg
095205d10b
Merge pull request #7262 from surajshetty3416/fix-doctype-ux
feat: Make reference_name in Energy Point Log clickable
2019-04-12 14:50:22 +05:30
Deepesh Garg
8da7c75ddf
Merge pull request #7267 from surajshetty3416/ui-fix
fix: Add key to energy_point_history
2019-04-12 14:48:34 +05:30
Suraj Shetty
fe65359b95 fix: Add key to energy_point_history for auto refresh on point value change 2019-04-12 13:48:30 +05:30
Suraj Shetty
b3d9c9d52b
Merge pull request #7265 from rohitwaghchaure/fixed_assign_to
fix: Bulk assignmentnt
2019-04-12 13:19:57 +05:30
Rohit Waghchaure
0acb52cf87 fix: Bulk assign to is not working 2019-04-12 12:55:12 +05:30
Suraj Shetty
273281e24f
Merge pull request #7246 from alyf-de/s3_region
feat(integrations): add region to S3 Backup Settings
2019-04-12 12:08:10 +05:30
Suraj Shetty
8efd5e6641
Merge pull request #7258 from netchampfaris/handle-html-xlsx-d
fix(xlsx): Fix for handle failed html parse
2019-04-12 12:04:32 +05:30
Suraj Shetty
d9ad5093fb feat: Make reference_name clickable 2019-04-11 17:21:01 +05:30
Suraj Shetty
662eb3c080 fix: Add missing comma in hooks.py (#7254) 2019-04-11 16:10:43 +05:30
Suraj Shetty
f2bed0945b fix: Do not show Go To List button for child doctypes (#7260) 2019-04-11 16:02:31 +05:30
Suraj Shetty
d6d174373b
Merge pull request #7259 from Mangesh-Khairnar/rating-fix
fix: rating fieldtype for child table nonetype values
2019-04-11 15:52:08 +05:30
Mangesh-Khairnar
984505f291 fix: rating fieldtype for child table nonetype values 2019-04-11 14:58:18 +05:30
Faris Ansari
2677e54e9d fix(xlsx): Fix for handle failed html parse 2019-04-11 14:54:42 +05:30
Nabin Hait
8c91e46563 Fixed merge conflict 2019-04-11 11:56:37 +05:30
Suraj Shetty
e8d5872eb7
Merge pull request #7239 from rohitwaghchaure/advance_search_show_ten_records_in_the_serach
feat: Added pagination in advance search widget
2019-04-11 10:13:56 +05:30
Rushabh Mehta
8aa883d269
Merge pull request #7172 from ahmed-madi/hotfix
fix: Add reference_doctype and reference_name to the to send_workflow_action_email function
2019-04-11 09:34:44 +05:30
Rushabh Mehta
7fa6c6cc74
Merge pull request #7165 from ElasticRun/username
fix: No need to fetch complete user list to get two usernames
2019-04-11 09:30:42 +05:30
Rushabh Mehta
2e3570ff48
Merge pull request #7240 from KanchanChauhan/query-delete-duplicate-custom-fields-fix
fix: query delete_duplicate_custom_fields
2019-04-11 09:29:19 +05:30
Rushabh Mehta
1d6f3fadd7
Merge pull request #7247 from surajshetty3416/energy-points-enhancements
feat: Add weekly and monthly energy points summary report
2019-04-11 09:27:49 +05:30
Rushabh Mehta
3ac7bed214
Merge pull request #7248 from Anurag810/opp_from_communiction
fix: (WN-SUP41735)generating many opportunity on same lead on the base of communication
2019-04-11 09:26:57 +05:30
Rushabh Mehta
3d7788ac2d
Merge pull request #7249 from netchampfaris/get-all-ancestors
fix: Get all ancestors
2019-04-11 09:26:04 +05:30
Suraj Shetty
c4f001aabd
Merge pull request #7250 from netchampfaris/get-all-ancestors-d
fix: Get all ancestors
2019-04-10 18:27:15 +05:30
deepeshgarg007
80f2865885 fix: Translation fixes
(cherry picked from commit 3cd899dfab)
2019-04-10 17:47:21 +05:30
deepeshgarg007
808d6526ee fix: Rename label from doctype to from document type
(cherry picked from commit fc2b66dac0)
2019-04-10 17:47:13 +05:30
deepeshgarg007
10bde3b76b fix: Styling fixes and missing semicolon
(cherry picked from commit a9b080ca6a)
2019-04-10 17:47:04 +05:30
deepeshgarg007
f018ce8308 fix: Removed unused imports and data passing
(cherry picked from commit 327caada32)
2019-04-10 17:46:56 +05:30
deepeshgarg007
9d66a241b8 fix: Find footer buttons only in case of tree report
(cherry picked from commit 35165a7e69)
2019-04-10 17:46:48 +05:30
deepeshgarg007
a938911a72 feat: Allow user to add custom columns in report
(cherry picked from commit 3a5166c423)
2019-04-10 17:46:40 +05:30
deepeshgarg007
8da2f28289 fix: Codacy fixes
(cherry picked from commit e60d032224)
2019-04-10 17:46:31 +05:30
deepeshgarg007
33f8f957cc fix: Remove add fields checkbox from report doctype
(cherry picked from commit bc7e68a6f9)
2019-04-10 17:46:21 +05:30
deepeshgarg007
b8514bf3bb feat:Addition of custom fields in query reports
(cherry picked from commit f4061acf90)
2019-04-10 17:46:11 +05:30
deepeshgarg007
3be3d66fb0 feat:Custom fields in reports
(cherry picked from commit ff6cf8c3e3)
2019-04-10 17:46:01 +05:30
Rohit Waghchaure
747641646c fix: hide pagination if there is no records or result set is less than 20 2019-04-10 16:35:23 +05:30
Faris Ansari
8d7682ecd7
Merge pull request #7225 from deepeshgarg007/custom-reports
feat: Allow user to add fields in query reports
2019-04-10 16:12:12 +05:30
Faris Ansari
478dbb98c6 fix: Get all ancestors
When a file is uploaded by Guest, the folder size needs to be updated,
which breaks because get_ancestors uses `get_list`
2019-04-10 16:10:03 +05:30
Faris Ansari
56f94700e2 fix: Get all ancestors
When a file is uploaded by Guest, the folder size needs to be updated,
which breaks because get_ancestors uses `get_list`
2019-04-10 15:58:10 +05:30
deepeshgarg007
3cd899dfab fix: Translation fixes 2019-04-10 15:34:18 +05:30
deepeshgarg007
fc2b66dac0 fix: Rename label from doctype to from document type 2019-04-10 14:49:34 +05:30
deepeshgarg007
a9b080ca6a fix: Styling fixes and missing semicolon 2019-04-10 14:05:07 +05:30
deepeshgarg007
327caada32 fix: Removed unused imports and data passing 2019-04-10 13:02:25 +05:30
deepeshgarg007
35165a7e69 fix: Find footer buttons only in case of tree report 2019-04-10 12:56:32 +05:30
deepeshgarg007
3a5166c423 feat: Allow user to add custom columns in report 2019-04-10 12:56:32 +05:30