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

Merge pull request #27169 from marination/internal-customer-util

Browse Source 
fix: Remove duplicate `create_internal_customer` utility
This commit is contained in:
Marica 2021-08-26 16:42:28 +05:30 committed by GitHub
commit 73b686a498
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 19 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
erpnext/accounts/doctype/sales_invoice/test_sales_invoice.py
View File

@ -1832,7 +1832,8 @@ class TestSalesInvoice(unittest.TestCase):
create_internal_customer( create_internal_customer(
customer_name="_Test Internal Customer", customer_name="_Test Internal Customer",
represents_company="_Test Company 1" represents_company="_Test Company 1",
allowed_to_interact_with="Wind Power LLC"
) )
if not frappe.db.exists("Supplier", "_Test Internal Supplier"): if not frappe.db.exists("Supplier", "_Test Internal Supplier"):
@ -1994,6 +1995,8 @@ class TestSalesInvoice(unittest.TestCase):
def test_internal_transfer_gl_entry(self): def test_internal_transfer_gl_entry(self):
## Create internal transfer account ## Create internal transfer account
from erpnext.selling.doctype.customer.test_customer import create_internal_customer
account = create_account(account_name="Unrealized Profit", account = create_account(account_name="Unrealized Profit",
parent_account="Current Liabilities - TCP1", company="_Test Company with perpetual inventory") parent_account="Current Liabilities - TCP1", company="_Test Company with perpetual inventory")
@ -2551,29 +2554,6 @@ def get_taxes_and_charges():
"row_id": 1 "row_id": 1
}] }]
def create_internal_customer(customer_name, represents_company, allowed_to_interact_with):
if not frappe.db.exists("Customer", customer_name):
customer = frappe.get_doc({
"customer_group": "_Test Customer Group",
"customer_name": customer_name,
"customer_type": "Individual",
"doctype": "Customer",
"territory": "_Test Territory",
"is_internal_customer": 1,
"represents_company": represents_company
})
customer.append("companies", {
"company": allowed_to_interact_with
})
customer.insert()
customer_name = customer.name
else:
customer_name = frappe.db.get_value("Customer", customer_name)
return customer_name
def create_internal_supplier(supplier_name, represents_company, allowed_to_interact_with): def create_internal_supplier(supplier_name, represents_company, allowed_to_interact_with):
if not frappe.db.exists("Supplier", supplier_name): if not frappe.db.exists("Supplier", supplier_name):
supplier = frappe.get_doc({ supplier = frappe.get_doc({

24
erpnext/selling/doctype/customer/test_customer.py
View File

@ -353,27 +353,25 @@ def set_credit_limit(customer, company, credit_limit):
}) })
customer.credit_limits[-1].db_insert() customer.credit_limits[-1].db_insert()
def create_internal_customer(**args): def create_internal_customer(customer_name, represents_company, allowed_to_interact_with):
args = frappe._dict(args)
customer_name = args.get("customer_name") or "_Test Internal Customer"
if not frappe.db.exists("Customer", customer_name): if not frappe.db.exists("Customer", customer_name):
customer = frappe.get_doc({ customer = frappe.get_doc({
"doctype": "Customer", "doctype": "Customer",
"customer_group": args.customer_group or "_Test Customer Group", "customer_group": "_Test Customer Group",
"customer_name": customer_name, "customer_name": customer_name,
"customer_type": args.customer_type or "Individual", "customer_type": "Individual",
"territory": args.territory or "_Test Territory", "territory": "_Test Territory",
"is_internal_customer": 1, "is_internal_customer": 1,
"represents_company": args.represents_company or "_Test Company with perpetual inventory" "represents_company": represents_company
}) })
customer.append("companies", { customer.append("companies", {
"company": args.allowed_company or "Wind Power LLC" "company": allowed_to_interact_with
}) })
customer.insert()
return customer customer.insert()
customer_name = customer.name
else: else:
return frappe.get_cached_doc("Customer", customer_name) customer_name = frappe.db.get_value("Customer", customer_name)
return customer_name

7
erpnext/stock/doctype/delivery_note/test_delivery_note.py
View File

@ -433,9 +433,10 @@ class TestDeliveryNote(unittest.TestCase):
from erpnext.selling.doctype.customer.test_customer import create_internal_customer from erpnext.selling.doctype.customer.test_customer import create_internal_customer
company = frappe.db.get_value('Warehouse', 'Stores - TCP1', 'company') company = frappe.db.get_value('Warehouse', 'Stores - TCP1', 'company')
customer = create_internal_customer( customer_name = create_internal_customer(
customer_name="_Test Internal Customer 2", customer_name="_Test Internal Customer 2",
allowed_company="_Test Company with perpetual inventory" represents_company="_Test Company with perpetual inventory",
allowed_to_interact_with="_Test Company with perpetual inventory"
) )
set_valuation_method("_Test Item", "FIFO") set_valuation_method("_Test Item", "FIFO")
@ -453,7 +454,7 @@ class TestDeliveryNote(unittest.TestCase):
dn = create_delivery_note( dn = create_delivery_note(
item_code="_Test Product Bundle Item", item_code="_Test Product Bundle Item",
company="_Test Company with perpetual inventory", company="_Test Company with perpetual inventory",
customer=customer.name, customer=customer_name,
cost_center = 'Main - TCP1', cost_center = 'Main - TCP1',
expense_account = "Cost of Goods Sold - TCP1", expense_account = "Cost of Goods Sold - TCP1",
do_not_submit=True, do_not_submit=True,