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

minor improvement in patch

Browse Source
This commit is contained in:
Nabin Hait 2015-10-21 17:39:09 +05:30
parent 31c51ef914
commit 70b7f7f036
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
erpnext/patches/v6_4/fix_expense_included_in_valuation.py
View File

@ -1,4 +1,4 @@
# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. and Contributors # Copyright (c) 2013, Frappe Technologies Pvt. Ltd. and Contributors
# License: GNU General Public License v3. See license.txt # License: GNU General Public License v3. See license.txt
from __future__ import unicode_literals from __future__ import unicode_literals
@ -6,8 +6,6 @@ import frappe
from frappe.utils import cstr from frappe.utils import cstr
def execute(): def execute():
stock_items = [r[0] for r in frappe.db.sql("""select name from `tabItem` where is_stock_item=1""")]
for company in frappe.db.sql("select name, expenses_included_in_valuation from tabCompany", as_dict=1): for company in frappe.db.sql("select name, expenses_included_in_valuation from tabCompany", as_dict=1):
frozen_date = get_frozen_date(company.name, company.expenses_included_in_valuation) frozen_date = get_frozen_date(company.name, company.expenses_included_in_valuation)
@ -24,9 +22,9 @@ def execute():
and pi.is_opening = 'No' and pi.is_opening = 'No'
and (pi_item.item_tax_amount is not null and pi_item.item_tax_amount > 0) and (pi_item.item_tax_amount is not null and pi_item.item_tax_amount > 0)
and (pi_item.purchase_receipt is null or pi_item.purchase_receipt = '') and (pi_item.purchase_receipt is null or pi_item.purchase_receipt = '')
and pi_item.item_code in (%s) and (pi_item.item_code is not null and pi_item.item_code != '')
""" % ('%s', '%s', ', '.join(['%s']*len(stock_items))), and exists(select name from `tabItem` where name=pi_item.item_code and is_stock_item=1)
tuple([company.name, frozen_date] + stock_items), as_dict=1) """, (company.name, frozen_date), as_dict=1)
for pi in pi_list: for pi in pi_list:
# Check whether gle exists for Expenses Included in Valuation account against the PI # Check whether gle exists for Expenses Included in Valuation account against the PI