Browse Source
fix: implicit string concatenation (#25371)
* fix: implicit string concatenations
* chore: rerun healthcare patch for company fields
develop
Ankush Menat
3 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with
4 additions and
4 deletions
-
erpnext/accounts/doctype/promotional_scheme/promotional_scheme.py
-
erpnext/patches.txt
-
erpnext/patches/v13_0/set_company_field_in_healthcare_doctypes.py
|
|
|
@ -9,7 +9,7 @@ from frappe.utils import cstr |
|
|
|
from frappe.model.naming import make_autoname |
|
|
|
from frappe.model.document import Document |
|
|
|
|
|
|
|
pricing_rule_fields = ['apply_on', 'mixed_conditions', 'is_cumulative', 'other_item_code', 'other_item_group' |
|
|
|
pricing_rule_fields = ['apply_on', 'mixed_conditions', 'is_cumulative', 'other_item_code', 'other_item_group', |
|
|
|
'apply_rule_on_other', 'other_brand', 'selling', 'buying', 'applicable_for', 'valid_from', |
|
|
|
'valid_upto', 'customer', 'customer_group', 'territory', 'sales_partner', 'campaign', 'supplier', |
|
|
|
'supplier_group', 'company', 'currency', 'apply_multiple_pricing_rules'] |
|
|
|
|
|
|
|
@ -693,7 +693,7 @@ execute:frappe.reload_doctype('Dashboard') |
|
|
|
execute:frappe.reload_doc('desk', 'doctype', 'number_card_link') |
|
|
|
execute:frappe.delete_doc_if_exists('Dashboard', 'Accounts') |
|
|
|
erpnext.patches.v13_0.update_actual_start_and_end_date_in_wo |
|
|
|
erpnext.patches.v13_0.set_company_field_in_healthcare_doctypes #2020-05-25 |
|
|
|
erpnext.patches.v13_0.set_company_field_in_healthcare_doctypes #2021-04-16 |
|
|
|
erpnext.patches.v12_0.update_bom_in_so_mr |
|
|
|
execute:frappe.delete_doc("Report", "Department Analytics") |
|
|
|
execute:frappe.rename_doc("Desk Page", "Loan Management", "Loan", force=True) |
|
|
|
|
|
|
|
@ -3,7 +3,7 @@ import frappe |
|
|
|
|
|
|
|
def execute(): |
|
|
|
company = frappe.db.get_single_value('Global Defaults', 'default_company') |
|
|
|
doctypes = ['Clinical Procedure', 'Inpatient Record', 'Lab Test', 'Sample Collection' 'Patient Appointment', 'Patient Encounter', 'Vital Signs', 'Therapy Session', 'Therapy Plan', 'Patient Assessment'] |
|
|
|
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: |
|
|
|
if frappe.db.exists('DocType', entry): |
|
|
|
frappe.reload_doc('Healthcare', 'doctype', entry) |
|
|
|
|
