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

fix: conflicts

Browse Source
This commit is contained in:
rohitwaghchaure
2022-01-12 13:31:34 +05:30
committed by GitHub
parent fa66d1d87d
commit b4fee6d065
1 changed files with 0 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
erpnext/manufacturing/doctype/work_order/test_work_order.py
View File

@@ -870,44 +870,6 @@ class TestWorkOrder(ERPNextTestCase):
close_work_order(wo_order, "Closed") close_work_order(wo_order, "Closed")
self.assertEqual(wo_order.get('status'), "Closed") self.assertEqual(wo_order.get('status'), "Closed")
def test_fix_time_operations(self):
bom = frappe.get_doc({
"doctype": "BOM",
"item": "_Test FG Item 2",
"is_active": 1,
"is_default": 1,
"quantity": 1.0,
"with_operations": 1,
"operations": [
{
"operation": "_Test Operation 1",
"description": "_Test",
"workstation": "_Test Workstation 1",
"time_in_mins": 60,
"operating_cost": 140,
"fixed_time": 1
}
],
"items": [
{
"amount": 5000.0,
"doctype": "BOM Item",
"item_code": "_Test Item",
"parentfield": "items",
"qty": 1.0,
"rate": 5000.0,
},
],
})
bom.save()
bom.submit()
wo1 = make_wo_order_test_record(item=bom.item, bom_no=bom.name, qty=1, skip_transfer=1, do_not_submit=1)
wo2 = make_wo_order_test_record(item=bom.item, bom_no=bom.name, qty=2, skip_transfer=1, do_not_submit=1)
self.assertEqual(wo1.operations[0].time_in_mins, wo2.operations[0].time_in_mins)
def update_job_card(job_card, jc_qty=None): def update_job_card(job_card, jc_qty=None):
employee = frappe.db.get_value('Employee', {'status': 'Active'}, 'name') employee = frappe.db.get_value('Employee', {'status': 'Active'}, 'name')