Commit graph

12970 commits

Author SHA1 Message Date
Nabin Hait
cd27a947d0 Merge branch 'develop' 2017-07-08 13:56:54 +05:30
Nabin Hait
23942517d1 bumped to version 8.3.7 2017-07-08 14:26:54 +06:00
negstek
ff5eb069c6 Update web-views.md (#3642)
Correction of typing error
2017-07-08 13:53:31 +05:30
Nabin Hait
698e2d8c69 Escaped success msg in web form. Fixes frappe/erpnext#9729 (#3643) 2017-07-08 13:53:00 +05:30
Rushabh Mehta
4fbb05d1ef [fix] attach image refresh, fixes frappe/erpnext#9725 2017-07-08 13:10:17 +05:30
Rushabh Mehta
4bdd483d4e [fix] summernote for firefox 2017-07-08 10:06:20 +05:30
mbauskar
a6db906f1b Merge branch 'develop' 2017-07-07 20:30:07 +05:30
mbauskar
a2090da413 bumped to version 8.3.6 2017-07-07 21:00:07 +06:00
Makarand Bauskar
b89c69ee60 [hotfix] uncaught read property split of undefinded (#3640) 2017-07-07 20:29:31 +05:30
Rushabh Mehta
fee697e7f3 [fix] summernote recursion 2017-07-07 20:20:17 +05:30
mbauskar
e46bb520c2 Merge branch 'develop' 2017-07-07 19:30:08 +05:30
mbauskar
a86ddb0ff5 bumped to version 8.3.5 2017-07-07 20:00:07 +06:00
Rushabh Mehta
a4a9959615 [typo] script_manager.js 2017-07-07 19:16:44 +05:30
Rushabh Mehta
258ec9a5f9 [fix] link broken in quick entry and filter setting in list view 2017-07-07 19:05:55 +05:30
mbauskar
9896b04f59 Merge branch 'develop' 2017-07-07 18:04:18 +05:30
mbauskar
e1c4c2ae9d bumped to version 8.3.4 2017-07-07 18:34:18 +06:00
Rushabh Mehta
4a7551a010 [hot] more js fixes 2017-07-07 17:40:22 +05:30
mbauskar
f8c8ea994e Merge branch 'develop' 2017-07-07 17:09:20 +05:30
mbauskar
74452ae033 bumped to version 8.3.3 2017-07-07 17:39:20 +06:00
Rushabh Mehta
c08105a7f1 [refactor] cleanup promises (#3639)
* [refactor] cleanup promises

* [minor]

* [update] refresh_input

* [hot] fix for set multiple values
2017-07-07 17:08:33 +05:30
mbauskar
209a109fbf Merge branch 'hotfix' 2017-07-07 16:57:04 +05:30
mbauskar
2b419ad513 Merge branch 'master' into develop 2017-07-07 16:57:04 +05:30
mbauskar
ae8b1b21ac bumped to version 8.3.2 2017-07-07 17:27:04 +06:00
Rushabh Mehta
7433286f36 [feature] ability to set a property after sending alert (#3635)
* [feature] ability to set a property after sending alert

* [minor] use db_set

* [minor] email alert show message only if not standard
2017-07-07 16:38:25 +05:30
Saurabh
3dd60a1d1f [fix] for disable next button 2017-07-07 16:28:06 +05:30
Rushabh Mehta
0d63eb07ab [fix] frm.set_value to return promise (#3637) 2017-07-07 13:21:39 +05:30
Rushabh Mehta
a9a33434b6 [minor] website_sidebar will pull sidebar for any website page 2017-07-07 10:45:47 +05:30
Rushabh Mehta
4e4a42af91 [view] form dashboard behaves like a form section and is now collapsible (#3596)
* [view] form dashboard behaves like a form section and is now collapsible

* [fix] alert on newline

* [fix] clear headline in email_account.js
2017-07-07 09:13:55 +05:30
mbauskar
6c202ae2b5 Merge branch 'develop' 2017-07-06 19:53:19 +05:30
mbauskar
c23cc387c5 bumped to version 8.3.1 2017-07-06 20:23:19 +06:00
Makarand Bauskar
566dd61fb9 [hotfix] used set_value to save format instead of save (#3634) 2017-07-06 19:11:49 +05:30
Rushabh Mehta
c2af7982c7 [fix] set_input for controlselect (#3632)
* [fix] set_input for controlselect

* [fix] control.js
2017-07-06 19:11:18 +05:30
mbauskar
a93acd8579 Merge branch 'develop' 2017-07-06 16:10:58 +05:30
mbauskar
3771cbc93d bumped to version 8.3.0 2017-07-06 16:40:57 +06:00
Faris Ansari
bc4368af02 [minor] fix in reportview (#3627) 2017-07-06 15:53:16 +05:30
Rushabh Mehta
8cf7fc5f09 [fix] for check 2017-07-06 14:59:25 +05:30
Rushabh Mehta
8eedcda8e9 [fix] for tests 2017-07-06 10:49:21 +05:30
Manas Solanki
d0857f8013 Apply User Permissions is being ignored for blank field values (#3496)
* issue where Apply User Permissions is being ignored for blank field values

* configurable settings and added test case

* Update system_settings.json

* save and use locally stored value for strict user permission
2017-07-06 10:48:12 +05:30
Rushabh Mehta
22bf2500dd [cleanup] santize get_value, fixes frappe/erpnext#9561 (#3624) 2017-07-06 10:40:05 +05:30
Prateeksha Singh
2f6987e094 [minor][awesomebar] fix list options (#3619) 2017-07-06 10:24:17 +05:30
Rushabh Mehta
f6ed74629b [minor] control.js fix t-for-today 2017-07-05 20:41:02 +05:30
Rushabh Mehta
0167361662 [fix] field.set_value must only validate_and_set_in_model, not parse (#3618) 2017-07-05 17:50:47 +05:30
Saurabh
19ee84a58e Validate column length (#3556)
* [fix] validate column length while creating doctype or custom field

* [fix] not allow user to add custom fields in [Custom Field, Customize Form Field, Customize Form, Custom Script, Property Setter]

* [fix] check if fieldname is conflicting with method names

* [fix] don't allow Custom Script and Property Setter to be updated via customize form
2017-07-05 15:03:01 +05:30
Rushabh Mehta
1b3fab9daf [text-editor] dont keep refreshing value and better message for mandatory missing 2017-07-05 14:38:05 +05:30
rohitwaghchaure
5b2d7cb12c [Fix] Not able to rename the company if it's linked with the single doctype which has mandatory fields (#3614) 2017-07-05 13:47:17 +05:30
Rushabh Mehta
43ccc84584 [text-editor] dont keep refreshing value 2017-07-05 13:25:13 +05:30
Rushabh Mehta
cfa84d7af3 [text-editor] dont keep refreshing value 2017-07-05 13:14:20 +05:30
Rushabh Mehta
f00976eebb [text-editor] dont keep refreshing value 2017-07-05 13:11:45 +05:30
Rushabh Mehta
da683b6f28 [text-editor] dont keep refreshing value 2017-07-05 13:04:43 +05:30
Makarand Bauskar
f2c9fd28e8 [minor] reload auto email report doctype before settings format to xlsx (#3613) 2017-07-05 12:07:34 +05:30