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

fix: conflicts

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

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

@@ -870,9 +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")
<<<<<<< HEAD
def update_job_card(job_card):
=======
def test_fix_time_operations(self): def test_fix_time_operations(self):
bom = frappe.get_doc({ bom = frappe.get_doc({
"doctype": "BOM", "doctype": "BOM",
@@ -911,10 +908,9 @@ def update_job_card(job_card):
self.assertEqual(wo1.operations[0].time_in_mins, wo2.operations[0].time_in_mins) 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')
>>>>>>> 8f0b2fa90e (fix: incorrect scrap item qty)
job_card_doc = frappe.get_doc('Job Card', job_card) job_card_doc = frappe.get_doc('Job Card', job_card)
job_card_doc.set('scrap_items', [ job_card_doc.set('scrap_items', [
{ {
@@ -939,7 +935,6 @@ def update_job_card(job_card, jc_qty=None):
job_card_doc.submit() job_card_doc.submit()
def get_scrap_item_details(bom_no): def get_scrap_item_details(bom_no):
scrap_items = {} scrap_items = {}
for item in frappe.db.sql("""select item_code, stock_qty from `tabBOM Scrap Item` for item in frappe.db.sql("""select item_code, stock_qty from `tabBOM Scrap Item`