Commit graph

132 commits

Author SHA1 Message Date
Aditya Hase
7b1f31c447 fix(prepared-report): Show translated column names 2019-06-10 16:21:27 +05:30
Aditya Hase
2ff298c587 fix(query-report): Adding custom column data when result row is a tuple
Result row can be a list, dict or a tuple.

Previously handled cases:
Case dict: row can be used as it is
Case list: row is converted to an equivalent dict

Unhandled case (fixed with this commit):
Case tuple: row is converted to a list so that it can be handled with the list case
2019-05-30 17:47:54 +05:30
Suraj Shetty
1bcdc0b7cb fix(report): Allow report export only if user has export permission on ref doctype (#7458)
* fix: Allow export only if user has export permission on reference doctype

* fix: Show only custom "no permission" error

* fix: while saving employee user getting user permissions error
2019-05-15 11:59:13 +05:30
Saurabh
d99423ce1c fix: enqueue prepared report after commiting prepared report record 2019-05-08 16:20:47 +05:30
deepeshgarg007
19a6b6fbcb fix: Link field fixes for custom reports 2019-04-21 22:09:59 +05:30
Faris Ansari
c188039ba7
fix: More cleanup 2019-04-12 23:33:20 +05:30
deepeshgarg007
0d70fc07a0 Code cleanup and fixes 2019-04-12 22:06:49 +05:30
deepeshgarg007
af0c373c8a feat: Allow user to save custom reports 2019-04-12 16:17:25 +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
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
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
Sahil Khan
f085765abd Merge branch 'master' into develop 2019-03-28 13:44:14 +05:30
rohitwaghchaure
698b0011b1 fix: exported data of report showing blank in the excel file (#7141) 2019-03-27 15:11:12 +05:30
Sagar Vora
d11dd760f8 Merge branch 'master' into develop 2019-02-26 17:06:13 +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
Frappe Bot
bfc25ad1e5 Merge branch 'master' into develop 2019-02-15 10:21:47 +00:00
Aditya Hase
d9a317e202 fix(desk): Prepared Report fixes (#6939)
* fix(desk): Fetch prepared report matching filter values

* fix(desk): Ignore filters when prepared report doc name is given

* fix(desk): Delete prepared report if data is corrupted

* style: Linting fixes
2019-02-15 15:00:05 +05:30
Sagar Vora
cf1818f989 Merge branch 'master' into develop 2019-01-31 13:31:00 +05:30
rohitwaghchaure
7ccb5a21c4 fix: prepared report filters not working (#6864) 2019-01-31 09:31:19 +05:30
Saurabh
76bd4e4f19 Merge branch 'master' into develop 2019-01-30 12:36:43 +05:30
rohitwaghchaure
e458d7d0a7 feat: provision to enable/disable prepared report from permission for page and report document (#6831)
* feat: provision to enable/disable prepared report from permission for page and report document

* Added progress bar in the report

* Removed cache and fixed message

* Show progress bar if execution time is greater than 2 seconds
2019-01-30 12:25:29 +05:30
Sagar Vora
ef82f39f99 Merge branch 'staging' into develop 2019-01-29 18:24:11 +05:30
Aditya Hase
e4224ea5d8 fix(report): Use key matching label if key with fieldname doesn't exist (#6839) 2019-01-29 13:01:17 +05:30
Nabin Hait
1c30523869 Fix: merge conflict 2019-01-18 09:55:39 +05:30
rohitwaghchaure
45fbd07af1 fix: increased threshold for making report as prepared report (#6773) 2019-01-16 12:04:40 +05:30
Saurabh
2de5dfdbb3 Merge branch 'staging' into develop 2018-12-18 10:20:24 +05:30
Saif
a0b2709a68 fix: bug in total row calculation for Currency field for list of dict values (#6615) 2018-12-18 09:01:09 +05:30
Frappe Bot
a60cb001f6 Merge branch 'staging' into develop 2018-12-10 13:05:59 +00:00
Faris Ansari
e71d412fc8 fix: Totals row in Query Report (#6590)
* fix: Totals row in Query Report

* fix: Remove quotes around Total
2018-12-10 17:21:02 +05:30
Faris Ansari
cfa2e7613f fix: Replace file_manager api with file doc api 2018-12-09 11:31:12 +05:30
Aditya Hase
521d5a982c fix(prepared-report): UX Improvements
- Update primary action according to the Report's status

 - Automatically refresh report view if report generation is finished

 - Correctly translate message strings

Co-authored-by: Faris Ansari <netchamp.faris@gmail.com>
2018-12-06 19:52:35 +05:30
Aditya Hase
28e36b201d fix(prepared-report): Do not lose the first row in Prepared Report data 2018-12-06 17:27:50 +05:30
Aditya Hase
dbf9f15f1a fix(prepared-report): Fix typo in a comment 2018-12-06 16:03:22 +05:30
Aditya Hase
0467719466 fix(prepared-report): Disable filters when showing a Prepared Report doc 2018-12-06 16:01:41 +05:30
Aditya Hase
fc48597694 fix(prepared-report): Python 2 compatibility fix
gzip.compress and gzip.decompress were introduced in Python 3.2

Added gzip_compress and gzip_decompress to frappe.utils to add this functionality
to both Python 2 and 3
2018-12-06 16:01:41 +05:30
Aditya Hase
9ced1a2886 fix(prepared-report): Show data from report matching filters and owner
This fixes permission issues since users can only see the
report that they themselves have generated.

Also report filters and data won't mismatch.
2018-12-06 16:01:41 +05:30
Aditya Hase
d76a0136dd refactor(prepared-report): Do not serialize JSON serialized filters
Prepared report filters were being JSON serialized twice.
There isn't any apparent need to do this. So don't do it.
2018-12-06 16:01:41 +05:30
Aditya Hase
0919234b66 fix(prepared-report): Serialize Prepared Report data to JSON
CSV serialization causes information loss for erpnext reports like P&L Statement,
rendering such reports unusable.

Also stored files are gzip compressed to reduce space requirement

Note: This will cause all previously generated reports to break, this should be fixed
2018-12-06 16:01:41 +05:30
Faris Ansari
7e5decc9f7 fix(QueryReport): Dynamic Total Row in Query Report (#6566)
The total row sent by the server does not update when rows are filtered.
Datatable now has a bulit-in dynamic total row
2018-11-30 18:51:32 +05:30
Rohit Waghchaure
8f9fbb4cee [Fix] Links are not working 2018-10-23 17:31:49 +05:30
Rohit Waghchaure
b434457648 [Fix] Prepared report breaking if no data 2018-10-16 14:27:07 +05:30
Rohit Waghchaure
c0cf13149a Fixed permissions 2018-10-11 12:12:47 +05:30
Prateeksha Singh
de1d2720c6 Charts in Query Reports (#6118)
* [charts][query-report] setup preview enabled chart maker

- Options for y values: numeric fields
- Options for x values: remaining non numeric fields

* [query-report][chart] Add 'Vs' title, truncate total row
2018-09-24 12:33:53 +05:30
Saif
983fc74cd5 Changes in query_report.add_total_row() to allow list-of-dicts type results (#6009)
* Changes in query_report.add_total_row() to allow list-of-dicts type results

* Forgot to use get() instead of []
2018-09-03 11:03:42 +05:30
Rohit Waghchaure
97ae49dc47 [Fix] Prepared report is not able to export 2018-08-17 11:06:46 +05:30
Mohamed_Alsum
364b09e3d6 adding time to total_row in reports (#5961)
* allow null when time field is not required

* Update base_document.py

* adding time to total_row
2018-08-13 10:31:38 +05:30
KanchanChauhan
602bdd0bea [Minor Bug Fix]Query Report Fix (#5890) 2018-07-30 14:07:45 +05:30
Saurabh
d46fd09b44 [WIP][Enhancement] Provision to pull reports from slave systems (#5844)
* [Enhancement] Provision to pull reports from slave systems

* [fix] check if master_db exists

* Pull list view from slave system
2018-07-24 17:42:21 +05:30