From 1fac2a98cff326fa8c5469a75a7e830ace844b7f Mon Sep 17 00:00:00 2001 From: Anand Doshi Date: Mon, 29 Jul 2013 19:30:39 +0530 Subject: [PATCH 1/8] [fix] [client script] call cur_frm.cscript.custom_ type functions in the callback of standard functions --- accounts/doctype/account/account.js | 4 ++-- .../budget_distribution.js | 2 +- accounts/doctype/c_form/c_form.js | 2 +- accounts/doctype/cost_center/cost_center.js | 4 ++-- accounts/doctype/fiscal_year/fiscal_year.js | 2 +- .../journal_voucher/journal_voucher.js | 12 +++++----- .../payment_to_invoice_matching_tool.js | 4 ++-- accounts/doctype/pos_setting/pos_setting.js | 2 +- .../purchase_invoice/purchase_invoice.js | 2 +- .../purchase_taxes_and_charges_master.js | 2 +- .../doctype/sales_invoice/sales_invoice.js | 6 ++--- .../sales_taxes_and_charges_master.js | 2 +- .../page/accounts_browser/accounts_browser.js | 6 ++--- .../financial_statements.js | 4 ++-- .../purchase_common/purchase_common.js | 12 +++++----- .../doctype/purchase_order/purchase_order.js | 6 ++--- .../quality_inspection/quality_inspection.js | 2 +- buying/doctype/supplier/supplier.js | 2 +- home/page/latest_updates/latest_updates.js | 2 +- hr/doctype/appraisal/appraisal.js | 2 +- hr/doctype/employee/employee.js | 6 ++--- hr/doctype/expense_claim/expense_claim.js | 4 ++-- .../leave_allocation/leave_allocation.js | 2 +- .../leave_application/leave_application.js | 6 ++--- .../leave_control_panel.js | 2 +- hr/doctype/salary_manager/salary_manager.js | 6 ++--- hr/doctype/salary_slip/salary_slip.js | 4 ++-- .../salary_structure/salary_structure.js | 4 ++-- manufacturing/doctype/bom/bom.js | 4 ++-- .../production_order/production_order.js | 6 ++--- .../production_planning_tool.js | 6 ++--- projects/doctype/task/task.js | 2 +- public/js/complete_setup.js | 4 ++-- public/js/transaction.js | 6 ++--- public/js/website_utils.js | 4 ++-- selling/doctype/customer/customer.js | 2 +- .../installation_note/installation_note.js | 4 ++-- selling/doctype/opportunity/opportunity.js | 8 +++---- selling/doctype/quotation/quotation.js | 4 ++-- selling/doctype/sales_bom/sales_bom.js | 4 ++-- selling/doctype/sales_common/sales_common.js | 12 +++++----- selling/doctype/sales_order/sales_order.js | 6 ++--- selling/page/sales_browser/sales_browser.js | 4 ++-- .../doctype/backup_manager/backup_manager.js | 6 ++--- .../contact_control/contact_control.js | 4 ++-- setup/doctype/email_digest/email_digest.js | 6 ++--- .../global_defaults/global_defaults.js | 2 +- setup/doctype/naming_series/naming_series.js | 8 +++---- .../notification_control.js | 2 +- setup/page/setup/setup.js | 2 +- stock/doctype/delivery_note/delivery_note.js | 2 +- stock/doctype/item/item.js | 4 ++-- .../material_request/material_request.js | 4 ++-- stock/doctype/packing_slip/packing_slip.js | 2 +- stock/doctype/serial_no/serial_no.js | 2 +- stock/doctype/stock_entry/stock_entry.js | 24 +++++++++---------- .../stock_reconciliation.js | 2 +- .../stock_uom_replace_utility.js | 2 +- stock/doctype/warehouse/warehouse.js | 2 +- .../doctype/customer_issue/customer_issue.js | 4 ++-- .../maintenance_schedule.js | 10 ++++---- .../maintenance_visit/maintenance_visit.js | 6 ++--- support/doctype/newsletter/newsletter.js | 4 ++-- .../doctype/support_ticket/support_ticket.js | 4 ++-- utilities/doctype/rename_tool/rename_tool.js | 2 +- utilities/doctype/sms_control/sms_control.js | 4 ++-- website/templates/js/cart.js | 8 +++---- website/templates/js/product_page.js | 2 +- 68 files changed, 154 insertions(+), 154 deletions(-) diff --git a/accounts/doctype/account/account.js b/accounts/doctype/account/account.js index 9a8115e850..eb8e765d8d 100644 --- a/accounts/doctype/account/account.js +++ b/accounts/doctype/account/account.js @@ -104,7 +104,7 @@ cur_frm.cscript.add_toolbar_buttons = function(doc) { // Convert group to ledger // ----------------------------------------- cur_frm.cscript.convert_to_ledger = function(doc, cdt, cdn) { - $c_obj(cur_frm.get_doclist(),'convert_group_to_ledger','',function(r,rt) { + return $c_obj(cur_frm.get_doclist(),'convert_group_to_ledger','',function(r,rt) { if(r.message == 1) { cur_frm.refresh(); } @@ -114,7 +114,7 @@ cur_frm.cscript.convert_to_ledger = function(doc, cdt, cdn) { // Convert ledger to group // ----------------------------------------- cur_frm.cscript.convert_to_group = function(doc, cdt, cdn) { - $c_obj(cur_frm.get_doclist(),'convert_ledger_to_group','',function(r,rt) { + return $c_obj(cur_frm.get_doclist(),'convert_ledger_to_group','',function(r,rt) { if(r.message == 1) { cur_frm.refresh(); } diff --git a/accounts/doctype/budget_distribution/budget_distribution.js b/accounts/doctype/budget_distribution/budget_distribution.js index 5abd525999..29e5e33360 100644 --- a/accounts/doctype/budget_distribution/budget_distribution.js +++ b/accounts/doctype/budget_distribution/budget_distribution.js @@ -20,7 +20,7 @@ cur_frm.cscript.onload = function(doc,cdt,cdn){ refresh_field('budget_distribution_details'); } - $c('runserverobj',args={'method' : 'get_months', 'docs' : + return $c('runserverobj',args={'method' : 'get_months', 'docs' : wn.model.compress(make_doclist(doc.doctype, doc.name))},callback1); } } diff --git a/accounts/doctype/c_form/c_form.js b/accounts/doctype/c_form/c_form.js index 35656e9daf..0bc9ff1fe2 100644 --- a/accounts/doctype/c_form/c_form.js +++ b/accounts/doctype/c_form/c_form.js @@ -34,5 +34,5 @@ cur_frm.fields_dict.state.get_query = function(doc) { cur_frm.cscript.invoice_no = function(doc, cdt, cdn) { var d = locals[cdt][cdn]; - get_server_fields('get_invoice_details', d.invoice_no, 'invoice_details', doc, cdt, cdn, 1); + return get_server_fields('get_invoice_details', d.invoice_no, 'invoice_details', doc, cdt, cdn, 1); } \ No newline at end of file diff --git a/accounts/doctype/cost_center/cost_center.js b/accounts/doctype/cost_center/cost_center.js index 96af1cfc96..7dc4223617 100644 --- a/accounts/doctype/cost_center/cost_center.js +++ b/accounts/doctype/cost_center/cost_center.js @@ -84,7 +84,7 @@ cur_frm.cscript.hide_unhide_group_ledger = function(doc) { } cur_frm.cscript.convert_to_ledger = function(doc, cdt, cdn) { - $c_obj(cur_frm.get_doclist(),'convert_group_to_ledger','',function(r,rt) { + return $c_obj(cur_frm.get_doclist(),'convert_group_to_ledger','',function(r,rt) { if(r.message == 1) { cur_frm.refresh(); } @@ -92,7 +92,7 @@ cur_frm.cscript.convert_to_ledger = function(doc, cdt, cdn) { } cur_frm.cscript.convert_to_group = function(doc, cdt, cdn) { - $c_obj(cur_frm.get_doclist(),'convert_ledger_to_group','',function(r,rt) { + return $c_obj(cur_frm.get_doclist(),'convert_ledger_to_group','',function(r,rt) { if(r.message == 1) { cur_frm.refresh(); } diff --git a/accounts/doctype/fiscal_year/fiscal_year.js b/accounts/doctype/fiscal_year/fiscal_year.js index 6e0ed38c39..0f70cf5cdc 100644 --- a/accounts/doctype/fiscal_year/fiscal_year.js +++ b/accounts/doctype/fiscal_year/fiscal_year.js @@ -24,7 +24,7 @@ cur_frm.cscript.refresh = function(doc, dt, dn) { } cur_frm.cscript.set_as_default = function() { - wn.call({ + return wn.call({ doc: cur_frm.doc, method: "set_as_default" }); diff --git a/accounts/doctype/journal_voucher/journal_voucher.js b/accounts/doctype/journal_voucher/journal_voucher.js index ab4b2b05fd..a7f5b164c9 100644 --- a/accounts/doctype/journal_voucher/journal_voucher.js +++ b/accounts/doctype/journal_voucher/journal_voucher.js @@ -108,7 +108,7 @@ cur_frm.cscript.against_voucher = function(doc,cdt,cdn) { var d = locals[cdt][cdn]; if (d.against_voucher && !flt(d.debit)) { args = {'doctype': 'Purchase Invoice', 'docname': d.against_voucher } - get_server_fields('get_outstanding',docstring(args),'entries',doc,cdt,cdn,1,function(r,rt) { cur_frm.cscript.update_totals(doc); }); + return get_server_fields('get_outstanding',docstring(args),'entries',doc,cdt,cdn,1,function(r,rt) { cur_frm.cscript.update_totals(doc); }); } } @@ -116,7 +116,7 @@ cur_frm.cscript.against_invoice = function(doc,cdt,cdn) { var d = locals[cdt][cdn]; if (d.against_invoice && !flt(d.credit)) { args = {'doctype': 'Sales Invoice', 'docname': d.against_invoice } - get_server_fields('get_outstanding',docstring(args),'entries',doc,cdt,cdn,1,function(r,rt) { cur_frm.cscript.update_totals(doc); }); + return get_server_fields('get_outstanding',docstring(args),'entries',doc,cdt,cdn,1,function(r,rt) { cur_frm.cscript.update_totals(doc); }); } } @@ -141,7 +141,7 @@ cur_frm.cscript.credit = function(doc,dt,dn) { cur_frm.cscript.update_totals(doc cur_frm.cscript.get_balance = function(doc,dt,dn) { cur_frm.cscript.update_totals(doc); - $c_obj(make_doclist(dt,dn), 'get_balance', '', function(r, rt){ + return $c_obj(make_doclist(dt,dn), 'get_balance', '', function(r, rt){ cur_frm.refresh(); }); } @@ -151,7 +151,7 @@ cur_frm.cscript.get_balance = function(doc,dt,dn) { cur_frm.cscript.account = function(doc,dt,dn) { var d = locals[dt][dn]; if(d.account) { - wn.call({ + return wn.call({ method: "accounts.utils.get_balance_on", args: {account: d.account, date: doc.posting_date}, callback: function(r) { @@ -193,7 +193,7 @@ cur_frm.cscript.voucher_type = function(doc, cdt, cdn) { } if(in_list(["Bank Voucher", "Cash Voucher"], doc.voucher_type)) { - wn.call({ + return wn.call({ type: "GET", method: "accounts.doctype.journal_voucher.journal_voucher.get_default_bank_cash_account", args: { @@ -207,7 +207,7 @@ cur_frm.cscript.voucher_type = function(doc, cdt, cdn) { } }) } else if(doc.voucher_type=="Opening Entry") { - wn.call({ + return wn.call({ type:"GET", method: "accounts.doctype.journal_voucher.journal_voucher.get_opening_accounts", args: { diff --git a/accounts/doctype/payment_to_invoice_matching_tool/payment_to_invoice_matching_tool.js b/accounts/doctype/payment_to_invoice_matching_tool/payment_to_invoice_matching_tool.js index 3230ecf9e8..d8c8c819e4 100644 --- a/accounts/doctype/payment_to_invoice_matching_tool/payment_to_invoice_matching_tool.js +++ b/accounts/doctype/payment_to_invoice_matching_tool/payment_to_invoice_matching_tool.js @@ -49,11 +49,11 @@ cur_frm.fields_dict.voucher_no.get_query = function(doc) { } cur_frm.cscript.voucher_no =function(doc, cdt, cdn) { - get_server_fields('get_voucher_details', '', '', doc, cdt, cdn, 1) + return get_server_fields('get_voucher_details', '', '', doc, cdt, cdn, 1) } cur_frm.cscript.account = function(doc, cdt, cdn) { - wn.call({ + return wn.call({ doc: this.frm.doc, method: "set_account_type", callback: function(r) { diff --git a/accounts/doctype/pos_setting/pos_setting.js b/accounts/doctype/pos_setting/pos_setting.js index 653b6318cd..c91e4ce12a 100755 --- a/accounts/doctype/pos_setting/pos_setting.js +++ b/accounts/doctype/pos_setting/pos_setting.js @@ -15,7 +15,7 @@ // along with this program. If not, see . cur_frm.cscript.onload = function(doc,cdt,cdn){ - $c_obj(make_doclist(cdt,cdn),'get_series','',function(r,rt){ + return $c_obj(make_doclist(cdt,cdn),'get_series','',function(r,rt){ if(r.message) set_field_options('naming_series', r.message); }); diff --git a/accounts/doctype/purchase_invoice/purchase_invoice.js b/accounts/doctype/purchase_invoice/purchase_invoice.js index e73386f71f..e71a40815f 100644 --- a/accounts/doctype/purchase_invoice/purchase_invoice.js +++ b/accounts/doctype/purchase_invoice/purchase_invoice.js @@ -118,7 +118,7 @@ cur_frm.cscript.is_opening = function(doc, dt, dn) { } cur_frm.cscript.make_bank_voucher = function() { - wn.call({ + return wn.call({ method: "accounts.doctype.journal_voucher.journal_voucher.get_default_bank_cash_account", args: { "company": cur_frm.doc.company, diff --git a/accounts/doctype/purchase_taxes_and_charges_master/purchase_taxes_and_charges_master.js b/accounts/doctype/purchase_taxes_and_charges_master/purchase_taxes_and_charges_master.js index ba1a06b87b..626171cdc8 100644 --- a/accounts/doctype/purchase_taxes_and_charges_master/purchase_taxes_and_charges_master.js +++ b/accounts/doctype/purchase_taxes_and_charges_master/purchase_taxes_and_charges_master.js @@ -156,7 +156,7 @@ cur_frm.cscript.account_head = function(doc, cdt, cdn) { } else if(d.account_head && d.charge_type) { arg = "{'charge_type' : '" + d.charge_type + "', 'account_head' : '" + d.account_head + "'}"; - get_server_fields('get_rate', arg, 'purchase_tax_details', doc, cdt, cdn, 1); + return get_server_fields('get_rate', arg, 'purchase_tax_details', doc, cdt, cdn, 1); } refresh_field('account_head',d.name,'purchase_tax_details'); } diff --git a/accounts/doctype/sales_invoice/sales_invoice.js b/accounts/doctype/sales_invoice/sales_invoice.js index 99f596ceb4..4eb68daf1a 100644 --- a/accounts/doctype/sales_invoice/sales_invoice.js +++ b/accounts/doctype/sales_invoice/sales_invoice.js @@ -139,7 +139,7 @@ erpnext.accounts.SalesInvoiceController = erpnext.selling.SellingController.exte msgprint(wn._("Please specify Company to proceed")); } else { var me = this; - this.frm.call({ + return this.frm.call({ doc: me.frm.doc, method: "set_missing_values", }); @@ -222,7 +222,7 @@ cur_frm.cscript.hide_fields = function(doc) { cur_frm.cscript.mode_of_payment = function(doc) { - cur_frm.call({ + return cur_frm.call({ method: "get_bank_cash_account", args: { mode_of_payment: doc.mode_of_payment } }); @@ -248,7 +248,7 @@ cur_frm.cscript['Make Delivery Note'] = function() { } cur_frm.cscript.make_bank_voucher = function() { - wn.call({ + return wn.call({ method: "accounts.doctype.journal_voucher.journal_voucher.get_default_bank_cash_account", args: { "company": cur_frm.doc.company, diff --git a/accounts/doctype/sales_taxes_and_charges_master/sales_taxes_and_charges_master.js b/accounts/doctype/sales_taxes_and_charges_master/sales_taxes_and_charges_master.js index eca6eaea5d..df6aaa90fb 100644 --- a/accounts/doctype/sales_taxes_and_charges_master/sales_taxes_and_charges_master.js +++ b/accounts/doctype/sales_taxes_and_charges_master/sales_taxes_and_charges_master.js @@ -165,7 +165,7 @@ cur_frm.cscript.account_head = function(doc, cdt, cdn) { } else if(d.account_head && d.charge_type) { arg = "{'charge_type' : '" + d.charge_type +"', 'account_head' : '" + d.account_head + "'}"; - get_server_fields('get_rate', arg, 'other_charges', doc, cdt, cdn, 1); + return get_server_fields('get_rate', arg, 'other_charges', doc, cdt, cdn, 1); } refresh_field('account_head',d.name,'other_charges'); } diff --git a/accounts/page/accounts_browser/accounts_browser.js b/accounts/page/accounts_browser/accounts_browser.js index 30ed5b9144..18d43ff496 100644 --- a/accounts/page/accounts_browser/accounts_browser.js +++ b/accounts/page/accounts_browser/accounts_browser.js @@ -73,7 +73,7 @@ pscript['onload_Accounts Browser'] = function(wrapper){ }) // load up companies - wn.call({ + return wn.call({ method:'accounts.page.accounts_browser.accounts_browser.get_companies', callback: function(r) { wrapper.$company_select.empty(); @@ -265,7 +265,7 @@ erpnext.AccountsChart = Class.extend({ v.master_type = ''; v.company = me.company; - wn.call({ + return wn.call({ args: v, method:'accounts.utils.add_ac', callback: function(r) { @@ -312,7 +312,7 @@ erpnext.AccountsChart = Class.extend({ v.parent_cost_center = node.data('label'); v.company = me.company; - wn.call({ + return wn.call({ args: v, method:'accounts.utils.add_cc', callback: function(r) { diff --git a/accounts/page/financial_statements/financial_statements.js b/accounts/page/financial_statements/financial_statements.js index d562e3229a..0175da7de4 100644 --- a/accounts/page/financial_statements/financial_statements.js +++ b/accounts/page/financial_statements/financial_statements.js @@ -62,7 +62,7 @@ pscript['onload_Financial Statements'] = function(wrapper) { ').css({"min-height": "400px"}); // load companies - $c_obj('MIS Control','get_comp','', function(r,rt) { + return $c_obj('MIS Control','get_comp','', function(r,rt) { // company erpnext.fs.stmt_company.$input.empty() .add_options(['Select Company...'].concat(r.message.company)); @@ -86,7 +86,7 @@ pscript.stmt_new = function(stmt,company_name,level,period,year) { year: erpnext.fs.stmt_fiscal_year.get_value() } - $c_obj('MIS Control', 'get_statement', docstring(arg), function(r,rt) { + return $c_obj('MIS Control', 'get_statement', docstring(arg), function(r,rt) { var nl = r.message; var t = $i('stmt_tree'); var stmt_type = erpnext.fs.stmt_type.get_value(); diff --git a/buying/doctype/purchase_common/purchase_common.js b/buying/doctype/purchase_common/purchase_common.js index 87f79a021f..dabfcd9a96 100644 --- a/buying/doctype/purchase_common/purchase_common.js +++ b/buying/doctype/purchase_common/purchase_common.js @@ -92,7 +92,7 @@ erpnext.buying.BuyingController = erpnext.TransactionController.extend({ var me = this; var price_list_name = this.frm.doc.price_list_name; - this.frm.call({ + return this.frm.call({ doc: this.frm.doc, method: "set_supplier_defaults", freeze: true, @@ -109,7 +109,7 @@ erpnext.buying.BuyingController = erpnext.TransactionController.extend({ supplier_address: function() { var me = this; if (this.frm.doc.supplier) { - wn.call({ + return wn.call({ doc: this.frm.doc, method: "set_supplier_address", freeze: true, @@ -134,7 +134,7 @@ erpnext.buying.BuyingController = erpnext.TransactionController.extend({ item.item_code = null; refresh_field("item_code", item.name, item.parentfield); } else { - this.frm.call({ + return this.frm.call({ method: "buying.utils.get_item_details", child: item, args: { @@ -200,7 +200,7 @@ erpnext.buying.BuyingController = erpnext.TransactionController.extend({ var me = this; var item = wn.model.get_doc(cdt, cdn); if(item.item_code && item.uom) { - this.frm.call({ + return this.frm.call({ method: "buying.utils.get_conversion_factor", child: item, args: { @@ -233,7 +233,7 @@ erpnext.buying.BuyingController = erpnext.TransactionController.extend({ warehouse: function(doc, cdt, cdn) { var item = wn.model.get_doc(cdt, cdn); if(item.item_code && item.warehouse) { - this.frm.call({ + return this.frm.call({ method: "buying.utils.get_projected_qty", child: item, args: { @@ -267,7 +267,7 @@ erpnext.buying.BuyingController = erpnext.TransactionController.extend({ purchase_other_charges: function() { var me = this; if(this.frm.doc.purchase_other_charges) { - this.frm.call({ + return this.frm.call({ doc: this.frm.doc, method: "get_purchase_tax_details", callback: function(r) { diff --git a/buying/doctype/purchase_order/purchase_order.js b/buying/doctype/purchase_order/purchase_order.js index 99149bcf3a..360170adec 100644 --- a/buying/doctype/purchase_order/purchase_order.js +++ b/buying/doctype/purchase_order/purchase_order.js @@ -140,7 +140,7 @@ cur_frm.fields_dict['po_details'].grid.get_field('project_name').get_query = fun } cur_frm.cscript.get_last_purchase_rate = function(doc, cdt, cdn){ - $c_obj(make_doclist(doc.doctype, doc.name), 'get_last_purchase_rate', '', function(r, rt) { + return $c_obj(make_doclist(doc.doctype, doc.name), 'get_last_purchase_rate', '', function(r, rt) { refresh_field(cur_frm.cscript.fname); var doc = locals[cdt][cdn]; cur_frm.cscript.calc_amount( doc, 2); @@ -152,7 +152,7 @@ cur_frm.cscript['Stop Purchase Order'] = function() { var check = confirm("Do you really want to STOP " + doc.name); 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(); }); } @@ -163,7 +163,7 @@ cur_frm.cscript['Unstop Purchase Order'] = function() { var check = confirm("Do you really want to UNSTOP " + doc.name); 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/buying/doctype/quality_inspection/quality_inspection.js b/buying/doctype/quality_inspection/quality_inspection.js index 995119cd27..7c9320945b 100644 --- a/buying/doctype/quality_inspection/quality_inspection.js +++ b/buying/doctype/quality_inspection/quality_inspection.js @@ -16,7 +16,7 @@ cur_frm.cscript.item_code = function(doc, cdt, cdn) { if (doc.item_code) - get_server_fields('get_purchase_receipt_item_details','','',doc,cdt,cdn,1); + return get_server_fields('get_purchase_receipt_item_details','','',doc,cdt,cdn,1); } cur_frm.cscript.inspection_type = function(doc, cdt, cdn) { diff --git a/buying/doctype/supplier/supplier.js b/buying/doctype/supplier/supplier.js index 5374d506fc..2aa9b5e5a5 100644 --- a/buying/doctype/supplier/supplier.js +++ b/buying/doctype/supplier/supplier.js @@ -55,7 +55,7 @@ cur_frm.cscript.make_dashboard = function(doc) { cur_frm.dashboard.add_doctype_badge("Purchase Receipt", "supplier"); cur_frm.dashboard.add_doctype_badge("Purchase Invoice", "supplier"); - wn.call({ + return wn.call({ type: "GET", method:"buying.doctype.supplier.supplier.get_dashboard_info", args: { diff --git a/home/page/latest_updates/latest_updates.js b/home/page/latest_updates/latest_updates.js index 423f76eff8..dcdbed97ba 100644 --- a/home/page/latest_updates/latest_updates.js +++ b/home/page/latest_updates/latest_updates.js @@ -9,7 +9,7 @@ wn.pages['latest-updates'].onload = function(wrapper) { parent.html('
\
') - wn.call({ + return wn.call({ method:"home.page.latest_updates.latest_updates.get", callback: function(r) { parent.empty(); diff --git a/hr/doctype/appraisal/appraisal.js b/hr/doctype/appraisal/appraisal.js index 2289064baa..3ac62b132a 100644 --- a/hr/doctype/appraisal/appraisal.js +++ b/hr/doctype/appraisal/appraisal.js @@ -44,7 +44,7 @@ cur_frm.cscript.kra_template = function(doc, dt, dn) { } cur_frm.cscript.calculate_total_score = function(doc,cdt,cdn){ - //get_server_fields('calculate_total','','',doc,cdt,cdn,1); + //return get_server_fields('calculate_total','','',doc,cdt,cdn,1); var val = getchildren('Appraisal Goal', doc.name, 'appraisal_details', doc.doctype); var total =0; for(var i = 0; i\
') - wn.call({ + return wn.call({ method: "setup.page.setup.setup.get", callback: function(r) { if(r.message) { diff --git a/stock/doctype/delivery_note/delivery_note.js b/stock/doctype/delivery_note/delivery_note.js index de6e9dcc87..88a9840694 100644 --- a/stock/doctype/delivery_note/delivery_note.js +++ b/stock/doctype/delivery_note/delivery_note.js @@ -112,7 +112,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/item/item.js b/stock/doctype/item/item.js index 9af8331d0b..a8401c41eb 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 bd5ab8239b..fe9af31e24 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 e19ab49300..d86d64b6c6 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/serial_no/serial_no.js b/stock/doctype/serial_no/serial_no.js index 0253ffbe83..8e833d738f 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 7032f92ec1..9e8c9a62af 100644 --- a/stock/doctype/stock_entry/stock_entry.js +++ b/stock/doctype/stock_entry/stock_entry.js @@ -32,7 +32,7 @@ erpnext.stock.StockEntry = erpnext.stock.StockController.extend({ 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, @@ -142,7 +142,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 +160,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 +212,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 +269,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 +328,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 +341,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 +351,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_reconciliation/stock_reconciliation.js b/stock/doctype/stock_reconciliation/stock_reconciliation.js index 2e0efd8c2a..501b5afb25 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", 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 d736ff6da7..86f5bffeaa 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 0e9cd336e5..902f66f895 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 3620c7e10a..4f45220660 100644 --- a/support/doctype/customer_issue/customer_issue.js +++ b/support/doctype/customer_issue/customer_issue.js @@ -26,7 +26,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", }); @@ -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 f8652d7e16..436cabade6 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 9f5fc5d915..f4e4a35542 100644 --- a/support/doctype/maintenance_visit/maintenance_visit.js +++ b/support/doctype/maintenance_visit/maintenance_visit.js @@ -62,7 +62,7 @@ erpnext.support.MaintenanceVisit = 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", }); @@ -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 b7e24d2173..5842accac0 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 d8cc798c95..34cc5ef497 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 66a4399ffd..bba7573fad 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 e56315c561..e6e14f7b18 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 a22b9f34d9..ffa084a0b0 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) { diff --git a/website/templates/js/product_page.js b/website/templates/js/product_page.js index adfeb5e4ad..97d8f3d622 100644 --- a/website/templates/js/product_page.js +++ b/website/templates/js/product_page.js @@ -18,7 +18,7 @@ $(document).ready(function() { var item_code = $('[itemscope] [itemprop="name"]').text().trim(); var qty = 0; - wn.call({ + return wn.call({ type: "POST", method: "website.helpers.product.get_product_info", args: { From 4525a0b900018d05d62b41eb369b8023c9db1947 Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Tue, 30 Jul 2013 11:19:20 +0530 Subject: [PATCH 2/8] [fix] [minor] null value issue --- accounts/doctype/gl_entry/gl_entry.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/accounts/doctype/gl_entry/gl_entry.py b/accounts/doctype/gl_entry/gl_entry.py index 1d0ec8e72a..60c37a40a2 100644 --- a/accounts/doctype/gl_entry/gl_entry.py +++ b/accounts/doctype/gl_entry/gl_entry.py @@ -151,7 +151,7 @@ class DocType: balance = webnotes.conn.sql("""select sum(debit) - sum(credit) from `tabGL Entry` where account = %s and ifnull(is_cancelled, 'No') = 'No'""", self.doc.account) balance = account["debit_or_credit"] == "Debit" and \ - balance[0][0] or -1*balance[0][0] + flt(balance[0][0]) or -1*flt(balance[0][0]) if flt(balance) < 0: msgprint(_("Negative balance is not allowed for account ") + self.doc.account, From 9764e32d0a5ff483871ccde5cc07f89c96a90ec5 Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Tue, 30 Jul 2013 12:38:19 +0530 Subject: [PATCH 3/8] [fix] [minor] syntax error in stock entry --- stock/doctype/stock_entry/stock_entry.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stock/doctype/stock_entry/stock_entry.py b/stock/doctype/stock_entry/stock_entry.py index 58f17c7401..afa3eb4f01 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) From de72b44d28d54b11ab10a9551fe34d99c4dccf0a Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Tue, 30 Jul 2013 12:54:22 +0530 Subject: [PATCH 4/8] [fix] [minor] pull only undelivered items in Dn from SO --- buying/doctype/purchase_common/purchase_common.py | 6 +++++- selling/doctype/sales_order/sales_order.py | 7 ++++--- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/buying/doctype/purchase_common/purchase_common.py b/buying/doctype/purchase_common/purchase_common.py index e14b1caaae..d1da2231d7 100644 --- a/buying/doctype/purchase_common/purchase_common.py +++ b/buying/doctype/purchase_common/purchase_common.py @@ -76,7 +76,11 @@ class DocType(BuyingController): elif is_submit == 1: # even if this transaction is the latest one, it should be submitted # for it to be considered for latest purchase rate - last_purchase_rate = flt(d.purchase_rate) / flt(d.conversion_factor) + if flt(d.conversion_factor): + last_purchase_rate = flt(d.purchase_rate) / flt(d.conversion_factor) + else: + msgprint(_("Row ") + cstr(d.idx) + ": " + + _("UOM Conversion Factor is mandatory"), raise_exception=1) # update last purchsae rate if last_purchase_rate: diff --git a/selling/doctype/sales_order/sales_order.py b/selling/doctype/sales_order/sales_order.py index 55abf9dbfa..d578a43d19 100644 --- a/selling/doctype/sales_order/sales_order.py +++ b/selling/doctype/sales_order/sales_order.py @@ -375,7 +375,7 @@ def make_delivery_note(source_name, target_doclist=None): target.amount = (flt(obj.qty) - flt(obj.delivered_qty)) * flt(obj.basic_rate) target.export_amount = (flt(obj.qty) - flt(obj.delivered_qty)) * flt(obj.export_rate) target.qty = flt(obj.qty) - flt(obj.delivered_qty) - + doclist = get_mapped_doclist("Sales Order", source_name, { "Sales Order": { "doctype": "Delivery Note", @@ -396,7 +396,8 @@ def make_delivery_note(source_name, target_doclist=None): "parenttype": "prevdoc_doctype", "reserved_warehouse": "warehouse" }, - "postprocess": update_item + "postprocess": update_item, + "condition": lambda doc: doc.delivered_qty < doc.qty }, "Sales Taxes and Charges": { "doctype": "Sales Taxes and Charges", @@ -416,7 +417,7 @@ def make_sales_invoice(source_name, target_doclist=None): target.export_amount = flt(obj.export_amount) - flt(obj.billed_amt) target.amount = target.export_amount * flt(source_parent.conversion_rate) target.qty = obj.export_rate and target.export_amount / flt(obj.export_rate) or obj.qty - + doclist = get_mapped_doclist("Sales Order", source_name, { "Sales Order": { "doctype": "Sales Invoice", From 7180eb6f209d34e7f5403a94ed147aaea32d7e3d Mon Sep 17 00:00:00 2001 From: Anand Doshi Date: Tue, 30 Jul 2013 14:40:44 +0530 Subject: [PATCH 5/8] [queries] [optimization] removed redundant code in get_match_cond --- controllers/queries.py | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/controllers/queries.py b/controllers/queries.py index 219fc743d1..caa2f6f065 100644 --- a/controllers/queries.py +++ b/controllers/queries.py @@ -36,12 +36,8 @@ def get_filters_cond(doctype, filters, conditions): return cond def get_match_cond(doctype, searchfield = 'name'): - meta = webnotes.get_doctype(doctype) - from webnotes.widgets.search import get_std_fields_list - fields = get_std_fields_list(meta, searchfield) - from webnotes.widgets.reportview import build_match_conditions - cond = build_match_conditions(doctype, fields) + cond = build_match_conditions(doctype) if cond: cond = ' and ' + cond From a648f46d4e67e04cb8396441889ff0b3641ba79f Mon Sep 17 00:00:00 2001 From: Anand Doshi Date: Tue, 30 Jul 2013 14:42:15 +0530 Subject: [PATCH 6/8] [fix] [minor] show stock ledger, general ledger, fixes post changes in script manager trigger [issue] webnotes/wnframework#228 --- .../journal_voucher/journal_voucher.js | 29 +++---- .../doctype/sales_invoice/sales_invoice.js | 8 +- hr/doctype/expense_claim/expense_claim.js | 12 +-- public/js/complete_setup.js | 2 +- public/js/controllers/stock_controller.js | 28 ++++--- public/js/transaction.js | 3 +- selling/doctype/opportunity/opportunity.js | 10 +-- selling/doctype/quotation/quotation.js | 2 +- setup/page/setup/setup.js | 78 +++++++++---------- stock/doctype/delivery_note/delivery_note.js | 2 + .../purchase_receipt/purchase_receipt.js | 7 ++ stock/doctype/stock_entry/stock_entry.js | 13 ++-- .../stock_reconciliation.js | 1 + .../doctype/customer_issue/customer_issue.js | 6 +- .../maintenance_visit/maintenance_visit.js | 6 +- website/templates/js/product_page.js | 2 +- 16 files changed, 106 insertions(+), 103 deletions(-) diff --git a/accounts/doctype/journal_voucher/journal_voucher.js b/accounts/doctype/journal_voucher/journal_voucher.js index a7f5b164c9..867ebbb459 100644 --- a/accounts/doctype/journal_voucher/journal_voucher.js +++ b/accounts/doctype/journal_voucher/journal_voucher.js @@ -18,10 +18,20 @@ wn.provide("erpnext.accounts"); erpnext.accounts.JournalVoucher = wn.ui.form.Controller.extend({ onload: function() { - this.load_defaults(this.frm.doc); + this.load_defaults(); this.setup_queries(); }, + load_defaults: function() { + if(this.frm.doc.__islocal && this.frm.doc.company) { + wn.model.set_default_values(this.frm.doc); + $.each(wn.model.get_doclist(this.frm.doc.doctype, this.frm.doc.name, {parentfield: "entries"}), + function(i, jvd) { wn.model.set_default_values(jvd); }); + + this.frm.doc.posting_date = get_today(); + } + }, + setup_queries: function() { var me = this; @@ -82,23 +92,6 @@ cur_frm.cscript.refresh = function(doc) { } } -cur_frm.cscript.load_defaults = function(doc) { - if(!cur_frm.doc.__islocal || !cur_frm.doc.company) { return; } - - doc = locals[doc.doctype][doc.name]; - var fields_to_refresh = wn.model.set_default_values(doc); - if(fields_to_refresh) { refresh_many(fields_to_refresh); } - - fields_to_refresh = null; - var children = getchildren('Journal Voucher Detail', doc.name, 'entries'); - if(!children) { return; } - for(var i=0; i. wn.provide("erpnext"); +wn.require("app/js/controllers/stock_controller.js"); -erpnext.TransactionController = wn.ui.form.Controller.extend({ +erpnext.TransactionController = erpnext.stock.StockController.extend({ onload: function() { if(this.frm.doc.__islocal) { var me = this, diff --git a/selling/doctype/opportunity/opportunity.js b/selling/doctype/opportunity/opportunity.js index 81bc23cdbb..fb5bae5f61 100644 --- a/selling/doctype/opportunity/opportunity.js +++ b/selling/doctype/opportunity/opportunity.js @@ -86,15 +86,15 @@ erpnext.selling.Opportunity = wn.ui.form.Controller.extend({ customer: function() { var me = this; if(this.frm.doc.customer) { - return this.frm.call({ - doc: this.frm.doc, - method: "set_customer_defaults", - }); - // TODO shift this to depends_on unhide_field(['customer_address', 'contact_person', 'customer_name', 'address_display', 'contact_display', 'contact_mobile', 'contact_email', 'territory', 'customer_group']); + + return this.frm.call({ + doc: this.frm.doc, + method: "set_customer_defaults", + }); } }, diff --git a/selling/doctype/quotation/quotation.js b/selling/doctype/quotation/quotation.js index 93af7cdea4..08ec6ab0ae 100644 --- a/selling/doctype/quotation/quotation.js +++ b/selling/doctype/quotation/quotation.js @@ -114,6 +114,7 @@ cur_frm.fields_dict.lead.get_query = function(doc,cdt,cdn) { cur_frm.cscript.lead = function(doc, cdt, cdn) { if(doc.lead) { + unhide_field('territory'); return cur_frm.call({ doc: cur_frm.doc, method: "set_lead_defaults", @@ -123,7 +124,6 @@ cur_frm.cscript.lead = function(doc, cdt, cdn) { } } }); - unhide_field('territory'); } } diff --git a/setup/page/setup/setup.js b/setup/page/setup/setup.js index ab640cf767..40b67d86cb 100644 --- a/setup/page/setup/setup.js +++ b/setup/page/setup/setup.js @@ -21,36 +21,7 @@ wn.pages.Setup.make = function(wrapper) { completed = 0; body.html('
\ -
') - - 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 + ")"); - } - } - }); +
'); var render_item = function(item, dependency) { if(item.type==="Section") { @@ -68,12 +39,12 @@ wn.pages.Setup.make = function(wrapper) { .appendTo(body); $('
').appendTo(row); - + if(item.type==="Link") { var col = $('
' +item.title+'
').appendTo(row); - + } else { var col = $(repl('
\ %(count)s\ @@ -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 88a9840694..c5ae4315eb 100644 --- a/stock/doctype/delivery_note/delivery_note.js +++ b/stock/doctype/delivery_note/delivery_note.js @@ -36,6 +36,8 @@ erpnext.stock.DeliveryNoteController = erpnext.selling.SellingController.extend( 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) { diff --git a/stock/doctype/purchase_receipt/purchase_receipt.js b/stock/doctype/purchase_receipt/purchase_receipt.js index a134da14d3..8705143cf2 100644 --- a/stock/doctype/purchase_receipt/purchase_receipt.js +++ b/stock/doctype/purchase_receipt/purchase_receipt.js @@ -33,6 +33,9 @@ erpnext.stock.PurchaseReceiptController = erpnext.buying.BuyingController.extend 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/stock_entry/stock_entry.js b/stock/doctype/stock_entry/stock_entry.js index 9e8c9a62af..4ade2ff4d4 100644 --- a/stock/doctype/stock_entry/stock_entry.js +++ b/stock/doctype/stock_entry/stock_entry.js @@ -25,8 +25,8 @@ 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"; @@ -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) { diff --git a/stock/doctype/stock_reconciliation/stock_reconciliation.js b/stock/doctype/stock_reconciliation/stock_reconciliation.js index 501b5afb25..2db8cba6b2 100644 --- a/stock/doctype/stock_reconciliation/stock_reconciliation.js +++ b/stock/doctype/stock_reconciliation/stock_reconciliation.js @@ -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/support/doctype/customer_issue/customer_issue.js b/support/doctype/customer_issue/customer_issue.js index 4f45220660..9535fbadfc 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) { + // 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']); } }, diff --git a/support/doctype/maintenance_visit/maintenance_visit.js b/support/doctype/maintenance_visit/maintenance_visit.js index f4e4a35542..4257afaf0f 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) { + // 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(); } }, }); diff --git a/website/templates/js/product_page.js b/website/templates/js/product_page.js index 97d8f3d622..adfeb5e4ad 100644 --- a/website/templates/js/product_page.js +++ b/website/templates/js/product_page.js @@ -18,7 +18,7 @@ $(document).ready(function() { var item_code = $('[itemscope] [itemprop="name"]').text().trim(); var qty = 0; - return wn.call({ + wn.call({ type: "POST", method: "website.helpers.product.get_product_info", args: { From 733681a42682dbf267b41992cc11f4d37aeb9fd4 Mon Sep 17 00:00:00 2001 From: Anand Doshi Date: Tue, 30 Jul 2013 14:49:12 +0530 Subject: [PATCH 7/8] [fix] [minor] [sales invoice] trigger update stock on fetching pos details --- accounts/doctype/sales_invoice/sales_invoice.js | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/accounts/doctype/sales_invoice/sales_invoice.js b/accounts/doctype/sales_invoice/sales_invoice.js index aa675062bf..345dbc9403 100644 --- a/accounts/doctype/sales_invoice/sales_invoice.js +++ b/accounts/doctype/sales_invoice/sales_invoice.js @@ -144,6 +144,11 @@ erpnext.accounts.SalesInvoiceController = erpnext.selling.SellingController.exte return this.frm.call({ doc: me.frm.doc, method: "set_missing_values", + callback: function(r) { + if(!r.exc) { + me.frm.script_manager.trigger("update_stock"); + } + } }); } } From 18b1e202d512721ee3f32d7520a6ad6e7d93d730 Mon Sep 17 00:00:00 2001 From: Anand Doshi Date: Tue, 30 Jul 2013 16:10:30 +0530 Subject: [PATCH 8/8] [fix] [issue] webnotes/erpnext#674 - hide Make Invoice button when invoicing of delivery/receipt is complete --- stock/doctype/delivery_note/delivery_note.js | 2 +- stock/doctype/delivery_note/delivery_note.py | 7 +++++++ stock/doctype/purchase_receipt/purchase_receipt.js | 2 +- stock/doctype/purchase_receipt/purchase_receipt.py | 7 +++++++ 4 files changed, 16 insertions(+), 2 deletions(-) diff --git a/stock/doctype/delivery_note/delivery_note.js b/stock/doctype/delivery_note/delivery_note.js index c5ae4315eb..0c47148bf6 100644 --- a/stock/doctype/delivery_note/delivery_note.js +++ b/stock/doctype/delivery_note/delivery_note.js @@ -29,7 +29,7 @@ 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); diff --git a/stock/doctype/delivery_note/delivery_note.py b/stock/doctype/delivery_note/delivery_note.py index 7ea512daad..81c4b6cedb 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/purchase_receipt/purchase_receipt.js b/stock/doctype/purchase_receipt/purchase_receipt.js index 8705143cf2..b393907bee 100644 --- a/stock/doctype/purchase_receipt/purchase_receipt.js +++ b/stock/doctype/purchase_receipt/purchase_receipt.js @@ -28,7 +28,7 @@ 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); } diff --git a/stock/doctype/purchase_receipt/purchase_receipt.py b/stock/doctype/purchase_receipt/purchase_receipt.py index 62b7a4f352..703929ce81 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 = ''):