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

21690 commits

This branch
This branch
All branches
Author SHA1 Message Date
mergify[bot]
36deebec10
Merge pull request #8480 from Mangesh-Khairnar/fix-boilerplate-creation 
fix: boilerplate creation
 2019-09-24 17:11:48 +00:00
mergify[bot]
99b0906f16
Merge pull request #8492 from surajshetty3416/feat-value-change-detection 
feat: EP rule based on value change in the ref. document
 2019-09-24 16:20:41 +00:00
Sahil Khan
0e6de280aa Merge branch 'develop' into version-12 2019-09-24 18:16:08 +05:30
Sahil Khan
f68534ff4b bumped to version 12.0.15 2019-09-24 18:36:08 +05:50
mergify[bot]
4fff011d89
Merge pull request #8487 from binardev/fix-login-translation 
fix: login translation
 2019-09-24 12:10:36 +00:00
Suraj Shetty
227d27f254 fix: Duplicate review point allocation (#8485) 2019-09-24 10:40:43 +00:00
Suraj Shetty
60a752b9f7 Merge branch 'develop' of https://github.com/frappe/frappe into feat-value-change-detection 2019-09-24 15:35:08 +05:30
Suraj Shetty
7bb2ab622c fix: Add optionally mandatory field validation 2019-09-24 15:32:30 +05:30
Suraj Shetty
66468d2670 fix: Re-organise EP rule form 2019-09-24 15:26:12 +05:30
Suraj Shetty
669690c856 fix: Add code to set options for field_to_check 2019-09-24 15:25:42 +05:30
Leandro Iannece
6833c54f2f
Suggested Change - Title Case Label 
Co-Authored-By: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
 2019-09-24 06:37:38 -03:00
Suraj Shetty
97a65ceca4 Merge branch 'develop' of https://github.com/frappe/frappe into feat-value-change-detection 2019-09-24 14:59:41 +05:30
Suraj Shetty
c61de730d9 feat: Option to detect field change from EP rule 2019-09-24 14:54:02 +05:30
mergify[bot]
c0844f2297
Merge pull request #8479 from surajshetty3416/energy-points-based-on-assignments 
feat: Energy Points for assigned users on a document
 2019-09-24 06:03:07 +00:00
Mangesh-Khairnar
46af75f2ea
Update frappe/modules/utils.py 
Co-Authored-By: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
 2019-09-24 10:16:04 +05:30
gavin
436d35668d fix: dont check for disabled in case of import/migrate (#8482) 2019-09-24 10:10:49 +05:30
mergify[bot]
a0ac41742c
Merge pull request #8473 from ci2014/patch-27 
fix: sync_single_doctype method in utils.py
 2019-09-24 04:29:58 +00:00
Suraj Shetty
29bcdf1fa3 style: Fix indentation 2019-09-24 09:46:20 +05:30
Suraj Shetty
6ea039277f Merge branch 'develop' of https://github.com/frappe/frappe into energy-points-based-on-assignments 2019-09-24 09:42:53 +05:30
Leandro Iannece
d802145c9e Fixed jinja templates and translation in login page 2019-09-23 16:08:05 -03:00
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
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
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
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
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
cfbfc24398 fix: 'NoneType' object has no attribute 'get' 2019-09-20 16:16:57 +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
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
Rohit Waghchaure
79be132e3d feat: added flag to skip redirect on error for quick entry 2019-09-20 12:22:54 +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
Suraj Shetty
ac1c242a14 feat: Energy Points for assigned users on a document 2019-09-19 17:55:34 +05:30
Aditya Hase
420c56bca0
fix: retain doc.name (#8461) 
fix: retain doc.name
 2019-09-19 17:29:58 +05:30
Suraj Shetty
61f98c6ce9
Merge pull request #8304 from netchampfaris/file-upload-fix 
fix: Remove NestedSet from File
 2019-09-19 17:18:10 +05:30
Shivam Mishra
3e390470ae fix: retain doc.name 2019-09-19 17:10:04 +05:30