Suraj Shetty
5712a22a0e
Merge branch 'develop' into notification_while_import
2020-06-29 17:23:49 +05:30
Rushabh Mehta
62a8774bb1
feat(role permission): if desk access is removed from a role, attempt to remove it from users too ( #10838 )
...
* feat(minor): if desk access is removed from a role, attempt to remove it from users too
* fix(minor): exception for install;
* fix(minor): exception for install
2020-06-29 02:43:23 +00:00
Deepesh Garg
4ce29c3120
fix: Notificaions on data import
2020-06-26 22:41:29 +05:30
Gavin D'souza
009c994d2d
fix: set flag in_uninstall to not delete controller code
...
when bench command is executed to uninstall-app from site, controller
code should not be deleted
2020-06-19 12:12:15 +05:30
rohitwaghchaure
4fb73e9f95
Merge pull request #10700 from rohitwaghchaure/fixed-frappe-test-patch-travis-failed-develop
...
fix: travis for patch
2020-06-16 00:56:00 +05:30
Rohit Waghchaure
e12364bb02
fix: travis for patch
2020-06-15 20:09:55 +05:30
Suraj Shetty
a141a5c434
Merge branch 'develop' into fetch-from-validation
2020-06-13 20:22:32 +05:30
Faris Ansari
2ec31e3f01
Merge branch 'develop' of https://github.com/frappe/frappe into dib-fixes-2020-05-18
2020-06-10 21:26:54 +05:30
Prssanna Desai
0cc5e2522a
fix: use frappe.bold
...
Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
2020-06-10 11:46:13 +05:30
Prssanna Desai
695826ac49
fix: use in to check value
...
Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
2020-06-10 11:41:00 +05:30
Suraj Shetty
432bb7478b
Merge branch 'develop' into dev-mapper-method-override
2020-06-10 11:27:11 +05:30
Suraj Shetty
e389dcf6fe
Merge branch 'develop' into dib-fixes-2020-05-18
2020-06-09 15:26:46 +05:30
prssanna
8455d93e5b
fix: better validation message if fetch from field doesn't exist
2020-06-05 11:28:13 +05:30
Shivam Mishra
1c3927776e
Merge branch 'develop' of github.com:frappe/frappe into blog-imporv
2020-06-04 17:55:42 +05:30
mergify[bot]
e1f20594a4
Merge pull request #10463 from prssanna/date-filters
...
feat: Date filter improvements
2020-06-01 16:30:35 +00:00
mergify[bot]
3f5e90bb09
Merge pull request #10543 from prssanna/rename-doc-todo-fix
...
fix: update assignments on merging docs
2020-06-01 16:28:46 +00:00
Suraj Shetty
a7aefdfb88
fix: Syntax error
2020-06-01 21:13:13 +05:30
Shivam Mishra
8e815552f6
feat: use blog_post_list as default
2020-06-01 19:15:00 +05:30
prssanna
59eff3df40
Merge branch 'rename-doc-todo-fix' of https://github.com/prssanna/frappe into rename-doc-todo-fix
2020-06-01 12:21:09 +05:30
prssanna
f9b8637060
fix: remove unused import
2020-06-01 12:20:34 +05:30
Prssanna Desai
454a574d43
fix: use frappe.as_json
...
Co-authored-by: gavin <gavin18d@gmail.com>
2020-06-01 12:19:04 +05:30
prssanna
1b691c799d
refactor: refactor get_date_range
2020-06-01 10:52:07 +05:30
prssanna
d9e8b7ef4f
fix: handle old date filters in query
2020-06-01 10:51:38 +05:30
prssanna
f7f2be5926
fix: rename function
2020-06-01 10:51:38 +05:30
prssanna
4b2d730a8c
fix: variable naming
2020-06-01 10:51:38 +05:30
prssanna
6495ee2426
style: fix formatting
2020-06-01 10:51:38 +05:30
prssanna
2fcd8c2905
fix: move timespan function to data.py
2020-06-01 10:51:38 +05:30
prssanna
f0d62d4007
fix: all periods in timespan filter
2020-06-01 10:51:38 +05:30
prssanna
4c16b2a608
feat: api to get additional filters
2020-06-01 10:51:38 +05:30
prssanna
53e2e60cab
feat: filter for current timespan
2020-06-01 10:51:38 +05:30
Suraj Shetty
80c16f6bd7
Merge branch 'develop' into dib-fixes-2020-05-18
2020-06-01 10:25:41 +05:30
Suraj Shetty
50974cec89
Merge branch 'develop' into dev-mapper-method-override
2020-06-01 10:17:21 +05:30
Suraj Shetty
9cc1589926
Merge branch 'develop' into workflow-action-fix
2020-06-01 08:50:39 +05:30
Suraj Shetty
b6e86a3b67
Merge branch 'develop' into dev-mapper-method-override
2020-05-30 21:04:04 +05:30
Rohan Bansal
77062721ed
feat: allow mapper functions to be overriden
2020-05-30 19:15:04 +05:30
Faris Ansari
7119179fa5
fix: Don't create Version in install
2020-05-30 00:06:25 +05:30
prssanna
d6206ed411
fix: update assignemnts on merging docs
2020-05-29 16:50:31 +05:30
Prssanna Desai
b6011e752b
fix(Email): include Text in fieldtypes to sanitize ( #10525 )
2020-05-29 09:12:24 +05:30
Faris Ansari
b7dfe7969d
fix: Create version for document creation
...
So that we can track if documents were created by Data Import
2020-05-28 23:18:08 +05:30
Suraj Shetty
08ccc4eb2d
Merge branch 'develop' into workflow-action-fix
2020-05-28 10:09:53 +05:30
mergify[bot]
4a56ae4557
Merge pull request #10248 from ruchamahabal/duration-control
...
feat: Duration Control
2020-05-27 06:53:46 +00:00
prssanna
c329a2c1af
fix: add update_after_submit to actions while setting worflow state
2020-05-25 12:22:19 +05:30
SDLyu
3e9d8d05e9
Wrappe frappe._dict
...
`frappe.get_attr(hook)(data=data)` return dict. But function `get_open_count` will access `fieldname` attribute in notifications.py.
I will cause error `'dict' object has no attribute 'fieldname'`.
2020-05-21 18:47:00 +08:00
Rucha Mahabal
b70321cc50
Merge branch 'develop' into duration-control
2020-05-15 20:07:16 +05:30
Himanshu Warekar
12ca630c52
fix: merge code
2020-05-14 17:22:51 +05:30
Himanshu Warekar
aa98d6ffb6
fix: sider changes
2020-05-14 16:37:14 +05:30
Himanshu Warekar
c14b6c592a
fix: move code to meta.py
2020-05-14 16:27:34 +05:30
Rucha Mahabal
c51018c039
Merge branch 'develop' into duration-control
2020-05-14 11:32:49 +05:30
Himanshu Warekar
9bbcaf49a8
Merge branch 'develop' of https://github.com/frappe/frappe into custom_frm_dashboard
2020-05-13 11:54:12 +05:30
Suraj Shetty
d53b88a72f
perf: Make tests faster ( #10307 )
...
* feat: Ignore versions for test
* test: Do not ignore version where needed
* perf: Use frappe.db.get_single_value to leverage caching
- frappe.get_cached_value does not support single value caching
* style: Fix sider issue
2020-05-12 22:34:10 +05:30
