Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

testcase fixes #478

Browse Source
This commit is contained in:
Nabin Hait 2014-04-07 16:00:28 +05:30
parent dc82d4f0cd
commit 088dec6c09
4 changed files with 162 additions and 162 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
erpnext/selling/doctype/lead/lead.py
View File

@ -77,13 +77,13 @@ def _make_customer(source_name, target_doc=None, ignore_permissions=False):
def set_missing_values(source, target):
if source.company_name:
target[0].customer_type = "Company"
target[0].customer_name = source.company_name
target.customer_type = "Company"
target.customer_name = source.company_name
else:
target[0].customer_type = "Individual"
target[0].customer_name = source.lead_name
target.customer_type = "Individual"
target.customer_name = source.lead_name
target[0].customer_group = frappe.db.get_default("customer_group")
target.customer_group = frappe.db.get_default("customer_group")
doclist = get_mapped_doc("Lead", source_name,
{"Lead": {

4
erpnext/selling/doctype/quotation/quotation.py
View File

@ -105,8 +105,8 @@ def _make_sales_order(source_name, target_doc=None, ignore_permissions=False):
def set_missing_values(source, target):
if customer:
target[0].customer = customer.name
target[0].customer_name = customer.customer_name
target.customer = customer.name
target.customer_name = customer.customer_name
si = frappe.get_doc(target)
si.ignore_permissions = ignore_permissions

2
erpnext/stock/doctype/material_request/material_request.py
View File

@ -343,7 +343,7 @@ def make_stock_entry(source_name, target_doc=None):
target.transfer_qty = flt(obj.qty) - flt(obj.ordered_qty)
def set_missing_values(source, target):
target[0].purpose = "Material Transfer"
target.purpose = "Material Transfer"
se = frappe.get_doc(target)
se.run_method("get_stock_and_rate")

14
erpnext/stock/doctype/material_request/test_material_request.py
View File

@ -62,7 +62,7 @@ class TestMaterialRequest(unittest.TestCase):
def _test_expected(self, doc, expected_values):
for i, expected in enumerate(expected_values):
for fieldname, val in expected.items():
self.assertEquals(val, doc[i].get(fieldname))
self.assertEquals(val, doc.get(fieldname))
def _test_requested_qty(self, qty1, qty2):
self.assertEqual(flt(frappe.db.get_value("Bin", {"item_code": "_Test Item Home Desktop 100",
@ -135,11 +135,11 @@ class TestMaterialRequest(unittest.TestCase):
# check for stopped status of Material Request
po = frappe.copy_doc(po_doc)
po.insert()
mr.obj.update_status('Stopped')
mr.update_status('Stopped')
self.assertRaises(frappe.ValidationError, po.submit)
self.assertRaises(frappe.ValidationError, po.cancel)
mr.obj.update_status('Submitted')
mr.update_status('Submitted')
po = frappe.copy_doc(po_doc)
po.insert()
po.submit()
@ -198,11 +198,11 @@ class TestMaterialRequest(unittest.TestCase):
# check for stopped status of Material Request
se = frappe.copy_doc(se_doc)
se.insert()
mr.obj.update_status('Stopped')
mr.update_status('Stopped')
self.assertRaises(frappe.ValidationError, se.submit)
self.assertRaises(frappe.ValidationError, se.cancel)
mr.obj.update_status('Submitted')
mr.update_status('Submitted')
se = frappe.copy_doc(se_doc)
se.insert()
se.submit()
@ -261,11 +261,11 @@ class TestMaterialRequest(unittest.TestCase):
# check for stopped status of Material Request
se = frappe.copy_doc(se_doc)
se.insert()
mr.obj.update_status('Stopped')
mr.update_status('Stopped')
self.assertRaises(frappe.ValidationError, se.submit)
self.assertRaises(frappe.ValidationError, se.cancel)
mr.obj.update_status('Submitted')
mr.update_status('Submitted')
se = frappe.copy_doc(se_doc)
se.insert()
se.submit()