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

patch fixes (#14936)

Browse Source
This commit is contained in:
Saurabh 2018-07-17 16:38:11 +05:30 committed by Nabin Hait
parent 1e693fe6c9
commit e78a877202
7 changed files with 23 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
View File

@ -4493,7 +4493,7 @@
"istable": 0, "istable": 0,
"max_attachments": 0, "max_attachments": 0,
"menu_index": 0, "menu_index": 0,
"modified": "2018-07-06 02:38:40.310899", "modified": "2018-07-17 02:38:40.310899",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Accounts", "module": "Accounts",
"name": "Purchase Invoice", "name": "Purchase Invoice",

2
erpnext/buying/doctype/purchase_order/purchase_order.json
View File

@ -3737,7 +3737,7 @@
"issingle": 0, "issingle": 0,
"istable": 0, "istable": 0,
"max_attachments": 0, "max_attachments": 0,
"modified": "2018-07-06 11:00:05.037716", "modified": "2018-07-17 11:00:05.037716",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Buying", "module": "Buying",
"name": "Purchase Order", "name": "Purchase Order",

2
erpnext/buying/doctype/supplier_quotation/supplier_quotation.json
View File

@ -2779,7 +2779,7 @@
"istable": 0, "istable": 0,
"max_attachments": 0, "max_attachments": 0,
"menu_index": 0, "menu_index": 0,
"modified": "2018-07-06 02:45:48.616334", "modified": "2018-07-17 02:45:48.616334",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Buying", "module": "Buying",
"name": "Supplier Quotation", "name": "Supplier Quotation",

27
erpnext/patches/v11_0/set_department_for_doctypes.py
View File

@ -3,14 +3,21 @@ import frappe
# Set department value based on employee value # Set department value based on employee value
def execute(): def execute():
doctypes_to_update = ['Appraisal', 'Leave Allocation', 'Expense Claim', 'Instructor', 'Salary Slip',
'Attendance', 'Training Feedback', 'Training Result Employee',
'Leave Application', 'Employee Advance', 'Activity Cost', 'Training Event Employee',
'Timesheet', 'Sales Person', 'Payroll Employee Detail']
for doctype in doctypes_to_update: doctypes_to_update = {
if frappe.db.table_exists(doctype): 'hr': ['Appraisal', 'Leave Allocation', 'Expense Claim', 'Salary Slip',
frappe.db.sql(""" 'Attendance', 'Training Feedback', 'Training Result Employee','Leave Application',
update `tab%s` dt 'Employee Advance', 'Training Event Employee', 'Payroll Employee Detail'],
set department=(select department from `tabEmployee` where name=dt.employee) 'education': ['Instructor'],
""" % doctype) 'projects': ['Activity Cost', 'Timesheet'],
'setup': ['Sales Person']
}
for module, doctypes in doctypes_to_update.items():
for doctype in doctypes:
if frappe.db.table_exists(doctype):
frappe.reload_doc(module, 'doctype', frappe.scrub(doctype))
frappe.db.sql("""
update `tab%s` dt
set department=(select department from `tabEmployee` where name=dt.employee)
""" % doctype)

2
erpnext/selling/doctype/quotation/quotation.json
View File

@ -3163,7 +3163,7 @@
"istable": 0, "istable": 0,
"max_attachments": 1, "max_attachments": 1,
"menu_index": 0, "menu_index": 0,
"modified": "2018-07-06 03:23:15.354674", "modified": "2018-07-17 03:23:15.354674",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Selling", "module": "Selling",
"name": "Quotation", "name": "Quotation",

2
erpnext/stock/doctype/delivery_note/delivery_note.json
View File

@ -3881,7 +3881,7 @@
"istable": 0, "istable": 0,
"max_attachments": 0, "max_attachments": 0,
"menu_index": 0, "menu_index": 0,
"modified": "2018-07-06 03:03:35.035396", "modified": "2018-07-17 03:03:35.035396",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Stock", "module": "Stock",
"name": "Delivery Note", "name": "Delivery Note",

2
erpnext/stock/doctype/purchase_receipt/purchase_receipt.json
View File

@ -3436,7 +3436,7 @@
"istable": 0, "istable": 0,
"max_attachments": 0, "max_attachments": 0,
"menu_index": 0, "menu_index": 0,
"modified": "2018-07-06 02:59:59.609643", "modified": "2018-07-17 02:59:59.609643",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Stock", "module": "Stock",
"name": "Purchase Receipt", "name": "Purchase Receipt",