chore: fix conflicts

frappe · Oct 18, 2024 · 6185597 · 6185597
1 parent eaa753a
commit 6185597
Show file tree

Hide file tree

Showing 3 changed files with 0 additions and 23 deletions.
diff --git a/hrms/payroll/doctype/payroll_settings/payroll_settings.json b/hrms/payroll/doctype/payroll_settings/payroll_settings.json
@@ -178,11 +178,7 @@
  "index_web_pages_for_search": 1,
  "issingle": 1,
  "links": [],
-<<<<<<< HEAD
- "modified": "2024-01-23 17:42:52.958013",
-=======
  "modified": "2024-10-18 17:12:02.044020",
->>>>>>> 165b361ed (refactor: drop setting to control visibility of opening amount fields in assignment)
  "modified_by": "Administrator",
  "module": "Payroll",
  "name": "Payroll Settings",

diff --git a/hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.js b/hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.js
@@ -139,24 +139,9 @@ frappe.ui.form.on("Salary Structure Assignment", {
 			});
 		}
 	},
-<<<<<<< HEAD
-	valiadte_joining_date_and_salary_slips: function (frm) {
-		frappe.call({
-			method: "earning_and_deduction_entries_does_not_exists",
-			doc: frm.doc,
-			callback: function (data) {
-				let earning_and_deduction_entries_does_not_exists = data.message;
-				frm.unhide_earnings_and_taxation_section =
-					earning_and_deduction_entries_does_not_exists;
-				frm.trigger("set_earnings_and_taxation_section_visibility");
-			},
-		});
-	},
-=======
 
 	toggle_opening_balances_section: function (frm) {
 		if (!frm.doc.from_date || !frm.doc.employee) return;
->>>>>>> 627e391b8 (refactor: simplify logic for toggling & warning about opening balances)
 
 		frm.call("are_opening_entries_required").then((data) => {
 			if (data.message) {

diff --git a/hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.json b/hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.json
@@ -210,11 +210,7 @@
  ],
  "is_submittable": 1,
  "links": [],
-<<<<<<< HEAD
- "modified": "2023-09-12 20:54:02.758373",
-=======
  "modified": "2024-10-18 18:06:42.013701",
->>>>>>> fc6a21aaa (refactor(Salary Structure Assignment): relabel opening balances section)
  "modified_by": "Administrator",
  "module": "Payroll",
  "name": "Salary Structure Assignment",