vassili/seitime-frappe
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 4
17191 commits 1 branch 0 tags 587 MiB
Commit graph

17191 commits

This branch
This branch
All branches
Author SHA1 Message Date
Suraj Shetty
9a0ff3bad0 Merge branch 'staging-fixes' of https://github.com/frappe/frappe into staging-fixes 2018-12-10 16:27:00 +05:30
Suraj Shetty
e3b4b91655 Translate log strings 2018-12-10 14:05:59 +05:30
Suraj Shetty
7be4092111 Fix patch key error and remove print statements 2018-12-10 12:49:11 +05:30
Saurabh
dc2cc5c177 bumped to version 11.0.3-beta.34 2018-12-07 17:53:24 +06:00
Faris Ansari
c2c13f1e5c
Merge pull request #6482 from adityahase/prepared-report-fix 
fix(prepared-report): Prepared Report Enhancements
 2018-12-07 16:49:26 +05:30
Faris Ansari
3cb3bc4bb6
Merge pull request #6589 from netchampfaris/query-report-fixes-4 
fix: Update Datatable to 1.6.1
 2018-12-07 16:33:26 +05:30
Faris Ansari
58dc851e8f
Merge branch 'staging-fixes' into prepared-report-fix 2018-12-07 16:15:43 +05:30
Faris Ansari
5d3c739145 fix(Quill): Use pre tag instead of div (#6585) 2018-12-07 15:55:43 +05:30
Faris Ansari
a4e30abac2 fix: Update Datatable to 1.6.1 2018-12-07 15:30:18 +05:30
Aditya Hase
8006fe4e83 style: Linting fixes 2018-12-06 21:20:46 +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
Suraj Shetty
3baf3f7061 Fix a bug in patch 
- Related to apply_to_all_doctypes
 2018-12-06 17:57:51 +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
Faris Ansari
7660ac8f98 fix: Use frappe.as_json instead of json.dumps 2018-12-06 17:24:54 +05:30
Faris Ansari
304a563c25 style: Linting fixes 2018-12-06 17:22:57 +05:30
Suraj Shetty
b98575a092 Remove tuple 2018-12-06 17:18:35 +05:30
Suraj Shetty
42440a2f83 Optimize remove_skip_for_doctype patch 2018-12-06 17:09:21 +05:30
Aditya Hase
dbf9f15f1a fix(prepared-report): Fix typo in a comment 2018-12-06 16:03:22 +05:30
Aditya Hase
49e5d4e21f fix(prepared-report): Set prepared_report_name query param in Link to query report 
Since visiting the query report URL will show most recently generated report
that matches given filters, Explicitly mention which Prepared Report is going
to be rendered.
 2018-12-06 16:01:42 +05:30
Aditya Hase
013f6ceffc fix(prepared-report): Uncompress Prepared Report data files before downloading 2018-12-06 16:01:42 +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
fe657b2f73 fix(prepared-report): Delete all prepared reports 
Changes made to Prepared Report aren't backwards compatible.
Let's get rid of existing prepared reports and files associated with them.
 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
Frappe Bot
bc3934ac68 Merge branch 'staging-fixes' into staging 2018-12-06 09:30:26 +00:00
Frappe Bot
af89f23882 bumped to version 11.0.3-beta.33 2018-12-06 09:30:26 +00:00
Frappe Bot
b39bbe9baf Merge branch 'master' into staging-fixes 2018-12-06 09:09:06 +00:00
Frappe Bot
be52744453 Merge branch 'hotfix' 2018-12-06 08:54:30 +00:00
Frappe Bot
bd3b14ac18 bumped to version 10.1.67 2018-12-06 08:54:30 +00:00
Faris Ansari
9d13d3cd07 fix[filters]: Load filters from report doc & more(#6556) 
* fix(Custom Report): Load filters from report doc

For Custom Report, load filters only from the report doc. For the report
builder, filters should load similar to listview.

* fix(Kanban): Explicit menu action to save filters

* fix: indent

* fix: Always route to the List view from dashboard
 2018-12-03 15:52:53 +05:30
Deepesh Garg
17e3e6f557 Add after_render hook in query_report.js (#6565) 
* Check first row in datatable

* row check bug fix
 2018-12-03 13:01:59 +05:30
Suraj Shetty
1467fbe4bd Remove an unwanted argument 2018-12-02 12:13:20 +05:30
Suraj Shetty
173ae29711 Merge branch 'staging-fixes' of github.com:surajshetty3416/frappe into staging-fixes 2018-12-02 12:10:56 +05:30
Suraj Shetty
11ec1e81a8 Add a decorator to print user permission check logs 2018-12-02 12:10:31 +05:30
Faris Ansari
4d1a557fa3 fix: Only apply saved filters on page load (#6574) 2018-12-02 12:01:27 +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
Suraj Shetty
0a6996a7cf
Merge branch 'staging-fixes' into staging-fixes 2018-11-30 15:03:57 +05:30
Suraj Shetty
33b534ac6e Fix "replicate user permission" patch 2018-11-30 15:02:07 +05:30
Suraj Shetty
864675ce3c Remove duplicate patch entry 2018-11-30 15:00:17 +05:30
Aditya Hase
cc1698c927 fix(website-chat): Show chat window if chat alert is clicked (#6558) 
* fix(website-chat): Show chat window if chat alert is clicked

* fix: Add cursor pointer to make it look clickable
 2018-11-29 22:16:47 +05:30
Aditya Hase
e3ae0722c4 fix(security): Make Jinja tighter (#6564) 2018-11-29 17:24:46 +05:30
Ameya Shenoy
0ecad79fd1 bumped to version 11.0.3-beta.32 2018-11-29 09:48:47 +00:00
Ameya Shenoy
5857b9266b bumped to version 10.1.66 2018-11-29 09:45:15 +00:00
Suraj Shetty
5d477ff6e9 Update gantt library (#6541) 
* Update gantt library
- Current version is ver 0.3.0

* Add frappe-gantt.css
 2018-11-29 12:49:26 +05:30
Zarrar
aff557914e fix: delete event if its reference doc is deleted (#6453) 
* delete events associated with any reference doctype

* fix query, remove whitelist
 2018-11-29 12:19:26 +05:30
Ameya Shenoy
79bd1ed9d6 fix: identify production mode for PDF generation (#6559) 
In regards to PDF generation, if developer_mode was set to true, the PDF
generated used to lack css styling. This was because the URL to the CSS
assets used to contain the webserver port number, but given the system
was running in production, the URL was invalid, thereby not being able
to load CSS assets. This fix does not rely on the value of
developer_mode to identify if the system is running in production,
rather, it uses the value of restart_superviosor or systemd_on_update,
to check for the same.
 2018-11-29 10:31:53 +05:30
Suraj Shetty
390254b65d
Merge branch 'staging-fixes' into staging-fixes 2018-11-29 09:18:43 +05:30
Saurabh
087e401c78 Customize payment success message (#6460) 
* Provision to set custom payment success message

* typo fix

* Fix formatting
 2018-11-29 09:07:38 +05:30