fix: formula checkbox label

(cherry picked from commit 3a8091d) # Conflicts: # hrms/hr/doctype/appraisal_cycle/appraisal_cycle.json
frappe · May 29, 2024 · daabeb0 · daabeb0
1 parent 3eddaed
commit daabeb0
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/hrms/hr/doctype/appraisal_cycle/appraisal_cycle.json b/hrms/hr/doctype/appraisal_cycle/appraisal_cycle.json
@@ -159,7 +159,7 @@
    "read_only": 1
   },
   {
-   "depends_on": "eval:doc.calculate_final_score_based_on_formula === 1;",
+   "depends_on": "calculate_final_score_based_on_formula",
    "fieldname": "final_score_formula",
    "fieldtype": "Code",
    "label": "Final Score Formula",
@@ -170,7 +170,7 @@
    "default": "0",
    "fieldname": "calculate_final_score_based_on_formula",
    "fieldtype": "Check",
-   "label": "Calculate final score based on formula"
+   "label": "Calculate Final Score based on Formula"
   },
   {
    "fieldname": "column_break_wpgg",
@@ -192,11 +192,15 @@
    "link_fieldname": "appraisal_cycle"
   }
  ],
+<<<<<<< HEAD
 <<<<<<< HEAD
  "modified": "2023-03-29 12:28:36.247120",
 =======
  "modified": "2024-04-16 13:15:55.493958",
 >>>>>>> 1712990de (feat: allow adding formula to calculate final score in appraisal cycle)
+=======
+ "modified": "2024-05-29 16:45:22.291678",
+>>>>>>> 3a8091d11 (fix: formula checkbox label)
  "modified_by": "Administrator",
  "module": "HR",
  "name": "Appraisal Cycle",