Commit graph

11283 commits

Author SHA1 Message Date
robert schouten
a6ff078925 [fix] only show submit message when permitted 2017-01-10 10:09:24 +08:00
Nabin Hait
deb2784bda Merge branch 'hotfix' 2017-01-09 16:04:32 +05:30
Nabin Hait
02cc23cf89 bumped to version 7.2.6 2017-01-09 16:34:32 +06:00
Nabin Hait
be5d73c5eb Merge pull request #2556 from saurabh6790/auto_email_report_fix
[fix] validate filters before sending a email
2017-01-09 16:03:22 +05:30
Nabin Hait
a29d0a4c35 Update auto_email_report.py 2017-01-09 16:02:51 +05:30
Nabin Hait
5a027053c8 Merge pull request #2552 from nabinhait/filter_dashboard
Reload in_standard_filter property
2017-01-09 15:45:03 +05:30
Saurabh
ba39d7c04f [fix] validate filters before sending a email 2017-01-07 15:02:49 +05:30
Nabin Hait
4112407391 Reload in_standard_filter property 2017-01-06 12:56:04 +05:30
Rushabh Mehta
fa4ec39bf3 Revert "Fix Custom Field In Standard Filter" (#2550) 2017-01-05 18:20:50 +05:30
Nabin Hait
d91d519cd4 Update customize_form_field.json 2017-01-05 18:00:46 +05:30
Viet Pham
0ec38cfdd2 Fix Custom Field In Standard Filter (#2545)
* custom_field in_standard_filter fix

* add missing files

* Update custom_field_in_standard_filter_fix.py
2017-01-05 15:13:36 +05:30
rohitwaghchaure
0bf453a204 [Fix] Super object has no attribute on_update (#2543) 2017-01-05 15:09:56 +05:30
Nabin Hait
6b16fa9df3 Merge branch 'hotfix' 2016-12-30 14:45:57 +05:30
Nabin Hait
15d08e611b bumped to version 7.2.5 2016-12-30 15:15:57 +06:00
Nabin Hait
c8f64260ca Merge pull request #2533 from rmehta/hotfix
[fix] treeview fixes frappe/erpnext#7318
2016-12-30 14:21:48 +05:30
Rushabh Mehta
9eb24e8a13 [fix] treeview fixes frappe/erpnext#7318 2016-12-30 13:06:35 +05:30
Nabin Hait
51c97cf118 Merge branch 'hotfix' 2016-12-28 12:18:30 +05:30
Nabin Hait
2d7c6ffa81 bumped to version 7.2.4 2016-12-28 12:48:30 +06:00
Nabin Hait
ec42dcd4f7 minor fix for function import 2016-12-28 12:17:32 +05:30
Nabin Hait
67ce410824 Merge branch 'hotfix' 2016-12-28 11:08:12 +05:30
Nabin Hait
82448297c7 bumped to version 7.2.3 2016-12-28 11:38:12 +06:00
Nabin Hait
345c85f3d8 Merge pull request #2521 from saurabh6790/disable_additional_users
[fix] reset simultaneous sessions after disabling users
2016-12-28 11:06:09 +05:30
Saurabh
f246cc3810 [fix] reset simultaneous sessions after disabling users 2016-12-27 19:20:17 +05:30
Nabin Hait
15a050dc68 Merge branch 'hotfix' 2016-12-27 14:25:59 +05:30
Nabin Hait
46229be379 bumped to version 7.2.2 2016-12-27 14:55:59 +06:00
Nabin Hait
9a2c086dc6 Merge pull request #2518 from netchampfaris/hotfix
[hotfix] Allow Page break inside tables
2016-12-27 13:36:12 +05:30
Nabin Hait
da9cff2337 Update print_settings.json 2016-12-27 13:35:50 +05:30
Faris Ansari
dd0dfe1231 Allow Page break inside tables 2016-12-27 11:50:17 +05:30
Nabin Hait
181b37d67e Merge branch 'hotfix' 2016-12-24 14:57:07 +05:30
Nabin Hait
37277b2a1e bumped to version 7.2.1 2016-12-24 15:27:07 +06:00
Nabin Hait
a2215c7a9a [Fix]Attachment in Amended doc 2016-12-24 14:51:07 +05:30
Nabin Hait
f2bc961e1b Fixed merge conflict 2016-12-23 17:35:38 +05:30
Nabin Hait
4b23110806 bumped to version 7.2.0 2016-12-23 18:05:03 +06:00
Nabin Hait
26507591d9 Update __init__.py 2016-12-23 16:59:42 +05:30
Rushabh Mehta
a99575f6c6 [fix] [test] 2016-12-23 11:05:21 +05:30
Rushabh Mehta
6b637203f9 [minor] remove document_flow.py, use _sidebar.json and fix frappe/erpnext#7300 2016-12-23 09:42:15 +05:30
Nabin Hait
f00eecb3b0 Update query_report.js 2016-12-22 18:40:11 +05:30
Nabin Hait
8509d3a45c Merge branch 'hotfix' 2016-12-21 17:37:35 +05:30
Nabin Hait
930e0bba9c bumped to version 7.1.29 2016-12-21 18:07:35 +06:00
Rushabh Mehta
afa8bf1e96 [fix] sortfield validation for multiple fields and frappe.model.set_value (js) takes in a dict 2016-12-21 17:29:16 +05:30
Rushabh Mehta
7dd822aeb6 [fix] loading page title from html 2016-12-21 14:51:34 +05:30
Nabin Hait
a92c753be7 Merge pull request #2470 from saurabh6790/disable_additional_users
[fix] dissable additional users by creation date
2016-12-21 13:41:06 +05:30
Saurabh
0577fcff3b [fix] exclude one user with system manger role while pulling active users list 2016-12-21 13:31:37 +05:30
Rushabh Mehta
c8a80786e3 [fix] validate sort_field in doctype.py 2016-12-21 13:01:21 +05:30
Rushabh Mehta
17d78e2bbb [fix] email validation 2016-12-21 12:41:51 +05:30
Saurabh
b627342a9b [fix] testcase fix for deactivating additional users after limit set 2016-12-21 12:34:28 +05:30
Saurabh
68cbbaacc7 [fix] test case to deactivate additional user 2016-12-21 12:34:28 +05:30
Saurabh
86ebaf22aa [fix] dissable additiona users by creation date 2016-12-21 12:34:28 +05:30
Nabin Hait
8443debfdf Merge branch 'hotfix' 2016-12-21 11:40:52 +05:30
Nabin Hait
865ecde1cb bumped to version 7.1.28 2016-12-21 12:10:52 +06:00