chore: Code clean up
This commit is contained in:
parent
c8565c7090
commit
aa580769a6
@ -1416,45 +1416,6 @@ class SalesInvoice(SellingController):
|
||||
if points_to_redeem < 1: # since points_to_redeem is integer
|
||||
break
|
||||
|
||||
# Healthcare
|
||||
@frappe.whitelist()
|
||||
def set_healthcare_services(self, checked_values):
|
||||
self.set("items", [])
|
||||
from erpnext.stock.get_item_details import get_item_details
|
||||
for checked_item in checked_values:
|
||||
item_line = self.append("items", {})
|
||||
price_list, price_list_currency = frappe.db.get_values("Price List", {"selling": 1}, ['name', 'currency'])[0]
|
||||
args = {
|
||||
'doctype': "Sales Invoice",
|
||||
'item_code': checked_item['item'],
|
||||
'company': self.company,
|
||||
'customer': frappe.db.get_value("Patient", self.patient, "customer"),
|
||||
'selling_price_list': price_list,
|
||||
'price_list_currency': price_list_currency,
|
||||
'plc_conversion_rate': 1.0,
|
||||
'conversion_rate': 1.0
|
||||
}
|
||||
item_details = get_item_details(args)
|
||||
item_line.item_code = checked_item['item']
|
||||
item_line.qty = 1
|
||||
if checked_item['qty']:
|
||||
item_line.qty = checked_item['qty']
|
||||
if checked_item['rate']:
|
||||
item_line.rate = checked_item['rate']
|
||||
else:
|
||||
item_line.rate = item_details.price_list_rate
|
||||
item_line.amount = float(item_line.rate) * float(item_line.qty)
|
||||
if checked_item['income_account']:
|
||||
item_line.income_account = checked_item['income_account']
|
||||
if checked_item['dt']:
|
||||
item_line.reference_dt = checked_item['dt']
|
||||
if checked_item['dn']:
|
||||
item_line.reference_dn = checked_item['dn']
|
||||
if checked_item['description']:
|
||||
item_line.description = checked_item['description']
|
||||
|
||||
self.set_missing_values(for_validate = True)
|
||||
|
||||
def set_status(self, update=False, status=None, update_modified=True):
|
||||
if self.is_new():
|
||||
if self.get('amended_from'):
|
||||
|
@ -170,6 +170,9 @@ def create_donor(payment):
|
||||
|
||||
def get_company_for_donations():
|
||||
company = frappe.db.get_single_value('Non Profit Settings', 'donation_company')
|
||||
if not company:
|
||||
from erpnext.non_profit.utils import get_company
|
||||
company = get_company()
|
||||
return company
|
||||
|
||||
|
||||
|
@ -354,6 +354,9 @@ def process_request_data(data):
|
||||
|
||||
def get_company_for_memberships():
|
||||
company = frappe.db.get_single_value("Non Profit Settings", "company")
|
||||
if not company:
|
||||
from erpnext.non_profit.utils import get_company
|
||||
company = get_company()
|
||||
return company
|
||||
|
||||
|
||||
|
12
erpnext/non_profit/utils.py
Normal file
12
erpnext/non_profit/utils.py
Normal file
@ -0,0 +1,12 @@
|
||||
import frappe
|
||||
|
||||
|
||||
def get_company():
|
||||
company = frappe.defaults.get_defaults().company
|
||||
if company:
|
||||
return company
|
||||
else:
|
||||
company = frappe.get_list("Company", limit=1)
|
||||
if company:
|
||||
return company[0].name
|
||||
return None
|
@ -15,7 +15,6 @@ doctype_series_map = {
|
||||
'Blanket Order': 'MFG-BLR-.YYYY.-',
|
||||
'C-Form': 'ACC-CF-.YYYY.-',
|
||||
'Campaign': 'SAL-CAM-.YYYY.-',
|
||||
'Clinical Procedure': 'HLC-CPR-.YYYY.-',
|
||||
'Course Schedule': 'EDU-CSH-.YYYY.-',
|
||||
'Customer': 'CUST-.YYYY.-',
|
||||
'Delivery Note': 'MAT-DN-.YYYY.-',
|
||||
@ -31,7 +30,6 @@ doctype_series_map = {
|
||||
'Instructor': 'EDU-INS-.YYYY.-',
|
||||
'Issue': 'ISS-.YYYY.-',
|
||||
'Journal Entry': 'ACC-JV-.YYYY.-',
|
||||
'Lab Test': 'HLC-LT-.YYYY.-',
|
||||
'Landed Cost Voucher': 'MAT-LCV-.YYYY.-',
|
||||
'Lead': 'CRM-LEAD-.YYYY.-',
|
||||
'Leave Allocation': 'HR-LAL-.YYYY.-',
|
||||
|
Loading…
x
Reference in New Issue
Block a user