diff --git a/erpnext/hr/doctype/salary_slip/test_salary_slip.py b/erpnext/hr/doctype/salary_slip/test_salary_slip.py index d90d4b2c9b..48a945e725 100644 --- a/erpnext/hr/doctype/salary_slip/test_salary_slip.py +++ b/erpnext/hr/doctype/salary_slip/test_salary_slip.py @@ -14,7 +14,7 @@ class TestSalarySlip(unittest.TestCase): for dt in ["Leave Application", "Leave Allocation", "Salary Slip"]: frappe.db.sql("delete from `tab%s`" % dt) - make_allocation_record(leave_type="_Test Leave Type LWP") + # make_allocation_record(leave_type="_Test Leave Type") frappe.db.set_value("Company", "_Test Company", "default_holiday_list", "_Test Holiday List") diff --git a/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py b/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py index 1e6c48aed7..5fbcf1eb90 100644 --- a/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +++ b/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py @@ -454,21 +454,20 @@ class ProductionPlanningTool(Document): material_request.update({"material_request_type": item_wrapper.default_material_request_type}) for sales_order, requested_qty in items_to_be_requested[item].items(): - if sales_order != 'No Sales Order': - material_request.append("items", { - "doctype": "Material Request Item", - "__islocal": 1, - "item_code": item, - "item_name": item_wrapper.item_name, - "description": item_wrapper.description, - "uom": item_wrapper.stock_uom, - "item_group": item_wrapper.item_group, - "brand": item_wrapper.brand, - "qty": requested_qty, - "schedule_date": add_days(nowdate(), cint(item_wrapper.lead_time_days)), - "warehouse": self.purchase_request_for_warehouse, - "sales_order": sales_order if sales_order!="No Sales Order" else None - }) + material_request.append("items", { + "doctype": "Material Request Item", + "__islocal": 1, + "item_code": item, + "item_name": item_wrapper.item_name, + "description": item_wrapper.description, + "uom": item_wrapper.stock_uom, + "item_group": item_wrapper.item_group, + "brand": item_wrapper.brand, + "qty": requested_qty, + "schedule_date": add_days(nowdate(), cint(item_wrapper.lead_time_days)), + "warehouse": self.purchase_request_for_warehouse, + "sales_order": sales_order if sales_order!="No Sales Order" else None + }) material_request.flags.ignore_permissions = 1 material_request.submit()