Fixed merge conflict

This commit is contained in:
Nabin Hait
2014-11-05 12:41:02 +05:30
28 changed files with 252 additions and 454 deletions

View File

@@ -34,8 +34,8 @@ communication_covert_to = ["Lead", "Support Ticket", "Job Application"]
doc_events = {
"Stock Entry": {
"on_submit": "erpnext.stock.doctype.material_request.material_request.update_completed_qty",
"on_cancel": "erpnext.stock.doctype.material_request.material_request.update_completed_qty"
"on_submit": "erpnext.stock.doctype.material_request.material_request.update_completed_and_requested_qty",
"on_cancel": "erpnext.stock.doctype.material_request.material_request.update_completed_and_requested_qty"
},
"User": {
"validate": "erpnext.hr.doctype.employee.employee.validate_employee_role",