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

Revert 'fix: tests depending on global default company'

Browse Source
This commit is contained in:
Deepesh Garg 2020-05-30 11:40:16 +05:30
parent 36f7710356
commit 8a4dc521cd
9 changed files with 14 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
erpnext/accounts/doctype/subscription/subscription.py
View File

@ -238,10 +238,6 @@ class Subscription(Document):
Creates a `Sales Invoice`, submits it and returns it
"""
invoice = frappe.new_doc('Sales Invoice')
if not invoice.company:
invoice.company = frappe.db.get_value('Global Defaults', None, 'default_company')
invoice.set_posting_time = 1
invoice.posting_date = self.current_invoice_start
invoice.customer = self.customer

2
erpnext/healthcare/doctype/clinical_procedure/test_clinical_procedure.py
View File

@ -18,7 +18,6 @@ class TestClinicalProcedure(unittest.TestCase):
self.assertEquals(frappe.db.get_value('Item', procedure_template.item, 'disabled'), 1)
def test_consumables(self):
frappe.db.set_value('Global Defaults', None, 'default_company', '_Test Company')
patient, medical_department, practitioner = create_healthcare_docs()
procedure_template = create_clinical_procedure_template()
procedure_template.allow_stock_consumption = 1
@ -39,7 +38,6 @@ class TestClinicalProcedure(unittest.TestCase):
result = procedure.complete_procedure()
# check consumption
self.assertTrue(frappe.db.exists('Stock Entry', result))
frappe.db.set_value('Global Defaults', None, 'default_company', None)
def create_consumable():

2
erpnext/healthcare/doctype/patient/test_patient.py
View File

@ -15,7 +15,6 @@ class TestPatient(unittest.TestCase):
self.assertTrue(frappe.db.get_value('Patient', patient, 'customer'))
def test_patient_registration(self):
frappe.db.set_value('Global Defaults', None, 'default_company', '_Test Company')
frappe.db.sql("""delete from `tabPatient`""")
settings = frappe.get_single('Healthcare Settings')
settings.collect_registration_fee = 1
@ -33,4 +32,3 @@ class TestPatient(unittest.TestCase):
settings.collect_registration_fee = 0
settings.save()
frappe.db.set_value('Global Defaults', None, 'default_company', None)

2
erpnext/healthcare/doctype/patient_medical_record/test_patient_medical_record.py
View File

@ -13,7 +13,6 @@ class TestPatientMedicalRecord(unittest.TestCase):
frappe.db.set_value('Healthcare Settings', None, 'automate_appointment_invoicing', 1)
def test_medical_record(self):
frappe.db.set_value('Global Defaults', None, 'default_company', '_Test Company')
patient, medical_department, practitioner = create_healthcare_docs()
appointment = create_appointment(patient, practitioner, nowdate(), invoice=1)
encounter = create_encounter(appointment)
@ -39,7 +38,6 @@ class TestPatientMedicalRecord(unittest.TestCase):
# check for lab test
medical_rec = frappe.db.exists('Patient Medical Record', {'status': 'Open', 'reference_name': lab_test.name})
self.assertTrue(medical_rec)
frappe.db.set_value('Global Defaults', None, 'default_company', None)
def create_procedure(appointment):

8
erpnext/hr/doctype/employee_tax_exemption_declaration/test_employee_tax_exemption_declaration.py
View File

@ -20,7 +20,7 @@ class TestEmployeeTaxExemptionDeclaration(unittest.TestCase):
declaration = frappe.get_doc({
"doctype": "Employee Tax Exemption Declaration",
"employee": frappe.get_value("Employee", {"user_id":"employee@taxexepmtion.com"}, "name"),
"company": erpnext.get_default_company() or 'Wind Power LLC',
"company": erpnext.get_default_company(),
"payroll_period": "_Test Payroll Period",
"declarations": [
dict(exemption_sub_category = "_Test Sub Category",
@ -37,7 +37,7 @@ class TestEmployeeTaxExemptionDeclaration(unittest.TestCase):
declaration = frappe.get_doc({
"doctype": "Employee Tax Exemption Declaration",
"employee": frappe.get_value("Employee", {"user_id":"employee@taxexepmtion.com"}, "name"),
"company": erpnext.get_default_company() or 'Wind Power LLC',
"company": erpnext.get_default_company(),
"payroll_period": "_Test Payroll Period",
"declarations": [
dict(exemption_sub_category = "_Test Sub Category",
@ -52,7 +52,7 @@ class TestEmployeeTaxExemptionDeclaration(unittest.TestCase):
duplicate_declaration = frappe.get_doc({
"doctype": "Employee Tax Exemption Declaration",
"employee": frappe.get_value("Employee", {"user_id":"employee@taxexepmtion.com"}, "name"),
"company": erpnext.get_default_company() or 'Wind Power LLC',
"company": erpnext.get_default_company(),
"payroll_period": "_Test Payroll Period",
"declarations": [
dict(exemption_sub_category = "_Test Sub Category",
@ -68,7 +68,7 @@ class TestEmployeeTaxExemptionDeclaration(unittest.TestCase):
declaration = frappe.get_doc({
"doctype": "Employee Tax Exemption Declaration",
"employee": frappe.get_value("Employee", {"user_id":"employee@taxexepmtion.com"}, "name"),
"company": erpnext.get_default_company() or 'Wind Power LLC',
"company": erpnext.get_default_company(),
"payroll_period": "_Test Payroll Period",
"declarations": [
dict(exemption_sub_category = "_Test Sub Category",

4
erpnext/hr/doctype/leave_period/test_leave_period.py
View File

@ -45,7 +45,7 @@ class TestLeavePeriod(unittest.TestCase):
def create_leave_period(from_date, to_date, company=None):
leave_period = frappe.db.get_value('Leave Period',
dict(company=company or erpnext.get_default_company() or 'Wind Power LLC',
dict(company=company or erpnext.get_default_company(),
from_date=from_date,
to_date=to_date,
is_active=1), 'name')
@ -54,7 +54,7 @@ def create_leave_period(from_date, to_date, company=None):
leave_period = frappe.get_doc({
"doctype": "Leave Period",
"company": company or erpnext.get_default_company() or 'Wind Power LLC',
"company": company or erpnext.get_default_company(),
"from_date": from_date,
"to_date": to_date,
"is_active": 1

6
erpnext/hr/doctype/payroll_entry/test_payroll_entry.py
View File

@ -27,7 +27,7 @@ class TestPayrollEntry(unittest.TestCase):
frappe.db.set_value("HR Settings", None, "email_salary_slip_to_employee", 0)
def test_payroll_entry(self): # pylint: disable=no-self-use
company = erpnext.get_default_company() or 'Wind Power LLC'
company = erpnext.get_default_company()
for data in frappe.get_all('Salary Component', fields = ["name"]):
if not frappe.db.get_value('Salary Component Account',
{'parent': data.name, 'company': company}, 'name'):
@ -157,7 +157,7 @@ def make_payroll_entry(**args):
args = frappe._dict(args)
payroll_entry = frappe.new_doc("Payroll Entry")
payroll_entry.company = args.company or erpnext.get_default_company() or 'Wind Power LLC'
payroll_entry.company = args.company or erpnext.get_default_company()
payroll_entry.start_date = args.start_date or "2016-11-01"
payroll_entry.end_date = args.end_date or "2016-11-30"
payroll_entry.payment_account = get_payment_account()
@ -183,7 +183,7 @@ def make_payroll_entry(**args):
def get_payment_account():
return frappe.get_value('Account',
{'account_type': 'Cash', 'company': erpnext.get_default_company() or 'Wind Power LLC', 'is_group':0}, "name")
{'account_type': 'Cash', 'company': erpnext.get_default_company(),'is_group':0}, "name")
def make_holiday(holiday_list_name):
if not frappe.db.exists('Holiday List', holiday_list_name):

6
erpnext/hr/doctype/salary_slip/test_salary_slip.py
View File

@ -242,7 +242,7 @@ class TestSalarySlip(unittest.TestCase):
self.assertEqual(ss.net_pay, (flt(ss.gross_pay) - (flt(ss.total_deduction) + flt(ss.total_loan_repayment))))
def test_payroll_frequency(self):
fiscal_year = get_fiscal_year(nowdate(), company=erpnext.get_default_company() or 'Wind Power LLC')[0]
fiscal_year = get_fiscal_year(nowdate(), company=erpnext.get_default_company())[0]
month = "%02d" % getdate(nowdate()).month
m = get_month_details(fiscal_year, month)
@ -560,7 +560,7 @@ def create_exemption_declaration(employee, payroll_period):
"doctype": "Employee Tax Exemption Declaration",
"employee": employee,
"payroll_period": payroll_period,
"company": erpnext.get_default_company() or 'Wind Power LLC'
"company": erpnext.get_default_company()
})
declaration.append("declarations", {
"exemption_sub_category": "_Test Sub Category",
@ -667,7 +667,7 @@ def create_additional_salary(employee, payroll_period, amount):
frappe.get_doc({
"doctype": "Additional Salary",
"employee": employee,
"company": erpnext.get_default_company() or 'Wind Power LLC',
"company": erpnext.get_default_company(),
"salary_component": "Performance Bonus",
"payroll_date": salary_date,
"amount": amount,

4
erpnext/hr/doctype/salary_structure/test_salary_structure.py
View File

@ -22,7 +22,7 @@ class TestSalaryStructure(unittest.TestCase):
frappe.db.sql("delete from `tab%s`" % dt)
self.make_holiday_list()
frappe.db.set_value("Company", erpnext.get_default_company() or 'Wind Power LLC', "default_holiday_list", "Salary Structure Test Holiday List")
frappe.db.set_value("Company", erpnext.get_default_company(), "default_holiday_list", "Salary Structure Test Holiday List")
make_employee("test_employee@salary.com")
make_employee("test_employee_2@salary.com")
@ -151,7 +151,7 @@ def create_salary_structure_assignment(employee, salary_structure, from_date=Non
salary_structure_assignment.variable = 5000
salary_structure_assignment.from_date = from_date or add_days(nowdate(), -1)
salary_structure_assignment.salary_structure = salary_structure
salary_structure_assignment.company = company or erpnext.get_default_company() or 'Wind Power LLC'
salary_structure_assignment.company = company or erpnext.get_default_company()
salary_structure_assignment.save(ignore_permissions=True)
salary_structure_assignment.income_tax_slab = "Tax Slab: _Test Payroll Period"
salary_structure_assignment.submit()