nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-15 19:19:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixes for testcases

Browse Source
This commit is contained in:
Nabin Hait
2016-10-19 13:03:49 +05:30
parent 184f6d42cc
commit ff183eedb9
2 changed files with 15 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
erpnext/hr/doctype/salary_slip/test_salary_slip.py
View File

@@ -14,7 +14,7 @@ class TestSalarySlip(unittest.TestCase):
for dt in ["Leave Application", "Leave Allocation", "Salary Slip"]: for dt in ["Leave Application", "Leave Allocation", "Salary Slip"]:
frappe.db.sql("delete from `tab%s`" % dt) 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") frappe.db.set_value("Company", "_Test Company", "default_holiday_list", "_Test Holiday List")

29
erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py
View File

@@ -454,21 +454,20 @@ class ProductionPlanningTool(Document):
material_request.update({"material_request_type": item_wrapper.default_material_request_type}) material_request.update({"material_request_type": item_wrapper.default_material_request_type})
for sales_order, requested_qty in items_to_be_requested[item].items(): for sales_order, requested_qty in items_to_be_requested[item].items():
if sales_order != 'No Sales Order': material_request.append("items", {
material_request.append("items", { "doctype": "Material Request Item",
"doctype": "Material Request Item", "__islocal": 1,
"__islocal": 1, "item_code": item,
"item_code": item, "item_name": item_wrapper.item_name,
"item_name": item_wrapper.item_name, "description": item_wrapper.description,
"description": item_wrapper.description, "uom": item_wrapper.stock_uom,
"uom": item_wrapper.stock_uom, "item_group": item_wrapper.item_group,
"item_group": item_wrapper.item_group, "brand": item_wrapper.brand,
"brand": item_wrapper.brand, "qty": requested_qty,
"qty": requested_qty, "schedule_date": add_days(nowdate(), cint(item_wrapper.lead_time_days)),
"schedule_date": add_days(nowdate(), cint(item_wrapper.lead_time_days)), "warehouse": self.purchase_request_for_warehouse,
"warehouse": self.purchase_request_for_warehouse, "sales_order": sales_order if sales_order!="No Sales Order" else None
"sales_order": sales_order if sales_order!="No Sales Order" else None })
})
material_request.flags.ignore_permissions = 1 material_request.flags.ignore_permissions = 1
material_request.submit() material_request.submit()