From 253de859b43a092f72653429ba53e9ba7c3638a0 Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Tue, 9 Jul 2013 11:36:00 +0530 Subject: [PATCH] [fixes] for testcases --- accounts/doctype/purchase_invoice/purchase_invoice.py | 6 +++--- buying/doctype/purchase_order/purchase_order.py | 2 +- selling/doctype/sales_order/test_sales_order.py | 6 +++--- stock/doctype/material_request/test_material_request.py | 3 +++ stock/doctype/purchase_receipt/purchase_receipt.py | 2 +- utilities/transaction_base.py | 2 +- 6 files changed, 12 insertions(+), 9 deletions(-) diff --git a/accounts/doctype/purchase_invoice/purchase_invoice.py b/accounts/doctype/purchase_invoice/purchase_invoice.py index fd80a52680..c7135f47c9 100644 --- a/accounts/doctype/purchase_invoice/purchase_invoice.py +++ b/accounts/doctype/purchase_invoice/purchase_invoice.py @@ -206,17 +206,17 @@ class DocType(BuyingController): }, "Purchase Order Item": { "ref_dn_field": "po_detail", - "compare_fields": [["export_rate", "="], ["project_name", "="], ["item_code", "="], + "compare_fields": [["import_rate", "="], ["project_name", "="], ["item_code", "="], ["uom", "="]], "is_child_table": True }, "Purchase Receipt": { "ref_dn_field": "purchase_receipt", - "compare_fields": [["customer", "="], ["company", "="], ["currency", "="]], + "compare_fields": [["supplier", "="], ["company", "="], ["currency", "="]], }, "Purchase Receipt Item": { "ref_dn_field": "pr_detail", - "compare_fields": [["export_rate", "="], ["project_name", "="], ["item_code", "="], + "compare_fields": [["import_rate", "="], ["project_name", "="], ["item_code", "="], ["uom", "="]], "is_child_table": True } diff --git a/buying/doctype/purchase_order/purchase_order.py b/buying/doctype/purchase_order/purchase_order.py index 50eef5d76c..22cecf6467 100644 --- a/buying/doctype/purchase_order/purchase_order.py +++ b/buying/doctype/purchase_order/purchase_order.py @@ -64,7 +64,7 @@ class DocType(BuyingController): }, "Supplier Quotation Item": { "ref_dn_field": "supplier_quotation_item", - "compare_fields": [["export_rate", "="], ["project_name", "="], ["item_code", "="], + "compare_fields": [["import_rate", "="], ["project_name", "="], ["item_code", "="], ["uom", "="]], "is_child_table": True } diff --git a/selling/doctype/sales_order/test_sales_order.py b/selling/doctype/sales_order/test_sales_order.py index 23046ede3e..f1579327e7 100644 --- a/selling/doctype/sales_order/test_sales_order.py +++ b/selling/doctype/sales_order/test_sales_order.py @@ -158,7 +158,7 @@ class TestSalesOrder(unittest.TestCase): self.check_reserved_qty(so.doclist[1].item_code, so.doclist[1].reserved_warehouse, 10.0) def test_reserved_qty_for_so_with_packing_list(self): - from stock.doctype.sales_bom.test_sales_bom import test_records as sbom_test_records + from selling.doctype.sales_bom.test_sales_bom import test_records as sbom_test_records # change item in test so record test_record = test_records[0][:] @@ -185,7 +185,7 @@ class TestSalesOrder(unittest.TestCase): so.doclist[1].reserved_warehouse, 0.0) def test_reserved_qty_for_partial_delivery_with_packing_list(self): - from stock.doctype.sales_bom.test_sales_bom import test_records as sbom_test_records + from selling.doctype.sales_bom.test_sales_bom import test_records as sbom_test_records # change item in test so record @@ -235,7 +235,7 @@ class TestSalesOrder(unittest.TestCase): so.doclist[1].reserved_warehouse, 20.0) def test_reserved_qty_for_over_delivery_with_packing_list(self): - from stock.doctype.sales_bom.test_sales_bom import test_records as sbom_test_records + from selling.doctype.sales_bom.test_sales_bom import test_records as sbom_test_records # change item in test so record test_record = webnotes.copy_doclist(test_records[0]) diff --git a/stock/doctype/material_request/test_material_request.py b/stock/doctype/material_request/test_material_request.py index 5d221680bf..2dbc748ec8 100644 --- a/stock/doctype/material_request/test_material_request.py +++ b/stock/doctype/material_request/test_material_request.py @@ -124,6 +124,9 @@ class TestMaterialRequest(unittest.TestCase): po_doclist[0].supplier = "_Test Supplier" po_doclist[1].qty = 27.0 po_doclist[2].qty = 1.5 + po_doclist[1].schedule_date = "2013-07-09" + po_doclist[2].schedule_date = "2013-07-09" + # check for stopped status of Material Request po = webnotes.bean(copy=po_doclist) diff --git a/stock/doctype/purchase_receipt/purchase_receipt.py b/stock/doctype/purchase_receipt/purchase_receipt.py index 9bb4ee1990..59c6c32d32 100644 --- a/stock/doctype/purchase_receipt/purchase_receipt.py +++ b/stock/doctype/purchase_receipt/purchase_receipt.py @@ -103,7 +103,7 @@ class DocType(BuyingController): }, "Purchase Order Item": { "ref_dn_field": "prevdoc_detail_docname", - "compare_fields": [["export_rate", "="], ["project_name", "="], ["warehouse", "="], + "compare_fields": [["import_rate", "="], ["project_name", "="], ["warehouse", "="], ["uom", "="], ["item_code", "="]], "is_child_table": True } diff --git a/utilities/transaction_base.py b/utilities/transaction_base.py index 5994ae5afa..30a40da7ba 100644 --- a/utilities/transaction_base.py +++ b/utilities/transaction_base.py @@ -303,7 +303,7 @@ class TransactionBase(StatusUpdater): for key, val in ref.items(): ref_doc = {} for d in self.doclist.get({"doctype": source_dt}): - if d.fields[val["ref_dn_field"]]: + if d.fields.get(val["ref_dn_field"]): ref_doc.setdefault(key, d.fields[val["ref_dn_field"]]) if val.get("is_child_table"):