From 78333c7e07485249bfa3c3702f1300a86c2bf90b Mon Sep 17 00:00:00 2001 From: Saurabh Date: Sat, 25 Jun 2016 14:18:28 +0530 Subject: [PATCH] [fixes] check group condition --- erpnext/accounts/general_ledger.py | 2 +- erpnext/accounts/utils.py | 2 +- erpnext/controllers/stock_controller.py | 2 +- erpnext/stock/stock_balance.py | 3 ++- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/erpnext/accounts/general_ledger.py b/erpnext/accounts/general_ledger.py index 21b09c4fc3..b7fb053bc3 100644 --- a/erpnext/accounts/general_ledger.py +++ b/erpnext/accounts/general_ledger.py @@ -99,7 +99,7 @@ def validate_account_for_auto_accounting_for_stock(gl_map): if cint(frappe.db.get_single_value("Accounts Settings", "auto_accounting_for_stock")) \ and gl_map[0].voucher_type=="Journal Entry": aii_accounts = [d[0] for d in frappe.db.sql("""select name from tabAccount - where account_type = 'Stock' and (warehouse != '' and warehouse is not null)""")] + where account_type = 'Stock' and (warehouse != '' and warehouse is not null) and is_group=0""")] for entry in gl_map: if entry.account in aii_accounts: diff --git a/erpnext/accounts/utils.py b/erpnext/accounts/utils.py index d2cfb78b5d..27389aa441 100644 --- a/erpnext/accounts/utils.py +++ b/erpnext/accounts/utils.py @@ -318,7 +318,7 @@ def get_stock_and_account_difference(account_list=None, posting_date=None): difference = {} account_warehouse = dict(frappe.db.sql("""select name, warehouse from tabAccount - where account_type = 'Stock' and (warehouse is not null and warehouse != '') + where account_type = 'Stock' and (warehouse is not null and warehouse != '') and is_group=0 and name in (%s)""" % ', '.join(['%s']*len(account_list)), account_list)) for account, warehouse in account_warehouse.items(): diff --git a/erpnext/controllers/stock_controller.py b/erpnext/controllers/stock_controller.py index e0420d6cb6..46ed9bc072 100644 --- a/erpnext/controllers/stock_controller.py +++ b/erpnext/controllers/stock_controller.py @@ -322,6 +322,6 @@ def get_warehouse_account(): for d in frappe.db.sql("""select warehouse, name, account_currency from tabAccount where account_type = 'Stock' and (warehouse is not null and warehouse != '' - and is_group != 1)""", as_dict=1): + and is_group != 1) and is_group=0 """, as_dict=1): warehouse_account.setdefault(d.warehouse, d) return warehouse_account diff --git a/erpnext/stock/stock_balance.py b/erpnext/stock/stock_balance.py index 61f799b75f..22fa12a09b 100644 --- a/erpnext/stock/stock_balance.py +++ b/erpnext/stock/stock_balance.py @@ -231,7 +231,8 @@ def reset_serial_no_status_and_warehouse(serial_nos=None): def repost_all_stock_vouchers(): warehouses_with_account = frappe.db.sql_list("""select master_name from tabAccount - where ifnull(account_type, '') = 'Stock' and (warehouse is not null and warehouse != '') """) + where ifnull(account_type, '') = 'Stock' and (warehouse is not null and warehouse != '') + and is_group=0""") vouchers = frappe.db.sql("""select distinct voucher_type, voucher_no from `tabStock Ledger Entry` sle