vassili/seitime-frappe
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 4

Merge pull request #7886 from deepeshgarg007/quick_entry_for_submittable

Browse source 
feat(quick_entry): Allow submitting doc in quick entry
This commit is contained in:
mergify[bot] 2019-07-12 08:45:48 +00:00 • committed by GitHub
commit 9ffbbef511
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 41 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

50
frappe/public/js/frappe/form/quick_entry.js
View file

@ -159,17 +159,29 @@ frappe.ui.form.QuickEntryForm = Class.extend({
doc: me.dialog.doc
},
callback: function(r) {
me.dialog.hide();
// delete the old doc
frappe.model.clear_doc(me.dialog.doc.doctype, me.dialog.doc.name);
me.dialog.doc = r.message;
if(frappe._from_link) {
frappe.ui.form.update_calling_link(me.dialog.doc);
if (frappe.model.is_submittable(me.doctype)) {
frappe.run_serially([
() => me.dialog.working = true,
() => {
me.dialog.set_primary_action(__('Submit'), function() {
me.submit(r.message);
});
}
]);
} else {
if(me.after_insert) {
me.after_insert(me.dialog.doc);
me.dialog.hide();
// delete the old doc
frappe.model.clear_doc(me.dialog.doc.doctype, me.dialog.doc.name);
me.dialog.doc = r.message;
if(frappe._from_link) {
frappe.ui.form.update_calling_link(me.dialog.doc);
} else {
me.open_form_if_not_list();
if(me.after_insert) {
me.after_insert(me.dialog.doc);
} else {
me.open_form_if_not_list();
}
}
}
},
@ -185,6 +197,26 @@ frappe.ui.form.QuickEntryForm = Class.extend({
});
},
submit: function(doc) {
var me = this;
frappe.call({
method: "frappe.client.submit",
args : {
doc: doc
},
callback: function(r) {
me.dialog.hide();
// delete the old doc
frappe.model.clear_doc(me.dialog.doc.doctype, me.dialog.doc.name);
me.dialog.doc = r.message;
if (frappe._from_link) {
frappe.ui.form.update_calling_link(me.dialog.doc);
}
cur_frm.reload_doc();
}
});
},
open_form_if_not_list: function() {
let route = frappe.get_route();
let doc = this.dialog.doc;