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

fix(Healthcare): unhide company field in Sample Collection, add field in Rehab DocTypes (#21907) (#21917)

Browse Source 
* fix: unhide company field in Sample Collection

* fix: add and set company field in rehab doctypes

(cherry picked from commit 316d136acabba37e58c5987f22570bc1ebf9b64b)

Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
This commit is contained in:
mergify[bot] 2020-05-25 19:18:11 +05:30 committed by GitHub
parent 4771362d39
commit dba67dc4a5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 24 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
erpnext/healthcare/doctype/patient_assessment/patient_assessment.json
View File

@ -11,6 +11,7 @@
"patient", "patient",
"assessment_template", "assessment_template",
"column_break_4", "column_break_4",
"company",
"healthcare_practitioner", "healthcare_practitioner",
"assessment_datetime", "assessment_datetime",
"assessment_description", "assessment_description",
@ -127,11 +128,18 @@
"fieldname": "assessment_description", "fieldname": "assessment_description",
"fieldtype": "Small Text", "fieldtype": "Small Text",
"label": "Assessment Description" "label": "Assessment Description"
},
{
"fieldname": "company",
"fieldtype": "Link",
"in_standard_filter": 1,
"label": "Company",
"options": "Company"
} }
], ],
"is_submittable": 1, "is_submittable": 1,
"links": [], "links": [],
"modified": "2020-04-21 13:23:09.815007", "modified": "2020-05-25 14:38:38.302399",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Healthcare", "module": "Healthcare",
"name": "Patient Assessment", "name": "Patient Assessment",

8
erpnext/healthcare/doctype/sample_collection/sample_collection.json
View File

@ -85,11 +85,9 @@
{ {
"fieldname": "company", "fieldname": "company",
"fieldtype": "Link", "fieldtype": "Link",
"hidden": 1, "in_standard_filter": 1,
"label": "Company", "label": "Company",
"options": "Company", "options": "Company"
"print_hide": 1,
"report_hide": 1
}, },
{ {
"fieldname": "section_break_6", "fieldname": "section_break_6",
@ -167,7 +165,7 @@
], ],
"is_submittable": 1, "is_submittable": 1,
"links": [], "links": [],
"modified": "2020-04-04 19:17:02.707203", "modified": "2020-05-25 14:36:46.990469",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Healthcare", "module": "Healthcare",
"name": "Sample Collection", "name": "Sample Collection",

10
erpnext/healthcare/doctype/therapy_plan/therapy_plan.json
View File

@ -10,6 +10,7 @@
"patient", "patient",
"patient_name", "patient_name",
"column_break_4", "column_break_4",
"company",
"status", "status",
"start_date", "start_date",
"section_break_3", "section_break_3",
@ -98,10 +99,17 @@
"label": "Status", "label": "Status",
"options": "Not Started\nIn Progress\nCompleted\nCancelled", "options": "Not Started\nIn Progress\nCompleted\nCancelled",
"read_only": 1 "read_only": 1
},
{
"fieldname": "company",
"fieldtype": "Link",
"in_standard_filter": 1,
"label": "Company",
"options": "Company"
} }
], ],
"links": [], "links": [],
"modified": "2020-04-21 13:13:43.956014", "modified": "2020-05-25 14:38:53.649315",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Healthcare", "module": "Healthcare",
"name": "Therapy Plan", "name": "Therapy Plan",

2
erpnext/patches.txt
View File

@ -688,7 +688,7 @@ erpnext.patches.v12_0.set_serial_no_status #2020-05-21
erpnext.patches.v12_0.update_price_list_currency_in_bom erpnext.patches.v12_0.update_price_list_currency_in_bom
execute:frappe.delete_doc_if_exists('Dashboard', 'Accounts') execute:frappe.delete_doc_if_exists('Dashboard', 'Accounts')
erpnext.patches.v13_0.update_actual_start_and_end_date_in_wo erpnext.patches.v13_0.update_actual_start_and_end_date_in_wo
erpnext.patches.v13_0.set_company_field_in_healthcare_doctypes erpnext.patches.v13_0.set_company_field_in_healthcare_doctypes #2020-05-25
erpnext.patches.v12_0.update_bom_in_so_mr erpnext.patches.v12_0.update_bom_in_so_mr
execute:frappe.delete_doc("Report", "Department Analytics") execute:frappe.delete_doc("Report", "Department Analytics")
execute:frappe.rename_doc("Desk Page", "Loan Management", "Loan", force=True) execute:frappe.rename_doc("Desk Page", "Loan Management", "Loan", force=True)

4
erpnext/patches/v13_0/set_company_field_in_healthcare_doctypes.py
View File

@ -3,8 +3,8 @@ import frappe
def execute(): def execute():
company = frappe.db.get_single_value('Global Defaults', 'default_company') company = frappe.db.get_single_value('Global Defaults', 'default_company')
doctypes = ['Clinical Procedure', 'Inpatient Record', 'Lab Test', 'Patient Appointment', 'Patient Encounter', 'Vital Signs'] doctypes = ['Clinical Procedure', 'Inpatient Record', 'Lab Test', 'Sample Collection' 'Patient Appointment', 'Patient Encounter', 'Vital Signs', 'Therapy Session', 'Therapy Plan', 'Patient Assessment']
for entry in doctypes: for entry in doctypes:
if frappe.db.exists('DocType', entry): if frappe.db.exists('DocType', entry):
frappe.reload_doc("Healthcare", "doctype", entry) frappe.reload_doc('Healthcare', 'doctype', entry)
frappe.db.sql("update `tab{dt}` set company = '{company}' where ifnull(company, '') = ''".format(dt=entry, company=company)) frappe.db.sql("update `tab{dt}` set company = '{company}' where ifnull(company, '') = ''".format(dt=entry, company=company))