Commit graph

14692 commits

Author SHA1 Message Date
Rushabh Mehta
06f1eeff35 [fix] patch 2017-07-11 11:01:05 +05:30
Rushabh Mehta
9e5df7aeff [fix] patch 2017-07-11 11:00:10 +05:30
Rushabh Mehta
b6ac024576 [style] make payment pages standard (#3655) 2017-07-11 10:56:01 +05:30
Nabin Hait
8f3eb00541 Delete custom docperm while deleting doctypes (#3654)
* Delete custom docperm while deleting doctypes

* Update delete_custom_docperm_if_doctype_not_exists.py
2017-07-11 10:32:40 +05:30
Rushabh Mehta
2355dafc25 [minor] no scheduler for tests 2017-07-11 10:28:07 +05:30
Rushabh Mehta
b38aff0b89 [minor] remove commented lines in travis.yml 2017-07-11 10:28:07 +05:30
ci2014
b3bf9f35e3 Add success and error callback (#3651)
Allows developers to use callbacks like following:

	new frappe.views.CommunicationComposer({
		doc: frm.doc,
		frm: frm,
		subject: __(frm.meta.name) + ': ' + frm.docname,
		recipients: frm.doc.email || frm.doc.email_id || frm.doc.contact_email,
		attach_document_print: true,
		message: message,
		real_name: frm.doc.real_name || frm.doc.contact_display || frm.doc.contact_name,
		success: function(r) { console.log(r); alert("Mail sent!"); },
		error: function(r) { console.log(r); alert("Mail not sent!"); }
	});
2017-07-11 10:24:36 +05:30
Charles-Henri Decultot
2da4bafa1e Clear outbox modification (#3628)
* Clear Outbox modification

* Correction of SQL query
2017-07-11 10:23:06 +05:30
Manas Solanki
91ebe48c48 add only visible data for downloading report (#3620) 2017-07-11 10:22:25 +05:30
Britlog
6d1c652cfe Blog breadcrumbs (#3646)
* Blog breadcrumbs

* Update blog_post.py

* Update blog_post.py
2017-07-10 12:59:04 +05:30
mbauskar
fc52f2070b Merge branch 'develop' 2017-07-10 12:56:46 +05:30
mbauskar
fcee43d37a bumped to version 8.3.9 2017-07-10 13:26:45 +06:00
Rushabh Mehta
06415a6e11 [fixes] for frappe/erpnext#9740, frappe/erpnext#9733, frappe/erpnext#9666, frappe/erpnext#9651, frappe/erpnext#9694, frappe/erpnext#9620 (#3648)
* [fixes] for frappe/erpnext#9740, frappe/erpnext#9733, frappe/erpnext#9666, frappe/erpnext#9651, frappe/erpnext#9694, frappe/erpnext#9620

* [minor] formatter for filters
2017-07-10 12:54:25 +05:30
Nabin Hait
49a792dbee Merge branch 'develop' 2017-07-08 19:36:52 +05:30
Nabin Hait
b9322b013e bumped to version 8.3.8 2017-07-08 20:06:52 +06:00
Nabin Hait
d366bde7c1 Escape success message (#3644) 2017-07-08 19:33:58 +05:30
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
crossxcell99
e4c2057acc general verification method set in system settings 2017-07-07 17:26:52 +01:00
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
crossxcell99
fbd8218dff fix otp method to default in User doctype 2017-07-07 12:27:29 +01:00
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
crossxcell99
9741ca7dcf use OTP App, SMS or Email to authenticate 2017-07-06 18:46:26 +01:00
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