\
@@ -102,12 +73,12 @@ wn.pages.Setup.make = function(wrapper) {
col.addClass("col-offset-1");
else
$('
').appendTo(row);
-
+
if(item.doctype) {
var badge = col.find(".badge, .data-link")
.attr("data-doctype", item.doctype)
.css({"cursor": "pointer"})
-
+
if(item.single) {
badge.click(function() {
wn.set_route("Form", $(this).attr("data-doctype"))
@@ -118,10 +89,10 @@ wn.pages.Setup.make = function(wrapper) {
})
}
}
-
+
// tree
$links = $('
').appendTo(row);
-
+
if(item.tree) {
$('
Browse\
| \
@@ -134,7 +105,7 @@ wn.pages.Setup.make = function(wrapper) {
mylink.click(function() {
wn.set_route(item.tree, item.doctype);
})
-
+
} else if(item.single) {
$('
Edit')
.appendTo($links)
@@ -183,7 +154,7 @@ wn.pages.Setup.make = function(wrapper) {
wn.route_options = {doctype:$(this).attr("data-doctype")}
wn.set_route("data-import-tool");
})
-
+
if(item.links) {
$.each(item.links, function(i, link) {
var newlinks = $('
| \
@@ -192,11 +163,40 @@ wn.pages.Setup.make = function(wrapper) {
.appendTo($links)
})
}
-
+
if(item.dependencies) {
$.each(item.dependencies, function(i, d) {
render_item(d, true);
})
}
}
+
+ return wn.call({
+ method: "setup.page.setup.setup.get",
+ callback: function(r) {
+ if(r.message) {
+ body.empty();
+ if(wn.boot.expires_on) {
+ $(body).prepend("
Account expires on "
+ + wn.datetime.global_date_format(wn.boot.expires_on) + "
");
+ }
+
+ $completed = $('
Setup Completed \
+ ')
+ .appendTo(body);
+
+ $.each(r.message, function(i, item) {
+ render_item(item)
+ });
+
+ var completed_percent = cint(flt(completed) / total * 100) + "%";
+ $completed
+ .find(".progress-bar")
+ .css({"width": completed_percent});
+ $(body)
+ .find(".completed-percent")
+ .html("(" + completed_percent + ")");
+ }
+ }
+ });
}
\ No newline at end of file
diff --git a/stock/doctype/delivery_note/delivery_note.js b/stock/doctype/delivery_note/delivery_note.js
index de6e9dcc87d..0c47148bf66 100644
--- a/stock/doctype/delivery_note/delivery_note.js
+++ b/stock/doctype/delivery_note/delivery_note.js
@@ -29,13 +29,15 @@ erpnext.stock.DeliveryNoteController = erpnext.selling.SellingController.extend(
refresh: function(doc, dt, dn) {
this._super();
- if(flt(doc.per_billed, 2) < 100 && doc.docstatus==1) cur_frm.add_custom_button('Make Invoice', this.make_sales_invoice);
+ if(!doc.__billing_complete && doc.docstatus==1) cur_frm.add_custom_button('Make Invoice', this.make_sales_invoice);
if(flt(doc.per_installed, 2) < 100 && doc.docstatus==1)
cur_frm.add_custom_button('Make Installation Note', this.make_installation_note);
if (doc.docstatus==1) {
cur_frm.add_custom_button('Send SMS', cur_frm.cscript.send_sms);
+ this.show_stock_ledger();
+ this.show_general_ledger();
}
if(doc.docstatus==0 && !doc.__islocal) {
@@ -112,7 +114,7 @@ cur_frm.fields_dict['project_name'].get_query = function(doc, cdt, cdn) {
cur_frm.cscript.serial_no = function(doc, cdt, cdn) {
var d = locals[cdt][cdn];
if (d.serial_no) {
- get_server_fields('get_serial_details',d.serial_no,'delivery_note_details',doc,cdt,cdn,1);
+ return get_server_fields('get_serial_details',d.serial_no,'delivery_note_details',doc,cdt,cdn,1);
}
}
diff --git a/stock/doctype/delivery_note/delivery_note.py b/stock/doctype/delivery_note/delivery_note.py
index 7ea512daad5..81c4b6cedbf 100644
--- a/stock/doctype/delivery_note/delivery_note.py
+++ b/stock/doctype/delivery_note/delivery_note.py
@@ -50,6 +50,13 @@ class DocType(SellingController):
'keyword': 'Delivered'
}]
+ def onload(self):
+ billed_qty = webnotes.conn.sql("""select sum(ifnull(qty, 0)) from `tabSales Invoice Item`
+ where delivery_note=%s""", self.doc.name)
+ if billed_qty:
+ total_qty = sum((item.qty for item in self.doclist.get({"parentfield": "delivery_note_details"})))
+ self.doc.fields["__billing_complete"] = billed_qty[0][0] == total_qty
+
def get_contact_details(self):
return get_obj('Sales Common').get_contact_details(self,0)
diff --git a/stock/doctype/item/item.js b/stock/doctype/item/item.js
index 9af8331d0b0..a8401c41eb9 100644
--- a/stock/doctype/item/item.js
+++ b/stock/doctype/item/item.js
@@ -51,7 +51,7 @@ cur_frm.cscript.refresh = function(doc) {
var enabled = (r.message == 'exists') ? false : true;
cur_frm.toggle_enable(['has_serial_no', 'is_stock_item', 'valuation_method'], enabled);
}
- $c_obj(make_doclist(doc.doctype, doc.name),'check_if_sle_exists','',callback);
+ return $c_obj(make_doclist(doc.doctype, doc.name),'check_if_sle_exists','',callback);
}
}
@@ -130,7 +130,7 @@ cur_frm.fields_dict['item_tax'].grid.get_field("tax_type").get_query = function(
cur_frm.cscript.tax_type = function(doc, cdt, cdn){
var d = locals[cdt][cdn];
- get_server_fields('get_tax_rate',d.tax_type,'item_tax',doc, cdt, cdn, 1);
+ return get_server_fields('get_tax_rate',d.tax_type,'item_tax',doc, cdt, cdn, 1);
}
diff --git a/stock/doctype/material_request/material_request.js b/stock/doctype/material_request/material_request.js
index bd5ab8239be..fe9af31e247 100644
--- a/stock/doctype/material_request/material_request.js
+++ b/stock/doctype/material_request/material_request.js
@@ -124,7 +124,7 @@ cur_frm.cscript['Stop Material Request'] = function() {
var check = confirm("Do you really want to STOP this Material Request?");
if (check) {
- $c('runserverobj', args={'method':'update_status', 'arg': 'Stopped', 'docs': wn.model.compress(make_doclist(doc.doctype, doc.name))}, function(r,rt) {
+ return $c('runserverobj', args={'method':'update_status', 'arg': 'Stopped', 'docs': wn.model.compress(make_doclist(doc.doctype, doc.name))}, function(r,rt) {
cur_frm.refresh();
});
}
@@ -135,7 +135,7 @@ cur_frm.cscript['Unstop Material Request'] = function(){
var check = confirm("Do you really want to UNSTOP this Material Request?");
if (check) {
- $c('runserverobj', args={'method':'update_status', 'arg': 'Submitted','docs': wn.model.compress(make_doclist(doc.doctype, doc.name))}, function(r,rt) {
+ return $c('runserverobj', args={'method':'update_status', 'arg': 'Submitted','docs': wn.model.compress(make_doclist(doc.doctype, doc.name))}, function(r,rt) {
cur_frm.refresh();
});
}
diff --git a/stock/doctype/packing_slip/packing_slip.js b/stock/doctype/packing_slip/packing_slip.js
index e19ab493004..d86d64b6c62 100644
--- a/stock/doctype/packing_slip/packing_slip.js
+++ b/stock/doctype/packing_slip/packing_slip.js
@@ -36,7 +36,7 @@ cur_frm.cscript.onload_post_render = function(doc, cdt, cdn) {
}
cur_frm.cscript.get_items = function(doc, cdt, cdn) {
- this.frm.call({
+ return this.frm.call({
doc: this.frm.doc,
method: "get_items",
callback: function(r) {
diff --git a/stock/doctype/purchase_receipt/purchase_receipt.js b/stock/doctype/purchase_receipt/purchase_receipt.js
index a134da14d37..b393907bee2 100644
--- a/stock/doctype/purchase_receipt/purchase_receipt.js
+++ b/stock/doctype/purchase_receipt/purchase_receipt.js
@@ -28,11 +28,14 @@ erpnext.stock.PurchaseReceiptController = erpnext.buying.BuyingController.extend
this._super();
if(this.frm.doc.docstatus == 1) {
- if(flt(this.frm.doc.per_billed, 2) < 100) {
+ if(!this.frm.doc.__billing_complete) {
cur_frm.add_custom_button('Make Purchase Invoice',
this.make_purchase_invoice);
}
cur_frm.add_custom_button('Send SMS', cur_frm.cscript['Send SMS']);
+
+ this.show_stock_ledger();
+ this.show_general_ledger();
}
cur_frm.add_custom_button(wn._('From Purchase Order'),
@@ -68,6 +71,10 @@ erpnext.stock.PurchaseReceiptController = erpnext.buying.BuyingController.extend
var item = wn.model.get_doc(cdt, cdn);
wn.model.round_floats_in(item, ["qty", "received_qty"]);
+ if(!(item.received_qty || item.rejected_qty) && item.qty) {
+ item.received_qty = item.qty;
+ }
+
if(item.qty > item.received_qty) {
msgprint(wn._("Error") + ": " + wn._(wn.meta.get_label(item.doctype, "qty", item.name))
+ " > " + wn._(wn.meta.get_label(item.doctype, "received_qty", item.name)));
diff --git a/stock/doctype/purchase_receipt/purchase_receipt.py b/stock/doctype/purchase_receipt/purchase_receipt.py
index 62b7a4f352a..703929ce81a 100644
--- a/stock/doctype/purchase_receipt/purchase_receipt.py
+++ b/stock/doctype/purchase_receipt/purchase_receipt.py
@@ -44,6 +44,13 @@ class DocType(BuyingController):
'source_field': 'qty',
'percent_join_field': 'prevdoc_docname',
}]
+
+ def onload(self):
+ billed_qty = webnotes.conn.sql("""select sum(ifnull(qty, 0)) from `tabPurchase Invoice Item`
+ where purchase_receipt=%s""", self.doc.name)
+ if billed_qty:
+ total_qty = sum((item.qty for item in self.doclist.get({"parentfield": "purchase_receipt_details"})))
+ self.doc.fields["__billing_complete"] = billed_qty[0][0] == total_qty
# get available qty at warehouse
def get_bin_details(self, arg = ''):
diff --git a/stock/doctype/serial_no/serial_no.js b/stock/doctype/serial_no/serial_no.js
index 0253ffbe839..8e833d738f1 100644
--- a/stock/doctype/serial_no/serial_no.js
+++ b/stock/doctype/serial_no/serial_no.js
@@ -54,7 +54,7 @@ cur_frm.fields_dict['territory'].get_query = function(doc,cdt,cdn) {
// Supplier
//-------------
cur_frm.cscript.supplier = function(doc,dt,dn) {
- if(doc.supplier) get_server_fields('get_default_supplier_address', JSON.stringify({supplier: doc.supplier}),'', doc, dt, dn, 1);
+ if(doc.supplier) return get_server_fields('get_default_supplier_address', JSON.stringify({supplier: doc.supplier}),'', doc, dt, dn, 1);
if(doc.supplier) unhide_field(['supplier_name','address_display']);
}
diff --git a/stock/doctype/stock_entry/stock_entry.js b/stock/doctype/stock_entry/stock_entry.js
index 7032f92ec1f..4ade2ff4d4d 100644
--- a/stock/doctype/stock_entry/stock_entry.js
+++ b/stock/doctype/stock_entry/stock_entry.js
@@ -25,14 +25,14 @@ erpnext.stock.StockEntry = erpnext.stock.StockController.extend({
set_default_account: function() {
var me = this;
- if (sys_defaults.auto_inventory_accounting && !this.frm.doc.expense_adjustment_account) {
- if (this.frm.doc.purpose == "Sales Return")
+ if (cint(wn.defaults.get_default("auto_inventory_accounting")) && !this.frm.doc.expense_adjustment_account) {
+ if (this.frm.doc.purpose == "Sales Return")
account_for = "stock_in_hand_account";
else if (this.frm.doc.purpose == "Purchase Return")
account_for = "stock_received_but_not_billed";
else account_for = "stock_adjustment_account";
- this.frm.call({
+ return this.frm.call({
method: "accounts.utils.get_company_default",
args: {
"fieldname": account_for,
@@ -78,7 +78,7 @@ erpnext.stock.StockEntry = erpnext.stock.StockController.extend({
}
};
- if (sys_defaults.auto_inventory_accounting) {
+ if(cint(wn.defaults.get_default("auto_inventory_accounting"))) {
this.frm.add_fetch("company", "stock_adjustment_account", "expense_adjustment_account");
this.frm.fields_dict["expense_adjustment_account"].get_query = function() {
@@ -105,11 +105,8 @@ erpnext.stock.StockEntry = erpnext.stock.StockController.extend({
erpnext.hide_naming_series();
this.toggle_related_fields(this.frm.doc);
this.toggle_enable_bom();
- if (this.frm.doc.docstatus==1) {
- this.show_stock_ledger();
- if(wn.boot.auto_inventory_accounting)
- this.show_general_ledger();
- }
+ this.show_stock_ledger();
+ this.show_general_ledger();
if(this.frm.doc.docstatus === 1 &&
wn.boot.profile.can_create.indexOf("Journal Voucher")!==-1) {
@@ -142,7 +139,7 @@ erpnext.stock.StockEntry = erpnext.stock.StockController.extend({
},
get_items: function() {
- this.frm.call({
+ return this.frm.call({
doc: this.frm.doc,
method: "get_items",
callback: function(r) {
@@ -160,7 +157,7 @@ erpnext.stock.StockEntry = erpnext.stock.StockController.extend({
production_order: function() {
this.toggle_enable_bom();
- this.frm.call({
+ return this.frm.call({
method: "get_production_order_details",
args: {production_order: this.frm.doc.production_order}
});
@@ -212,7 +209,7 @@ erpnext.stock.StockEntry = erpnext.stock.StockController.extend({
make_return_jv: function() {
if(this.get_doctype_docname()) {
- this.frm.call({
+ return this.frm.call({
method: "make_return_jv",
args: {
stock_entry: this.frm.doc.name
@@ -269,23 +266,23 @@ cur_frm.cscript.toggle_related_fields = function(doc) {
}
cur_frm.cscript.delivery_note_no = function(doc,cdt,cdn){
- if(doc.delivery_note_no) get_server_fields('get_cust_values','','',doc,cdt,cdn,1);
+ if(doc.delivery_note_no) return get_server_fields('get_cust_values','','',doc,cdt,cdn,1);
}
cur_frm.cscript.sales_invoice_no = function(doc,cdt,cdn){
- if(doc.sales_invoice_no) get_server_fields('get_cust_values','','',doc,cdt,cdn,1);
+ if(doc.sales_invoice_no) return get_server_fields('get_cust_values','','',doc,cdt,cdn,1);
}
cur_frm.cscript.customer = function(doc,cdt,cdn){
- if(doc.customer) get_server_fields('get_cust_addr','','',doc,cdt,cdn,1);
+ if(doc.customer) return get_server_fields('get_cust_addr','','',doc,cdt,cdn,1);
}
cur_frm.cscript.purchase_receipt_no = function(doc,cdt,cdn){
- if(doc.purchase_receipt_no) get_server_fields('get_supp_values','','',doc,cdt,cdn,1);
+ if(doc.purchase_receipt_no) return get_server_fields('get_supp_values','','',doc,cdt,cdn,1);
}
cur_frm.cscript.supplier = function(doc,cdt,cdn){
- if(doc.supplier) get_server_fields('get_supp_addr','','',doc,cdt,cdn,1);
+ if(doc.supplier) return get_server_fields('get_supp_addr','','',doc,cdt,cdn,1);
}
@@ -328,7 +325,7 @@ cur_frm.cscript.item_code = function(doc, cdt, cdn) {
'serial_no' : d.serial_no,
'bom_no' : d.bom_no
};
- get_server_fields('get_item_details',JSON.stringify(args),'mtn_details',doc,cdt,cdn,1);
+ return get_server_fields('get_item_details',JSON.stringify(args),'mtn_details',doc,cdt,cdn,1);
}
cur_frm.cscript.s_warehouse = function(doc, cdt, cdn) {
@@ -341,7 +338,7 @@ cur_frm.cscript.s_warehouse = function(doc, cdt, cdn) {
'bom_no' : d.bom_no,
'qty' : d.s_warehouse ? -1* d.qty : d.qty
}
- get_server_fields('get_warehouse_details', JSON.stringify(args),
+ return get_server_fields('get_warehouse_details', JSON.stringify(args),
'mtn_details', doc, cdt, cdn, 1);
}
@@ -351,7 +348,7 @@ cur_frm.cscript.uom = function(doc, cdt, cdn) {
var d = locals[cdt][cdn];
if(d.uom && d.item_code){
var arg = {'item_code':d.item_code, 'uom':d.uom, 'qty':d.qty}
- get_server_fields('get_uom_details',JSON.stringify(arg),'mtn_details', doc, cdt, cdn, 1);
+ return get_server_fields('get_uom_details',JSON.stringify(arg),'mtn_details', doc, cdt, cdn, 1);
}
}
diff --git a/stock/doctype/stock_entry/stock_entry.py b/stock/doctype/stock_entry/stock_entry.py
index 58f17c7401a..afa3eb4f011 100644
--- a/stock/doctype/stock_entry/stock_entry.py
+++ b/stock/doctype/stock_entry/stock_entry.py
@@ -554,7 +554,7 @@ class DocType(StockController):
`tabBOM Item`, `tabItem`
where
`tabBOM Item`.parent = %s and
- `tabBOM Item`.item_code = tabItem.name
+ `tabBOM Item`.item_code = tabItem.name and
`tabBOM Item`.docstatus < 2
group by item_code""", (qty, self.doc.bom_no), as_dict=1)
diff --git a/stock/doctype/stock_reconciliation/stock_reconciliation.js b/stock/doctype/stock_reconciliation/stock_reconciliation.js
index 2e0efd8c2a6..2db8cba6b26 100644
--- a/stock/doctype/stock_reconciliation/stock_reconciliation.js
+++ b/stock/doctype/stock_reconciliation/stock_reconciliation.js
@@ -26,7 +26,7 @@ erpnext.stock.StockReconciliation = erpnext.stock.StockController.extend({
var me = this;
if (sys_defaults.auto_inventory_accounting && !this.frm.doc.expense_account) {
- this.frm.call({
+ return this.frm.call({
method: "accounts.utils.get_company_default",
args: {
"fieldname": "stock_adjustment_account",
@@ -68,6 +68,7 @@ erpnext.stock.StockReconciliation = erpnext.stock.StockController.extend({
} else if(this.frm.doc.docstatus == 1) {
this.frm.set_intro("Cancelling this Stock Reconciliation will nullify its effect.");
this.show_stock_ledger();
+ this.show_general_ledger();
} else {
this.frm.set_intro("");
}
diff --git a/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.js b/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.js
index d736ff6da78..86f5bffeaa7 100644
--- a/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.js
+++ b/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.js
@@ -21,7 +21,7 @@ $.extend(cur_frm.cscript, {
item_code: function() {
if(cur_frm.doc.item_code) {
- cur_frm.call({
+ return cur_frm.call({
method: "get_stock_uom",
args: { item_code: cur_frm.doc.item_code }
});
diff --git a/stock/doctype/warehouse/warehouse.js b/stock/doctype/warehouse/warehouse.js
index 0e9cd336e57..902f66f8951 100644
--- a/stock/doctype/warehouse/warehouse.js
+++ b/stock/doctype/warehouse/warehouse.js
@@ -26,6 +26,6 @@ cur_frm.cscript.merge = function(doc, cdt, cdn) {
var check = confirm("Are you sure you want to merge this warehouse into "
+ doc.merge_with + "?");
if (check) {
- $c_obj(make_doclist(cdt, cdn), 'merge_warehouses', '', '');
+ return $c_obj(make_doclist(cdt, cdn), 'merge_warehouses', '', '');
}
}
\ No newline at end of file
diff --git a/support/doctype/customer_issue/customer_issue.js b/support/doctype/customer_issue/customer_issue.js
index 3620c7e10a5..9535fbadfce 100644
--- a/support/doctype/customer_issue/customer_issue.js
+++ b/support/doctype/customer_issue/customer_issue.js
@@ -26,13 +26,13 @@ erpnext.support.CustomerIssue = wn.ui.form.Controller.extend({
customer: function() {
var me = this;
if(this.frm.doc.customer) {
- this.frm.call({
+ // TODO shift this to depends_on
+ unhide_field(['customer_address', 'contact_person']);
+
+ return this.frm.call({
doc: this.frm.doc,
method: "set_customer_defaults",
});
-
- // TODO shift this to depends_on
- unhide_field(['customer_address', 'contact_person']);
}
},
@@ -56,7 +56,7 @@ cur_frm.cscript.onload = function(doc,cdt,cdn){
cur_frm.cscript.customer_address = cur_frm.cscript.contact_person = function(doc,dt,dn) {
if(doc.customer)
- get_server_fields('get_customer_address',
+ return get_server_fields('get_customer_address',
JSON.stringify({customer: doc.customer, address: doc.customer_address, contact: doc.contact_person}),'', doc, dt, dn, 1);
}
diff --git a/support/doctype/maintenance_schedule/maintenance_schedule.js b/support/doctype/maintenance_schedule/maintenance_schedule.js
index f8652d7e16d..436cabade68 100644
--- a/support/doctype/maintenance_schedule/maintenance_schedule.js
+++ b/support/doctype/maintenance_schedule/maintenance_schedule.js
@@ -44,7 +44,7 @@ erpnext.support.MaintenanceSchedule = wn.ui.form.Controller.extend({
customer: function() {
var me = this;
if(this.frm.doc.customer) {
- this.frm.call({
+ return this.frm.call({
doc: this.frm.doc,
method: "set_customer_defaults",
});
@@ -64,7 +64,7 @@ cur_frm.cscript.onload = function(doc, dt, dn) {
}
cur_frm.cscript.customer_address = cur_frm.cscript.contact_person = function(doc,dt,dn) {
- if(doc.customer) get_server_fields('get_customer_address', JSON.stringify({customer: doc.customer, address: doc.customer_address, contact: doc.contact_person}),'', doc, dt, dn, 1);
+ if(doc.customer) return get_server_fields('get_customer_address', JSON.stringify({customer: doc.customer, address: doc.customer_address, contact: doc.contact_person}),'', doc, dt, dn, 1);
}
cur_frm.fields_dict['customer_address'].get_query = function(doc, cdt, cdn) {
@@ -90,7 +90,7 @@ cur_frm.cscript.item_code = function(doc, cdt, cdn) {
var fname = cur_frm.cscript.fname;
var d = locals[cdt][cdn];
if (d.item_code) {
- get_server_fields('get_item_details',d.item_code, 'item_maintenance_detail',doc,cdt,cdn,1);
+ return get_server_fields('get_item_details',d.item_code, 'item_maintenance_detail',doc,cdt,cdn,1);
}
}
@@ -101,7 +101,7 @@ cur_frm.cscript.periodicity = function(doc, cdt, cdn){
arg.start_date = d.start_date;
arg.end_date = d.end_date;
arg.periodicity = d.periodicity;
- get_server_fields('get_no_of_visits',docstring(arg),'item_maintenance_detail',doc, cdt, cdn, 1);
+ return get_server_fields('get_no_of_visits',docstring(arg),'item_maintenance_detail',doc, cdt, cdn, 1);
}
else{
msgprint("Please enter Start Date and End Date");
@@ -110,7 +110,7 @@ cur_frm.cscript.periodicity = function(doc, cdt, cdn){
cur_frm.cscript.generate_schedule = function(doc, cdt, cdn) {
if (!doc.__islocal) {
- $c('runserverobj', args={'method':'generate_schedule', 'docs':wn.model.compress(make_doclist(cdt,cdn))},
+ return $c('runserverobj', args={'method':'generate_schedule', 'docs':wn.model.compress(make_doclist(cdt,cdn))},
function(r,rt){
refresh_field('maintenance_schedule_detail');
}
diff --git a/support/doctype/maintenance_visit/maintenance_visit.js b/support/doctype/maintenance_visit/maintenance_visit.js
index 9f5fc5d915e..4257afaf0f5 100644
--- a/support/doctype/maintenance_visit/maintenance_visit.js
+++ b/support/doctype/maintenance_visit/maintenance_visit.js
@@ -62,13 +62,13 @@ erpnext.support.MaintenanceVisit = wn.ui.form.Controller.extend({
customer: function() {
var me = this;
if(this.frm.doc.customer) {
- this.frm.call({
+ // TODO shift this to depends_on
+ cur_frm.cscript.hide_contact_info();
+
+ return this.frm.call({
doc: this.frm.doc,
method: "set_customer_defaults",
});
-
- // TODO shift this to depends_on
- cur_frm.cscript.hide_contact_info();
}
},
});
@@ -86,7 +86,7 @@ cur_frm.cscript.hide_contact_info = function() {
}
cur_frm.cscript.customer_address = cur_frm.cscript.contact_person = function(doc,dt,dn) {
- if(doc.customer) get_server_fields('get_customer_address', JSON.stringify({customer: doc.customer, address: doc.customer_address, contact: doc.contact_person}),'', doc, dt, dn, 1);
+ if(doc.customer) return get_server_fields('get_customer_address', JSON.stringify({customer: doc.customer, address: doc.customer_address, contact: doc.contact_person}),'', doc, dt, dn, 1);
}
cur_frm.fields_dict['customer_address'].get_query = function(doc, cdt, cdn) {
@@ -111,7 +111,7 @@ cur_frm.cscript.item_code = function(doc, cdt, cdn) {
var fname = cur_frm.cscript.fname;
var d = locals[cdt][cdn];
if (d.item_code) {
- get_server_fields('get_item_details',d.item_code, 'maintenance_visit_details',doc,cdt,cdn,1);
+ return get_server_fields('get_item_details',d.item_code, 'maintenance_visit_details',doc,cdt,cdn,1);
}
}
diff --git a/support/doctype/newsletter/newsletter.js b/support/doctype/newsletter/newsletter.js
index b7e24d21733..5842accac0d 100644
--- a/support/doctype/newsletter/newsletter.js
+++ b/support/doctype/newsletter/newsletter.js
@@ -19,7 +19,7 @@ cur_frm.cscript.refresh = function(doc) {
if(!doc.__islocal && !cint(doc.email_sent) && !doc.__unsaved
&& inList(wn.boot.profile.can_write, doc.doctype)) {
cur_frm.add_custom_button('Send', function() {
- $c_obj(make_doclist(doc.doctype, doc.name), 'send_emails', '', function(r) {
+ return $c_obj(make_doclist(doc.doctype, doc.name), 'send_emails', '', function(r) {
cur_frm.refresh();
});
})
@@ -30,7 +30,7 @@ cur_frm.cscript.refresh = function(doc) {
repl("%(fullname)s <%(email)s>", wn.user_info(doc.owner)));
}
- wn.call({
+ return wn.call({
method: "support.doctype.newsletter.newsletter.get_lead_options",
type: "GET",
callback: function(r) {
diff --git a/support/doctype/support_ticket/support_ticket.js b/support/doctype/support_ticket/support_ticket.js
index d8cc798c95c..34cc5ef4970 100644
--- a/support/doctype/support_ticket/support_ticket.js
+++ b/support/doctype/support_ticket/support_ticket.js
@@ -23,7 +23,7 @@ erpnext.support.CustomerIssue = wn.ui.form.Controller.extend({
customer: function() {
var me = this;
if(this.frm.doc.customer) {
- this.frm.call({
+ return this.frm.call({
doc: this.frm.doc,
method: "set_customer_defaults",
});
@@ -93,7 +93,7 @@ $.extend(cur_frm.cscript, {
},
set_status: function(status) {
- wn.call({
+ return wn.call({
method:"support.doctype.support_ticket.support_ticket.set_status",
args: {
name: cur_frm.doc.name,
diff --git a/utilities/doctype/rename_tool/rename_tool.js b/utilities/doctype/rename_tool/rename_tool.js
index 66a4399ffd7..bba7573fadb 100644
--- a/utilities/doctype/rename_tool/rename_tool.js
+++ b/utilities/doctype/rename_tool/rename_tool.js
@@ -1,5 +1,5 @@
cur_frm.cscript.refresh = function(doc) {
- wn.call({
+ return wn.call({
method:"utilities.doctype.rename_tool.rename_tool.get_doctypes",
callback: function(r) {
cur_frm.set_df_property("select_doctype", "options", r.message);
diff --git a/utilities/doctype/sms_control/sms_control.js b/utilities/doctype/sms_control/sms_control.js
index e56315c5618..e6e14f7b184 100644
--- a/utilities/doctype/sms_control/sms_control.js
+++ b/utilities/doctype/sms_control/sms_control.js
@@ -17,7 +17,7 @@
function SMSManager() {
var me = this;
this.get_contact_number = function(contact, key, value) {
- $c_obj('SMS Control', 'get_contact_number', {
+ return $c_obj('SMS Control', 'get_contact_number', {
contact_name:contact,
value:value,
key:key
@@ -63,7 +63,7 @@ function SMSManager() {
var v = me.dialog.get_values();
if(v) {
$(this).set_working();
- $c_obj('SMS Control', 'send_form_sms', v, function(r,rt) {
+ return $c_obj('SMS Control', 'send_form_sms', v, function(r,rt) {
$(this).done_working();
if(r.exc) {msgprint(r.exc); return; }
msgprint('Message Sent');
diff --git a/website/templates/js/cart.js b/website/templates/js/cart.js
index a22b9f34d91..ffa084a0b03 100644
--- a/website/templates/js/cart.js
+++ b/website/templates/js/cart.js
@@ -18,7 +18,7 @@
$(document).ready(function() {
wn.cart.bind_events();
- wn.call({
+ return wn.call({
type: "POST",
method: "website.helpers.cart.get_cart_quotation",
callback: function(r) {
@@ -204,7 +204,7 @@ $.extend(wn.cart, {
},
apply_shipping_rule: function(rule, btn) {
- wn.call({
+ return wn.call({
btn: btn,
type: "POST",
method: "website.helpers.cart.apply_shipping_rule",
@@ -257,7 +257,7 @@ $.extend(wn.cart, {
}
});
- wn.call({
+ return wn.call({
type: "POST",
method: "website.helpers.cart.update_cart_address",
args: {
@@ -288,7 +288,7 @@ $.extend(wn.cart, {
},
place_order: function() {
- wn.call({
+ return wn.call({
type: "POST",
method: "website.helpers.cart.place_order",
callback: function(r) {