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

2449 commits

Author SHA1 Message Date
Deepesh Garg
1fdafc43a4 fix: Errors 
(cherry picked from commit 4e4e0fa3d9)
 2021-05-05 04:17:20 +00:00
Deepesh Garg
7f12d2b053 fix: Error while exporting reports with duration field 
(cherry picked from commit eafadcca47)
 2021-05-05 04:17:19 +00:00
mergify[bot]
04f9822164
fix(UI): Add margin to download backup card (backport #13050) (#13079) 
Co-authored-by: Ernesto Ruiz <ernesto_ruiz89@hotmail.com>
 2021-05-03 10:09:10 +05:30
Ernesto Ruiz
8fdb69cc75 fix: Make strings translatable (#13046) 
Co-authored-by: Mohammad Hasnain Mohsin Rajan <hasnain2808@gmail.com>
Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
(cherry picked from commit b0af8886d5)
 2021-05-03 04:10:21 +00:00
Suraj Shetty
b7e139a7bf fix: Typo 
(cherry picked from commit 43a4f1861e)
 2021-05-03 04:03:23 +00:00
Suraj Shetty
f58c9529d4 style: Fix formatting 
(cherry picked from commit 395eed225f)
 2021-05-03 04:03:23 +00:00
Suraj Shetty
690746f729 fix: Link user mention to User Profile 
(cherry picked from commit 183af96465)
 2021-05-03 04:03:22 +00:00
Suraj Shetty
8cd8f32993 refactor: Move mention list generation logic to server-side 
- Moved mention list generation logic to server-side to get latest mention list everytime
- To indicate group option, added a users icon.

(cherry picked from commit 1af59ce16c)
 2021-05-03 04:03:21 +00:00
Ankush Menat
e38ed8798d feat(DX): sourceURL for injected javascript 
Adds sourceURL to injected javascript code, this helps in debugging
injected javascript using client script or doctype specific javascript.

`no-docs`

(cherry picked from commit 8dd925743c)
 2021-04-28 13:03:08 +00:00
Frappe Bot
e2729c65ea refactor: Delete Qunit test files 
Since it is no longer used

(cherry picked from commit d30596b15e)
 2021-04-28 03:46:23 +00:00
Suraj Shetty
26b42fc794 fix(treeview): Accept filters as kwargs to avoid TypeError (#12920) 2021-04-27 14:54:35 +05:30
Suraj Shetty
a9f9c16a9f fix: Pass aggregate_on_doctype to properly create the query 2021-04-27 14:54:35 +05:30
Ernesto Ruiz
1d98651976 fix: Make strings translatable (#12877) 
Make strings translatable.
 2021-04-27 14:54:33 +05:30
mustafaelagamey
d8dca020b3 fix: Remove cmd only if exist (#12886) 
* only remove cmd if exist

When calling this function from backend this line raises key error as there's no such key called cmd

* style: Simplify code

Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
 2021-04-27 14:54:33 +05:30
mergify[bot]
e36d9283af
Merge pull request #12534 from CaseSolvedUK/qr-cols-v13 
feat: allow query/custom reports to save custom data in the json field
 2021-04-16 02:36:19 +00:00
mergify[bot]
b71f8dcba1
Merge pull request #12866 from nikhilponnuru/version-13 
fix: newly created Workspace not being accessible unless a shortcut u…
 2021-04-16 02:33:15 +00:00
nikhilponnuru
de70877228 fix: Newly created Workspace not being accessible unless a shortcut under Shortcuts is created 2021-04-15 22:17:24 +05:30
casesolved-co-uk
15b3cc890f feat: allow query/custom reports to save custom data in the json field 2021-04-09 14:01:48 +00:00
Leela vadlamudi
e5d3aac707
Merge pull request #12693 from leela/notifications-into-timeline 
feat: Include automated mail notifications in timeline
 2021-04-08 20:38:29 +05:30
mergify[bot]
6708d89da0
fix: ZeroDivision error in progress (bp #12586) (#12808) 
Co-authored-by: Ankush Menat <ankush@iwebnotes.com>
 2021-04-06 18:22:06 +05:30
Suraj Shetty
60aae80f39
chore: Update develop with Version 13 (#12803) 2021-04-05 14:10:37 +05:30
leela
5c2bda478c Refactor(Improv): Include automated mail notifications in timeline 
Notifications sent through notifications doctype are not part of
communications doctype and also not into timelines. Added these
notifications into timeline by adding docs into Communication doctype.
 2021-04-05 09:45:17 +05:30
Rucha Mahabal
f12369847b fix: filter condition with '!=' 2021-04-04 16:12:01 +05:30
Suraj Shetty
1bfd5c8a87
Merge branch 'develop' into todo-access-fix 2021-04-02 13:03:10 +05:30
Suraj Shetty
cf607148a0
Merge pull request #12121 from zerodha/virtual_doctype 2021-04-02 12:43:43 +05:30
leela
7a36ba5bbd fix: get_count API endpoint 
Make get_count work with join queries

(cherry picked from commit 566f8ba12a)
 2021-04-01 14:14:19 +00:00
leela
566f8ba12a fix: get_count API endpoint 
Make get_count work with join queries
 2021-04-01 19:23:19 +05:30
Sagar Vora
3b3b9e7e4a fix: create _get_children for passing ignore_permissions when needed 2021-04-01 15:04:51 +05:30
Shridhar Patil
361cd935d6
Merge branch 'develop' into virtual_doctype 2021-04-01 09:46:35 +05:30
Shridhar
0b3d71f8c3 feat: added get value got virtual doctype 2021-04-01 09:38:21 +05:30
Suraj Shetty
7124e49473
Merge branch 'develop' into whitelist-methods 2021-03-31 20:42:37 +05:30
Rushabh Mehta
8203ab6ff7 Update frappe/desk/reportview.py 
Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
(cherry picked from commit 375cdea145)
 2021-03-31 05:25:08 +00:00
Rushabh Mehta
aa6288a265 fix(reportview): test 
(cherry picked from commit 337bdc976c)
 2021-03-31 05:25:07 +00:00
Rushabh Mehta
5a8c89ccb4 fix(minor): tests 
(cherry picked from commit 82399ddfba)
 2021-03-31 05:25:07 +00:00
Rushabh Mehta
2acaf1a464 fix(minor): tests 
(cherry picked from commit 868228bdea)
 2021-03-31 05:25:07 +00:00
Rushabh Mehta
cf526d714d fix(minor): return value in reportview.py 
(cherry picked from commit 1aa8adadcb)
 2021-03-31 05:25:07 +00:00
Rushabh Mehta
8c3debca69 fix(minor): tests and linting 
(cherry picked from commit d959fc7310)
 2021-03-31 05:25:07 +00:00
Rushabh Mehta
80c26612ea fix(minor): lockdown frappe.client.get_list 
(cherry picked from commit 2248c6c410)
 2021-03-31 05:25:07 +00:00
Rushabh Mehta
97a0f6f3ab fix(minor): disallow comments in fields 
(cherry picked from commit f1f64772a5)
 2021-03-31 05:25:06 +00:00
Rushabh Mehta
939b5a9e26 fix(report): move count, aggregation to serverside 
(cherry picked from commit 6d978a1df0)
 2021-03-31 05:25:06 +00:00
Rushabh Mehta
5e8cbfa72e fix(minor): handle as fieldnames 
(cherry picked from commit 0def97543b)
 2021-03-31 05:25:06 +00:00
Rushabh Mehta
64f21730b1 fix(minor): functions must end with bracket 
(cherry picked from commit 0c995940c1)
 2021-03-31 05:25:06 +00:00
Rushabh Mehta
0fab70f39b fix(minor): fieldnames can't have commas 
(cherry picked from commit 511a5ddc4b)
 2021-03-31 05:25:05 +00:00
Rushabh Mehta
6ba3a95c03 fix(refactor): lockdown frappe.desk.reportview 
(cherry picked from commit a2ffea53f2)
 2021-03-31 05:25:05 +00:00
Rushabh Mehta
ed6468d5f2
Merge pull request #12713 from rmehta/fix-reportview 
fix(refactor): lockdown frappe.desk.reportview
 2021-03-31 10:50:25 +05:30
Rushabh Mehta
375cdea145
Update frappe/desk/reportview.py 
Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
 2021-03-31 10:10:46 +05:30
mergify[bot]
524b12f0cd
fix: System Notification fix (bp #12719) (#12724) 
(cherry picked from commit 93e6cc4ac1)

Co-authored-by: prssanna <prssud@gmail.com>
 2021-03-30 20:31:56 +05:30
Rushabh Mehta
337bdc976c fix(reportview): test 2021-03-30 18:35:44 +05:30
mergify[bot]
1d8741b745
Merge pull request #12719 from prssanna/notification-fix 
fix: System Notification fix
 2021-03-30 11:12:43 +00:00
Rushabh Mehta
82399ddfba fix(minor): tests 2021-03-30 16:37:53 +05:30