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

1148 commits

Author SHA1 Message Date
Shivam Mishra
490de4914b
Merge pull request #7669 from scmmishra/charts-import 
feat: replace legacy charts with frappe-charts library
 2019-06-12 16:05:04 +05:30
Rushabh Mehta
dd39fe9a50 revert: module links back to original size 2019-06-12 12:20:52 +05:30
Shivam Mishra
8621c3776b update branch 2019-06-12 11:13:23 +05:30
Shivam Mishra
067cc9d775 feat: added frappe.Chart globally 2019-06-12 11:08:47 +05:30
Shivam Mishra
7045942e8d refactor: use es6 imports for charts 2019-06-11 15:41:44 +05:30
Aditya Hase
7b1f31c447 fix(prepared-report): Show translated column names 2019-06-10 16:21:27 +05:30
Rushabh Mehta
15a9cb7684 fix(minor): dont apply depends_on while selecting chart filters 2019-06-05 08:54:59 +05:30
Mangesh-Khairnar
42ecf75ab5 fix: check required fields to create dashboard chart (#7620) 2019-06-03 10:22:56 +05:30
Deepesh Garg
56cef48169
Merge pull request #7612 from adityahase/fix-query-report-custom-columns 
fix(query-report): Adding custom column data when result row is a tuple
 2019-05-30 19:12:43 +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
Faris Ansari
7f24a3f71d fix: Show user fullname in mentions (#7592) 
* fix: Show user fullname in mentions

* fix: Remove unused import

* fix: Update tests
 2019-05-30 16:37:40 +05:30
Rohit Waghchaure
30c401deee fix: incorrect schedule showing in the draft mode 2019-05-24 18:51:19 +05:30
Rushabh Mehta
1c893e44c0 fix: frappe.conf.db_type -> frappe.db.db_type 2019-05-24 11:44:28 +05:30
Himanshu
51042b1359 fix(load): alias creation in get communications (#7538) 
* fix: alias creation

* fix: fix update_timeline_doc

* fix: add timeline link irrespective of comm medium
 2019-05-23 09:35:53 +05:30
Himanshu
2b14c95644 fix(Communication): New child doctype for Communication Timeline Links (#7524) 
* fix: separate child doctype for communication

* fix: reload doc before running the patches

* fix: update_timeline_doc

* fix: manipulatetimeline fields in Comm Links

* fix: test cases

* fix: reload comm_link before communication

* patch: remove redundant patch
 2019-05-21 20:48:55 +05:30
Faris Ansari
7d7b229438 perf: Optimize get_communications 
Split query with OR condition into two subqueries with UNION
 2019-05-21 12:03:58 +05:30
Rushabh Mehta
28ed21b94c
Merge pull request #7419 from josejibin/fix/postgres-compatible 
fix(postgres): Make db queries postgres compatible
 2019-05-20 18:02:30 +05:30
Himanshu Warekar
4946c1559f Merge develop in comm_ref 2019-05-20 14:40:59 +05:30
jibin jose
1a58c13966 fix(postgres): Make db queries postgres compatible 2019-05-20 12:31:30 +05:30
deepeshgarg007
ba7af52caa fix: Module view fix for custom reports 2019-05-19 17:56:41 +05:30
Himanshu Warekar
defe1b2eef fix: miscellaneous changes 2019-05-18 13:37:00 +05:30
Himanshu Warekar
a4478afcd5 Merge branch 'develop' of https://github.com/frappe/frappe into comm_ref 2019-05-16 13:03:46 +05:30
Himanshu Warekar
77d009747d fix: remove debug parameter 2019-05-15 14:00:25 +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
Himanshu Warekar
e29f07898b fix: query 2019-05-15 11:29:22 +05:30
sahil28297
b822104ec1
Merge pull request #7479 from netchampfaris/fix-v12-setup 
fix: Clear DuplicateEntry message in setup
 2019-05-14 19:54:40 +05:30
Anurag Mishra
6f5ad343c9
fix: filters for sending hourly updates in document follow (#7481) 2019-05-14 18:40:34 +05:30
Himanshu Warekar
8828fcef24 fix: use inner join instead of left join 2019-05-14 17:22:24 +05:30
Faris Ansari
90f62016f8 fix: Clear DuplicateEntry message in setup 2019-05-14 16:19:45 +05:30
Himanshu Warekar
f114e03c8c Merge branch 'develop' into comm_ref 2019-05-14 16:18:32 +05:30
Shivam Mishra
398cb9d859
Merge pull request #7477 from Anurag810/followed_fix 
fix: disable document follow check
 2019-05-14 15:34:38 +05:30
Anurag Mishra
250ccaf9ba fix: mail was also sending after setting of hte document follow uncheck 2019-05-14 15:27:44 +05:30
Saurabh
abe1defb25
Merge pull request #7463 from rmehta/remove-feedback-trigger 
BREAKING CHANGE: remove Feedback Trigger and Feedback Rating, this was not very configurable and can now be done better with Web Forms
 2019-05-14 15:18:44 +05:30
Himanshu Warekar
ee27bd80c8 fix: typo 2019-05-14 12:58:16 +05:30
Himanshu Warekar
5d09fb26a9 fix: timeline docs to dynamic links 2019-05-14 12:01:14 +05:30
Himanshu Warekar
8381e0048a feat: Communication refactor initial bringup 2019-05-13 20:39:49 +05:30
Saurabh
fc9803553c
Merge pull request #7459 from surajshetty3416/fix-query 
fix: Make query postgres compatible
 2019-05-13 15:33:49 +05:30
Anurag Mishra
b9170012b2 feat: added follow on creation and changes done by user will not send to him (#7460) 
* feat: added follow on creation

* style: Missing comma and a parameter

* fix: travis

* removed print statement
 2019-05-13 14:59:49 +05:30
Rushabh Mehta
3d26d2dd22 BREAKING CHANGE: remove Feedback Trigger and Feedback Rating, this was not very configurable and can now be done better with Web Forms 2019-05-13 14:18:02 +05:30
Suraj Shetty
02ff1a48da
fix: Switch the position of LIMIT and OFFSET 
MariaDB needs LIMIT before OFFSET. 
Whereas Postgres accepts LIMIT and OFFSET in any order
 2019-05-13 13:41:56 +05:30
Rushabh Mehta
862a0979a7 fix(minor): filter selection for dashboard chart, even if hidden / readonly 2019-05-13 12:06:56 +05:30
Suraj Shetty
1556805232 fix: Make query postgres compatible 2019-05-13 10:26:48 +05:30
Saurabh
d99423ce1c fix: enqueue prepared report after commiting prepared report record 2019-05-08 16:20:47 +05:30
Rushabh Mehta
76dbb3b8e8
Merge pull request #7403 from rmehta/error-reporting-develop 
fix: error reporting
 2019-05-07 19:05:11 +05:30
Rushabh Mehta
87082e2c07 fix(report): charting in reports now supports group by and saved in user settings; 2019-05-07 15:50:18 +05:30
Rushabh Mehta
4c578e8238 fix: dont show double messages 2019-05-04 14:14:56 +05:30
Rushabh Mehta
6157ebb4b5
Merge pull request #7281 from prssanna/link-preview 
feat(desk): Link preview popover
 2019-05-03 12:41:04 +05:30
Rushabh Mehta
5ebf688984 fix(recent): complete uncommitted changes 2019-05-03 08:49:51 +05:30
Suraj Shetty
c8e72ce1c1
Merge pull request #7395 from rmehta/recent-route-fixes 
fix: route history and allow longer energy point reviews
 2019-05-02 20:11:03 +05:30
Rushabh Mehta
f72e74d8e8 fix: route history and allow longer energy point reviews 2019-05-02 15:51:57 +05:30