Merge branch 'master' into edge
This commit is contained in:
commit
93a02a3995
@ -5,7 +5,7 @@ erpnext.updates = [
|
|||||||
"General Ledger: Now, on filter of any account group, you will have an option to see \
|
"General Ledger: Now, on filter of any account group, you will have an option to see \
|
||||||
the report <b>grouped by ledgers</b> under that group and with opening \
|
the report <b>grouped by ledgers</b> under that group and with opening \
|
||||||
and closing balance for each of them."
|
and closing balance for each of them."
|
||||||
]]
|
]],
|
||||||
["28th December 2012", [
|
["28th December 2012", [
|
||||||
"Workflow: Added System for Multi-level approval before Submission. \
|
"Workflow: Added System for Multi-level approval before Submission. \
|
||||||
<br>See video at <a href='https://www.youtube.com/watch?v=zuGv59_wJKw' \
|
<br>See video at <a href='https://www.youtube.com/watch?v=zuGv59_wJKw' \
|
||||||
|
@ -17,7 +17,7 @@
|
|||||||
cur_frm.cscript.refresh = function(doc) {
|
cur_frm.cscript.refresh = function(doc) {
|
||||||
erpnext.hide_naming_series();
|
erpnext.hide_naming_series();
|
||||||
if(!doc.__islocal && !cint(doc.email_sent) && !doc.__unsaved
|
if(!doc.__islocal && !cint(doc.email_sent) && !doc.__unsaved
|
||||||
&& inList(wn.boot.can_write, doc.doctype)) {
|
&& inList(wn.boot.profile.can_write, doc.doctype)) {
|
||||||
cur_frm.add_custom_button('Send', function() {
|
cur_frm.add_custom_button('Send', function() {
|
||||||
$c_obj(make_doclist(doc.doctype, doc.name), 'send_emails', '', function(r) {
|
$c_obj(make_doclist(doc.doctype, doc.name), 'send_emails', '', function(r) {
|
||||||
cur_frm.refresh();
|
cur_frm.refresh();
|
||||||
|
Loading…
x
Reference in New Issue
Block a user