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

Merge branch 'hotfix'

Browse Source
This commit is contained in:
mbauskar 2017-07-14 17:47:07 +05:30
commit ece7881ab1
5 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
erpnext/__init__.py
View File

@ -2,7 +2,7 @@
from __future__ import unicode_literals from __future__ import unicode_literals
import frappe import frappe
__version__ = '8.4.2' __version__ = '8.4.3'
def get_default_company(user=None): def get_default_company(user=None):
'''Get default company for user''' '''Get default company for user'''

2
erpnext/accounts/doctype/payment_entry/payment_entry.js
View File

@ -291,7 +291,7 @@ frappe.ui.form.on('Payment Entry', {
set_account_currency_and_balance: function(frm, account, currency_field, set_account_currency_and_balance: function(frm, account, currency_field,
balance_field, callback_function) { balance_field, callback_function) {
if (frm.doc.posting_date) { if (frm.doc.posting_date && account) {
frappe.call({ frappe.call({
method: "erpnext.accounts.doctype.payment_entry.payment_entry.get_account_details", method: "erpnext.accounts.doctype.payment_entry.payment_entry.get_account_details",
args: { args: {

4
erpnext/hr/doctype/expense_claim/expense_claim.js
View File

@ -27,6 +27,10 @@ erpnext.hr.ExpenseClaimController = frappe.ui.form.Controller.extend({
return; return;
} }
if(!d.expense_type) {
return;
}
return frappe.call({ return frappe.call({
method: "erpnext.hr.doctype.expense_claim.expense_claim.get_expense_claim_account", method: "erpnext.hr.doctype.expense_claim.expense_claim.get_expense_claim_account",
args: { args: {

5
erpnext/patches/v7_0/fix_nonwarehouse_ledger_gl_entries_for_transactions.py
View File

@ -7,10 +7,11 @@ import frappe, erpnext
def execute(): def execute():
frappe.reload_doctype("Account") frappe.reload_doctype("Account")
warehouses = frappe.db.sql_list("""select name, company from tabAccount warehouses = frappe.db.sql("""select name, company from tabAccount
where account_type = 'Stock' and is_group = 0 where account_type = 'Stock' and is_group = 0
and (warehouse is null or warehouse = '')""", as_dict) and (warehouse is null or warehouse = '')""", as_dict=1)
warehouses = [d.name for d in warehouses if erpnext.is_perpetual_inventory_enabled(d.company)] warehouses = [d.name for d in warehouses if erpnext.is_perpetual_inventory_enabled(d.company)]
if len(warehouses) > 0: if len(warehouses) > 0:
warehouses = set_warehouse_for_stock_account(warehouses) warehouses = set_warehouse_for_stock_account(warehouses)
if not warehouses: if not warehouses:

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

@ -94,6 +94,10 @@ var get_payment_mode_account = function(frm, mode_of_payment, callback) {
frappe.throw(__("Please select the Company first")); frappe.throw(__("Please select the Company first"));
} }
if(!mode_of_payment) {
return;
}
return frappe.call({ return frappe.call({
method: "erpnext.accounts.doctype.sales_invoice.sales_invoice.get_bank_cash_account", method: "erpnext.accounts.doctype.sales_invoice.sales_invoice.get_bank_cash_account",
args: { args: {