From 2eba53f7639369ceb14db99143a7198eabb8fec8 Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Fri, 22 May 2015 11:55:31 +0530 Subject: [PATCH 1/3] test case fixes --- erpnext/hr/doctype/salary_slip/test_salary_slip.py | 8 +++++++- erpnext/selling/doctype/customer/test_customer.py | 1 - erpnext/stock/doctype/item/test_item.py | 2 ++ 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/erpnext/hr/doctype/salary_slip/test_salary_slip.py b/erpnext/hr/doctype/salary_slip/test_salary_slip.py index 9f7c5df238..2bb7f52f63 100644 --- a/erpnext/hr/doctype/salary_slip/test_salary_slip.py +++ b/erpnext/hr/doctype/salary_slip/test_salary_slip.py @@ -12,6 +12,9 @@ class TestSalarySlip(unittest.TestCase): def setUp(self): frappe.db.sql("""delete from `tabLeave Application`""") frappe.db.sql("""delete from `tabSalary Slip`""") + + frappe.db.set_value("Holiday List", "_Test Holiday List", "is_default", 1) + from erpnext.hr.doctype.leave_application.test_leave_application import _test_records as leave_applications la = frappe.copy_doc(leave_applications[2]) la.insert() @@ -26,6 +29,7 @@ class TestSalarySlip(unittest.TestCase): frappe.db.set_value("HR Settings", "HR Settings", "include_holidays_in_total_working_days", 1) ss = frappe.copy_doc(test_records[0]) ss.insert() + self.assertEquals(ss.total_days_in_month, 31) self.assertEquals(ss.payment_days, 30) self.assertEquals(ss.earnings[0].e_modified_amount, 14516.13) @@ -36,8 +40,10 @@ class TestSalarySlip(unittest.TestCase): self.assertEquals(ss.net_pay, 14867.74) def test_salary_slip_with_holidays_excluded(self): + frappe.db.set_value("HR Settings", "HR Settings", "include_holidays_in_total_working_days", 0) ss = frappe.copy_doc(test_records[0]) ss.insert() + self.assertEquals(ss.total_days_in_month, 30) self.assertEquals(ss.payment_days, 29) self.assertEquals(ss.earnings[0].e_modified_amount, 14500) @@ -102,6 +108,6 @@ class TestSalarySlip(unittest.TestCase): return salary_slip -test_dependencies = ["Leave Application"] +test_dependencies = ["Leave Application", "Holiday List"] test_records = frappe.get_test_records('Salary Slip') diff --git a/erpnext/selling/doctype/customer/test_customer.py b/erpnext/selling/doctype/customer/test_customer.py index 479c5b552c..1644f29ffc 100644 --- a/erpnext/selling/doctype/customer/test_customer.py +++ b/erpnext/selling/doctype/customer/test_customer.py @@ -34,7 +34,6 @@ class TestCustomer(unittest.TestCase): make_test_records("Address") make_test_records("Contact") - details = get_party_details("_Test Customer") for key, value in to_check.iteritems(): diff --git a/erpnext/stock/doctype/item/test_item.py b/erpnext/stock/doctype/item/test_item.py index a8f3583f98..33778c9799 100644 --- a/erpnext/stock/doctype/item/test_item.py +++ b/erpnext/stock/doctype/item/test_item.py @@ -34,6 +34,8 @@ class TestItem(unittest.TestCase): se = make_stock_entry(item_code=item.name, target="Stores - _TC", qty=1, incoming_rate=1) item.has_variants = 1 + item.append("variants", {"item_attribute": "Test Size", "item_attribute_value": "Small"}) + self.assertRaises(ItemTemplateCannotHaveStock, item.save) def test_variant_item_codes(self): From fd4bcd855b6f02022622b827b0e554232c98090c Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Fri, 22 May 2015 16:55:40 +0530 Subject: [PATCH 2/3] test case fixes --- erpnext/controllers/buying_controller.py | 2 +- erpnext/crm/doctype/newsletter/newsletter.py | 2 +- .../crm/doctype/newsletter/test_newsletter.py | 13 ++++++++++--- .../newsletter_list/test_newsletter_list.py | 10 ++++------ .../doctype/newsletter_list/test_records.json | 15 --------------- .../newsletter_list_subscriber.py | 2 +- .../production_order/test_production_order.py | 3 +-- .../selling/doctype/customer/test_customer.py | 3 +++ .../doctype/delivery_note/test_delivery_note.py | 4 ++-- .../doctype/stock_entry/test_stock_entry.py | 16 ++++++++++------ .../stock_reconciliation/stock_reconciliation.py | 2 +- .../test_stock_reconciliation.py | 3 ++- erpnext/stock/reorder_item.py | 5 +---- 13 files changed, 37 insertions(+), 43 deletions(-) diff --git a/erpnext/controllers/buying_controller.py b/erpnext/controllers/buying_controller.py index d4e69cf46e..9867973258 100644 --- a/erpnext/controllers/buying_controller.py +++ b/erpnext/controllers/buying_controller.py @@ -279,7 +279,7 @@ class BuyingController(StockController): def set_qty_as_per_stock_uom(self): for d in self.get("items"): - if d.meta.get_field("stock_qty") and not d.stock_qty: + if d.meta.get_field("stock_qty"): if not d.conversion_factor: frappe.throw(_("Row {0}: Conversion Factor is mandatory").format(d.idx)) d.stock_qty = flt(d.qty) * flt(d.conversion_factor) diff --git a/erpnext/crm/doctype/newsletter/newsletter.py b/erpnext/crm/doctype/newsletter/newsletter.py index 6b1633f7e7..0bafda6881 100644 --- a/erpnext/crm/doctype/newsletter/newsletter.py +++ b/erpnext/crm/doctype/newsletter/newsletter.py @@ -92,7 +92,7 @@ def unsubscribe(email, name): return subs_id = frappe.db.get_value("Newsletter List Subscriber", {"email": email, "newsletter_list": name}) - if name: + if subs_id: subscriber = frappe.get_doc("Newsletter List Subscriber", subs_id) subscriber.unsubscribed = 1 subscriber.save(ignore_permissions=True) diff --git a/erpnext/crm/doctype/newsletter/test_newsletter.py b/erpnext/crm/doctype/newsletter/test_newsletter.py index ce1d2d1a54..580982ad50 100644 --- a/erpnext/crm/doctype/newsletter/test_newsletter.py +++ b/erpnext/crm/doctype/newsletter/test_newsletter.py @@ -9,7 +9,16 @@ from urllib import unquote class TestNewsletter(unittest.TestCase): def setUp(self): - frappe.db.sql("update `tabNewsletter List Subscriber` set unsubscribed = 0") + if not frappe.get_all("Newsletter List Subscriber"): + for email in ["test_subscriber1@example.com", "test_subscriber2@example.com", + "test_subscriber3@example.com"]: + frappe.get_doc({ + "doctype": "Newsletter List Subscriber", + "email": email, + "newsletter_list": "_Test Newsletter List" + }).insert() + else: + frappe.db.sql("update `tabNewsletter List Subscriber` set unsubscribed = 0") def test_send(self): self.send_newsletter() @@ -39,6 +48,4 @@ class TestNewsletter(unittest.TestCase): newsletter.send_emails() - - test_dependencies = ["Newsletter List"] diff --git a/erpnext/crm/doctype/newsletter_list/test_newsletter_list.py b/erpnext/crm/doctype/newsletter_list/test_newsletter_list.py index c715d8557c..ebc094e159 100644 --- a/erpnext/crm/doctype/newsletter_list/test_newsletter_list.py +++ b/erpnext/crm/doctype/newsletter_list/test_newsletter_list.py @@ -6,8 +6,6 @@ from __future__ import unicode_literals import frappe import unittest -# test_records = frappe.get_test_records('Newletter List') - class TestNewletterList(unittest.TestCase): def test_import(self): new_list = frappe.get_doc({ @@ -15,13 +13,13 @@ class TestNewletterList(unittest.TestCase): "title": "_Test Newsletter List 1" }).insert() - n_leads = frappe.db.count("Lead") - + n_leads = frappe.db.sql("select count(distinct email_id) from `tabLead`")[0][0] + added = new_list.import_from("Lead") - self.assertEquals(added, n_leads) - frappe.delete_doc("Newsletter List", new_list.name) + def tearDown(self): + frappe.delete_doc("Newsletter List", "_Test Newsletter List 1") test_dependencies = ["Lead"] diff --git a/erpnext/crm/doctype/newsletter_list/test_records.json b/erpnext/crm/doctype/newsletter_list/test_records.json index 5afc9df1cc..ed2f89e355 100644 --- a/erpnext/crm/doctype/newsletter_list/test_records.json +++ b/erpnext/crm/doctype/newsletter_list/test_records.json @@ -2,20 +2,5 @@ { "doctype": "Newsletter List", "title": "_Test Newsletter List" - }, - { - "doctype": "Newsletter List Subscriber", - "email": "test_subscriber1@example.com", - "newsletter_list": "_Test Newsletter List" - }, - { - "doctype": "Newsletter List Subscriber", - "email": "test_subscriber2@example.com", - "newsletter_list": "_Test Newsletter List" - }, - { - "doctype": "Newsletter List Subscriber", - "email": "test_subscriber3@example.com", - "newsletter_list": "_Test Newsletter List" } ] diff --git a/erpnext/crm/doctype/newsletter_list_subscriber/newsletter_list_subscriber.py b/erpnext/crm/doctype/newsletter_list_subscriber/newsletter_list_subscriber.py index 1539553576..c036adcf8e 100644 --- a/erpnext/crm/doctype/newsletter_list_subscriber/newsletter_list_subscriber.py +++ b/erpnext/crm/doctype/newsletter_list_subscriber/newsletter_list_subscriber.py @@ -10,4 +10,4 @@ class NewsletterListSubscriber(Document): pass def after_doctype_insert(): - frappe.db.add_unique("Newsletter List Subscriber", ("name", "email")) + frappe.db.add_unique("Newsletter List Subscriber", ("newsletter_list", "email")) diff --git a/erpnext/manufacturing/doctype/production_order/test_production_order.py b/erpnext/manufacturing/doctype/production_order/test_production_order.py index 7b6425e995..34d584a94a 100644 --- a/erpnext/manufacturing/doctype/production_order/test_production_order.py +++ b/erpnext/manufacturing/doctype/production_order/test_production_order.py @@ -130,10 +130,9 @@ class TestProductionOrder(unittest.TestCase): prod_order = make_prod_order_test_record(item="_Test FG Item 2", planned_start_date="2014-11-25 00:00:00", qty=1, do_not_save=True) prod_order.set_production_order_operations() - prod_order.save() cost = prod_order.planned_operating_cost prod_order.qty = 2 - prod_order.save() + prod_order.set_production_order_operations() self.assertEqual(prod_order.planned_operating_cost, cost*2) def make_prod_order_test_record(**args): diff --git a/erpnext/selling/doctype/customer/test_customer.py b/erpnext/selling/doctype/customer/test_customer.py index 1644f29ffc..1db6c6a24a 100644 --- a/erpnext/selling/doctype/customer/test_customer.py +++ b/erpnext/selling/doctype/customer/test_customer.py @@ -34,6 +34,9 @@ class TestCustomer(unittest.TestCase): make_test_records("Address") make_test_records("Contact") + frappe.db.set_value("Contact", "_Test Contact For _Test Customer-_Test Customer", + "is_primary_contact", 1) + details = get_party_details("_Test Customer") for key, value in to_check.iteritems(): diff --git a/erpnext/stock/doctype/delivery_note/test_delivery_note.py b/erpnext/stock/doctype/delivery_note/test_delivery_note.py index 59b453161c..4d397e77ea 100644 --- a/erpnext/stock/doctype/delivery_note/test_delivery_note.py +++ b/erpnext/stock/doctype/delivery_note/test_delivery_note.py @@ -7,7 +7,7 @@ import unittest import frappe import json import frappe.defaults -from frappe.utils import cint, nowdate, nowtime, cstr, add_days +from frappe.utils import cint, nowdate, nowtime, cstr, add_days, flt from erpnext.stock.stock_ledger import get_previous_sle from erpnext.accounts.utils import get_balance_on from erpnext.stock.doctype.purchase_receipt.test_purchase_receipt \ @@ -136,7 +136,7 @@ class TestDeliveryNote(unittest.TestCase): # check stock in hand balance bal = get_balance_on(stock_in_hand_account) - self.assertEquals(bal, prev_bal - stock_value_diff) + self.assertEquals(flt(bal, 2), flt(prev_bal - stock_value_diff, 2)) dn.cancel() self.assertFalse(get_gl_entries("Delivery Note", dn.name)) diff --git a/erpnext/stock/doctype/stock_entry/test_stock_entry.py b/erpnext/stock/doctype/stock_entry/test_stock_entry.py index 399589d671..432627b3cb 100644 --- a/erpnext/stock/doctype/stock_entry/test_stock_entry.py +++ b/erpnext/stock/doctype/stock_entry/test_stock_entry.py @@ -81,17 +81,21 @@ class TestStockEntry(unittest.TestCase): template = frappe.get_doc("Item", item.variant_of) else: template = item + + projected_qty, actual_qty = frappe.db.get_value("Bin", {"item_code": item_code, + "warehouse": "_Test Warehouse - _TC"}, ["projected_qty", "actual_qty"]) or 0 # stock entry reqd for auto-reorder create_stock_reconciliation(item_code=item_code, warehouse="_Test Warehouse - _TC", - qty=10, rate=100) - - frappe.db.set_value("Stock Settings", None, "auto_indent", 1) - projected_qty = frappe.db.get_value("Bin", {"item_code": item_code, + qty = actual_qty + abs(projected_qty) + 10, rate=100) + + projected_qty = projected_qty = frappe.db.get_value("Bin", {"item_code": item_code, "warehouse": "_Test Warehouse - _TC"}, "projected_qty") or 0 - + + frappe.db.set_value("Stock Settings", None, "auto_indent", 1) + # update re-level qty so that it is more than projected_qty - if projected_qty > template.reorder_levels[0].warehouse_reorder_level: + if projected_qty >= template.reorder_levels[0].warehouse_reorder_level: template.reorder_levels[0].warehouse_reorder_level += projected_qty template.save() diff --git a/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py b/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py index 5614ee23d3..413f820043 100644 --- a/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +++ b/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py @@ -227,7 +227,7 @@ class StockReconciliation(StockController): msgprint(_("Please enter Expense Account"), raise_exception=1) elif not frappe.db.sql("""select name from `tabStock Ledger Entry` limit 1"""): if frappe.db.get_value("Account", self.expense_account, "report_type") == "Profit and Loss": - frappe.throw(_("Difference Account must be a 'Liability' type account, since this Stock Reconciliation is an Opening Entry"), OpeningEntryAccountError) + frappe.throw(_("Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry"), OpeningEntryAccountError) def get_items_for(self, warehouse): self.items = [] diff --git a/erpnext/stock/doctype/stock_reconciliation/test_stock_reconciliation.py b/erpnext/stock/doctype/stock_reconciliation/test_stock_reconciliation.py index 0d3288c363..eaa82dd23f 100644 --- a/erpnext/stock/doctype/stock_reconciliation/test_stock_reconciliation.py +++ b/erpnext/stock/doctype/stock_reconciliation/test_stock_reconciliation.py @@ -97,7 +97,8 @@ def create_stock_reconciliation(**args): sr.posting_time = args.posting_time or nowtime() sr.company = args.company or "_Test Company" sr.fiscal_year = get_fiscal_year(sr.posting_date)[0] - sr.expense_account = args.expense_account or "Stock Adjustment - _TC" + sr.expense_account = args.expense_account or \ + ("Stock Adjustment - _TC" if frappe.get_all("Stock Ledger Entry") else "Temporary Opening - _TC") sr.cost_center = args.cost_center or "_Test Cost Center - _TC" sr.append("items", { "item_code": args.item_code or "_Test Item", diff --git a/erpnext/stock/reorder_item.py b/erpnext/stock/reorder_item.py index 61abe3b49f..30fe755bd4 100644 --- a/erpnext/stock/reorder_item.py +++ b/erpnext/stock/reorder_item.py @@ -11,10 +11,7 @@ def reorder_item(): if not frappe.db.sql("select name from `tabFiscal Year` limit 1"): return - if getattr(frappe.local, "auto_indent", None) is None: - frappe.local.auto_indent = cint(frappe.db.get_value('Stock Settings', None, 'auto_indent')) - - if frappe.local.auto_indent: + if cint(frappe.db.get_value('Stock Settings', None, 'auto_indent')): return _reorder_item() def _reorder_item(): From e2968e989332083a9055bd53e76c7f2df9bb1e36 Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Fri, 22 May 2015 17:25:55 +0530 Subject: [PATCH 3/3] minor fixes in test cases --- erpnext/buying/doctype/purchase_order/test_purchase_order.py | 2 ++ erpnext/stock/doctype/stock_entry/test_stock_entry.py | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/erpnext/buying/doctype/purchase_order/test_purchase_order.py b/erpnext/buying/doctype/purchase_order/test_purchase_order.py index f68f814ce3..66d50ba89d 100644 --- a/erpnext/buying/doctype/purchase_order/test_purchase_order.py +++ b/erpnext/buying/doctype/purchase_order/test_purchase_order.py @@ -80,6 +80,8 @@ def create_purchase_order(**args): po.company = args.company or "_Test Company" po.supplier = args.customer or "_Test Supplier" po.is_subcontracted = args.is_subcontracted or "No" + po.currency = args.currency or frappe.db.get_value("Company", po.company, "default_currency") + po.conversion_factor = args.conversion_factor or 1 po.append("items", { "item_code": args.item or args.item_code or "_Test Item", diff --git a/erpnext/stock/doctype/stock_entry/test_stock_entry.py b/erpnext/stock/doctype/stock_entry/test_stock_entry.py index 432627b3cb..ff0b272fd5 100644 --- a/erpnext/stock/doctype/stock_entry/test_stock_entry.py +++ b/erpnext/stock/doctype/stock_entry/test_stock_entry.py @@ -83,13 +83,13 @@ class TestStockEntry(unittest.TestCase): template = item projected_qty, actual_qty = frappe.db.get_value("Bin", {"item_code": item_code, - "warehouse": "_Test Warehouse - _TC"}, ["projected_qty", "actual_qty"]) or 0 + "warehouse": "_Test Warehouse - _TC"}, ["projected_qty", "actual_qty"]) or [0, 0] # stock entry reqd for auto-reorder create_stock_reconciliation(item_code=item_code, warehouse="_Test Warehouse - _TC", qty = actual_qty + abs(projected_qty) + 10, rate=100) - projected_qty = projected_qty = frappe.db.get_value("Bin", {"item_code": item_code, + projected_qty = frappe.db.get_value("Bin", {"item_code": item_code, "warehouse": "_Test Warehouse - _TC"}, "projected_qty") or 0 frappe.db.set_value("Stock Settings", None, "auto_indent", 1)