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

[minor] check if the company is selected or not before triggering get_bank_cash_account (#9830)

Browse Source 
* [minor] check if the company is selected or not before triggering get_bank_cash_account

* [minor] check if production order is available

* [minor] fixed codacy errors
This commit is contained in:
Makarand Bauskar 2017-07-13 11:44:29 +05:30 committed by GitHub
parent 57d3cecd68
commit 8f507a984e
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
erpnext/public/js/controllers/accounts.js
View File

@ -89,7 +89,11 @@ frappe.ui.form.on('Salary Structure', {
}
})
var get_payment_mode_account = function(frm, mode_of_payment, callback){
var get_payment_mode_account = function(frm, mode_of_payment, callback) {
if(!frm.doc.company) {
frappe.throw(__("Please select the Company first"));
}
return frappe.call({
method: "erpnext.accounts.doctype.sales_invoice.sales_invoice.get_bank_cash_account",
args: {

7
erpnext/stock/doctype/stock_entry/stock_entry.js
View File

@ -340,10 +340,15 @@ erpnext.stock.StockEntry = erpnext.stock.StockController.extend({
production_order: function() {
var me = this;
this.toggle_enable_bom();
if(!me.frm.doc.production_order) {
return;
}
return frappe.call({
method: "erpnext.stock.doctype.stock_entry.stock_entry.get_production_order_details",
args: {production_order: me.frm.doc.production_order},
args: {
production_order: me.frm.doc.production_order
},
callback: function(r) {
if (!r.exc) {
$.each(["from_bom", "bom_no", "fg_completed_qty", "use_multi_level_bom"], function(i, field) {