Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Multiple changes:

Browse Source 
[Mod] Used async-await for asynchronous save in draft mode
[Fix] Fixed bug that din't allow to submit a new POS Invoice
This commit is contained in:
Saurabh 2018-01-13 01:43:48 +05:30
parent c5a6cf3a0e
commit a2076a1ff0
2 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
erpnext/selling/page/point_of_sale/point_of_sale.js
View File

@ -279,9 +279,9 @@ erpnext.pos.PointOfSale = class PointOfSale {
} }
submit_sales_invoice() { submit_sales_invoice() {
var islocal_dummy = 1; var is_saved = 0;
if(!this.frm.doc.__islocal){ if(!this.frm.doc.__islocal){
islocal_dummy = 0; is_saved = 1;
} }
frappe.confirm(__("Permanently Submit {0}?", [this.frm.doc.name]), () => { frappe.confirm(__("Permanently Submit {0}?", [this.frm.doc.name]), () => {
frappe.call({ frappe.call({
@ -289,7 +289,7 @@ erpnext.pos.PointOfSale = class PointOfSale {
freeze: true, freeze: true,
args: { args: {
doc: this.frm.doc, doc: this.frm.doc,
islocal_dummy: islocal_dummy is_saved: is_saved
} }
}).then(r => { }).then(r => {
if(r.message) { if(r.message) {
@ -505,13 +505,11 @@ erpnext.pos.PointOfSale = class PointOfSale {
set_form_action() { set_form_action() {
if(this.frm.doc.docstatus == 1 || (this.frm.doc.allow_print_before_pay == 1&&this.frm.doc.items.length>0)){ if(this.frm.doc.docstatus == 1 || (this.frm.doc.allow_print_before_pay == 1&&this.frm.doc.items.length>0)){
this.page.set_secondary_action(__("Print"), () => { this.page.set_secondary_action(__("Print"), async() => {
if(this.frm.doc.docstatus != 1 ){ if(this.frm.doc.docstatus != 1 ){
this.frm.save(); await this.frm.save();
setTimeout(() => {this.frm.print_preview.printit(true);}, 1700);
}else{
this.frm.print_preview.printit(true);
} }
this.frm.print_preview.printit(true);
}); });
} }
if(this.frm.doc.items.length == 0){ if(this.frm.doc.items.length == 0){

4
erpnext/selling/page/point_of_sale/point_of_sale.py
View File

@ -88,11 +88,11 @@ def get_conditions(item_code, serial_no, batch_no, barcode):
return '%%%s%%'%(frappe.db.escape(item_code)), condition return '%%%s%%'%(frappe.db.escape(item_code)), condition
@frappe.whitelist() @frappe.whitelist()
def submit_invoice(doc,islocal_dummy): def submit_invoice(doc,is_saved):
if isinstance(doc, basestring): if isinstance(doc, basestring):
args = json.loads(doc) args = json.loads(doc)
if islocal_dummy: if(is_saved == 1):
doc = frappe.get_doc('Sales Invoice',args["name"]) doc = frappe.get_doc('Sales Invoice',args["name"])
else: else:
doc = frappe.new_doc('Sales Invoice') doc = frappe.new_doc('Sales Invoice')