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

fixed version conflict

Browse Source
This commit is contained in:
Nabin Hait 2016-09-02 16:19:54 +05:30
commit 23d79b7059
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
erpnext/patches/v7_0/set_party_name_in_payment_entry.py
View File

@ -9,10 +9,12 @@ def execute():
customers = frappe._dict(frappe.db.sql("select name, customer_name from tabCustomer")) customers = frappe._dict(frappe.db.sql("select name, customer_name from tabCustomer"))
suppliers = frappe._dict(frappe.db.sql("select name, supplier_name from tabSupplier")) suppliers = frappe._dict(frappe.db.sql("select name, supplier_name from tabSupplier"))
frappe.reload_doc('accounts', 'doctype', 'payment_entry')
pe_list = frappe.db.sql("""select name, party_type, party from `tabPayment Entry` pe_list = frappe.db.sql("""select name, party_type, party from `tabPayment Entry`
where party is not null and party != ''""", as_dict=1) where party is not null and party != ''""", as_dict=1)
for pe in pe_list: for pe in pe_list:
party_name = customers.get(pe.party) if pe.party_type=="Customer" else suppliers.get(pe.party) party_name = customers.get(pe.party) if pe.party_type=="Customer" else suppliers.get(pe.party)
frappe.db.set_value("Payment Entry", pe.name, "party_name", party_name, update_modified=False) frappe.db.set_value("Payment Entry", pe.name, "party_name", party_name, update_modified=False)

2
erpnext/patches/v7_0/update_missing_employee_in_timesheet.py
View File

@ -2,7 +2,7 @@ from __future__ import unicode_literals
import frappe import frappe
def execute(): def execute():
if frappe.db.table_exists("Time Log"): if frappe.db.table_exists("Time Log") and "employee" in frappe.db.get_table_columns("Time Log"):
timesheet = frappe.db.sql("""select tl.employee as employee, ts.name as name, timesheet = frappe.db.sql("""select tl.employee as employee, ts.name as name,
tl.modified as modified, tl.modified_by as modified_by, tl.creation as creation, tl.owner as owner tl.modified as modified, tl.modified_by as modified_by, tl.creation as creation, tl.owner as owner
from from