Leandro Iannece
6682d5c07c
Fixed jinja templates and translation in login page
2019-09-23 15:29:25 -03:00
mergify[bot]
4510b6eca7
Merge pull request #8478 from frappe/surajshetty3416-patch-1
...
fix: set default value in set_value as None to avoid error.
2019-09-23 16:44:26 +00:00
Himanshu Warekar
1f0edc80d8
chore: remove unnecessary code
2019-09-23 21:20:51 +05:30
Himanshu Warekar
f22c78a806
Merge develop into global_search
2019-09-23 21:20:26 +05:30
Mangesh-Khairnar
0d6b8072df
fix: boilerplate creation
2019-09-23 16:36:35 +05:30
Suraj Shetty
b07b87392d
fix: Add field description and remove mandatory constraint
2019-09-23 16:18:22 +05:30
Suraj Shetty
eee41cac31
test: Add test for point allocation based on assignment
2019-09-23 16:17:08 +05:30
Suraj Shetty
7fe35a2d3c
fix: set default value in set_value as None to avoid error.
...
```
frappe.db.set_value('Call Log', log.name, {
fieldname: doc.name,
display_name_field: doc.get_title()
}, update_modified=False)
```
this code should not fail if value is not pass because value is passed in the dict.
2019-09-23 15:54:46 +05:30
mergify[bot]
5a3bdff130
Merge pull request #8455 from hrwX/use-getfullargspec
...
fix: use getfullargspec for type annotations
2019-09-23 07:41:54 +00:00
Aditya Hase
46eac3071f
Update auth.py
2019-09-23 13:05:19 +05:30
Aditya Hase
756d1faabb
Update auth.py
2019-09-23 13:05:01 +05:30
Faris Ansari
b6ed895ed8
fix(user): remove password update notification feature for secu… ( #8449 )
2019-09-23 12:33:14 +05:30
Raffael Meyer
ab86a89128
fix(docstring): params docname and description ( #8475 )
2019-09-23 12:32:42 +05:30
mergify[bot]
e1f3982a88
Merge pull request #8476 from deepeshgarg007/disable
...
fix: Validation for disabled link fields
2019-09-23 04:59:28 +00:00
deepeshgarg007
f7bfcd7fee
fix: Test Case for disabled role
2019-09-22 16:25:21 +05:30
deepeshgarg007
d3e7c54245
fix: Validation for disabled link fields
2019-09-22 13:50:58 +05:30
Himanshu Warekar
770f56f4ce
fix: set column width
2019-09-21 20:53:20 +05:30
Himanshu Warekar
57d27b3cda
Merge branch 'develop' of https://github.com/frappe/frappe into con-fix
2019-09-21 20:38:39 +05:30
mergify[bot]
ccc101e73f
Merge pull request #8470 from hrwX/em-fixx
...
fix(Email): 'NoneType' object has no attribute 'get'
2019-09-21 14:57:47 +00:00
ci2014
a8b53deb75
Fix loop error in utils.py
...
Property Setters got deleted on bench migrate and haven't been readded, because data was passed instead of d. Now it works.
2019-09-21 15:41:54 +02:00
Himanshu Warekar
71ec11e3ee
chore: rename fieldname
2019-09-21 17:42:38 +05:30
Himanshu Warekar
19ff2489f1
feat: assignment rule days
2019-09-21 17:25:56 +05:30
Himanshu Warekar
e83b51bb82
Merge branch 'develop' of https://github.com/frappe/frappe into con-fix
2019-09-20 20:28:46 +05:30
Suraj Shetty
7b93d6ea33
fix: User Permission issue in Reports ( #8459 )
...
Data was not getting filtered properly because `get_linked_doctype`
was returning empty for some reports.
2019-09-20 18:16:36 +05:30
mergify[bot]
834233bed2
Merge pull request #8445 from netchampfaris/revert-delete-controller-files
...
fix: Dont delete controller files on doctype delete
2019-09-20 12:15:39 +00:00
Faris Ansari
76bfa7ccff
fix: Dont delete controllers in for_reload
2019-09-20 16:44:44 +05:30
mergify[bot]
ef20013e95
Merge pull request #8462 from ruchamahabal/is_set_filter_fix
...
fix(Report View): Error on setting Is Set filter for date fields
2019-09-20 11:09:08 +00:00
Himanshu Warekar
50f2d21249
Merge branch 'develop' of https://github.com/frappe/frappe into con-fix
2019-09-20 16:29:57 +05:30
Himanshu Warekar
cefd87b81a
fix: add primary email
2019-09-20 16:29:31 +05:30
Himanshu Warekar
cfbfc24398
fix: 'NoneType' object has no attribute 'get'
2019-09-20 16:16:57 +05:30
Himanshu Warekar
7c075703a1
fix: codacy
2019-09-20 15:51:21 +05:30
Sahil Khan
61bd8b71ad
Merge branch 'develop' into version-12
2019-09-20 15:14:17 +05:30
Sahil Khan
bcba2e3ee1
bumped to version 12.0.14
2019-09-20 15:34:17 +05:50
Aditya Hase
cd5a80b534
fix(security): Use frappe.render_template instead of Template.r… ( #8467 )
...
fix(security): Use frappe.render_template instead of Template.render
2019-09-20 15:04:21 +05:30
Aditya Hase
d67b995676
fix(security): Use frappe.render_template instead of Template.render
2019-09-20 14:41:28 +05:30
Himanshu Warekar
1fdb70ddba
fix: orm query
2019-09-20 14:36:28 +05:30
mergify[bot]
db6712e407
Merge pull request #8465 from rohitwaghchaure/flag_to_skip_redirect_on_error_from_quick_entry
...
feat: added flag to skip redirect on error for quick entry
2019-09-20 09:02:57 +00:00
Himanshu Warekar
a0a57f4a5d
tests: fix tests
2019-09-20 14:22:40 +05:30
Himanshu Warekar
cc8953ad66
tests: fix test cases
2019-09-20 14:00:40 +05:30
Rohit Waghchaure
79be132e3d
feat: added flag to skip redirect on error for quick entry
2019-09-20 12:22:54 +05:30
Himanshu Warekar
2da2026a9e
test: use get_doc when in_test
2019-09-20 11:59:38 +05:30
Himanshu Warekar
1df6ead779
Merge develop into ip-rest
2019-09-20 11:52:15 +05:30
Himanshu Warekar
b684ade868
fix: restore debugging code
2019-09-20 11:20:53 +05:30
Himanshu Warekar
c4d120273b
fix: priority for doctypes inglobal search
2019-09-20 11:12:45 +05:30
Himanshu Warekar
d12bbddf74
fix: check for duplicate entries
2019-09-20 09:57:09 +05:30
Rucha Mahabal
20ea14efe4
fix(Report View): Error on setting Is Set filter for date fields
2019-09-19 20:41:56 +05:30
Himanshu Warekar
200767e0a3
fix: get_doc while in test
2019-09-19 19:55:39 +05:30
Himanshu Warekar
4da29d099b
perf: reduce validate ip addr execution time
2019-09-19 19:10:28 +05:30
Himanshu Warekar
f3b7461498
fix: test fixes for same phone and mobile
2019-09-19 18:19:33 +05:30
Himanshu Warekar
283ee4d357
Merge branch 'develop' of https://github.com/frappe/frappe into con-fix
2019-09-19 18:03:01 +05:30
