chore: fix conflicts

Author: ruchamahabal

hrms/hr/doctype/full_and_final_asset/full_and_final_asset.json

@@ -101,19 +101,7 @@
  "index_web_pages_for_search": 1,
  "istable": 1,
  "links": [],
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
- "modified": "2021-07-15 15:17:31.309834",
-=======
- "modified": "2024-04-01 19:03:26.169709",
->>>>>>> e05357082 (feat(FnF): Option to recover asset costs instead of returning)
-=======
- "modified": "2024-04-01 21:13:47.553812",
->>>>>>> 0a4ea6d10 (feat: map asset recovery in Journal Entry)
-=======
  "modified": "2024-04-19 13:20:41.123440",
->>>>>>> 9977a47c9 (feat: set actual asset cost)
  "modified_by": "Administrator",
  "module": "HR",
  "name": "Full and Final Asset",

hrms/hr/doctype/full_and_final_outstanding_statement/full_and_final_outstanding_statement.json

@@ -86,15 +86,7 @@
  "index_web_pages_for_search": 1,
  "istable": 1,
  "links": [],
-<<<<<<< HEAD
-<<<<<<< HEAD
- "modified": "2021-07-20 16:59:34.447934",
-=======
- "modified": "2024-04-01 21:11:06.902930",
->>>>>>> 0a4ea6d10 (feat: map asset recovery in Journal Entry)
-=======
  "modified": "2024-04-19 15:34:03.923481",
->>>>>>> bb2c04174 (fix: adjust grid cols and add connection to Journal Entry)
  "modified_by": "Administrator",
  "module": "HR",
  "name": "Full and Final Outstanding Statement",

hrms/hr/doctype/full_and_final_statement/full_and_final_statement.js

@@ -54,15 +54,11 @@ frappe.ui.form.on('Full and Final Statement', {
 		frm.events.get_outstanding_statements(frm);
 	},
 
-<<<<<<< HEAD
-	get_outstanding_statements: function(frm) {
-=======
 	total_asset_recovery_cost: function (frm) {
 		frm.trigger("calculate_total_receivable_amt");
 	},
 
 	get_outstanding_statements: function (frm) {
->>>>>>> 7f3f5d123 (refactor: total amount calculation on the client-side)
 		if (frm.doc.employee) {
 			frappe.call({
 				method: "get_outstanding_statements",
@@ -74,9 +70,6 @@ frappe.ui.form.on('Full and Final Statement', {
 		}
 	},
 
-<<<<<<< HEAD
-	create_journal_entry: function(frm) {
-=======
 	calculate_total_payable_amt: function (frm) {
 		let total_payable_amount = 0;
 
@@ -117,7 +110,6 @@ frappe.ui.form.on('Full and Final Statement', {
 	},
 
 	create_journal_entry: function (frm) {
->>>>>>> 7f3f5d123 (refactor: total amount calculation on the client-side)
 		frappe.call({
 			method: "create_journal_entry",
 			doc: frm.doc,
@@ -130,13 +122,8 @@ frappe.ui.form.on('Full and Final Statement', {
 });
 
 frappe.ui.form.on("Full and Final Outstanding Statement", {
-<<<<<<< HEAD
-	reference_document: function(frm, cdt, cdn) {
-		var child = locals[cdt][cdn];
-=======
 	reference_document: function (frm, cdt, cdn) {
 		const child = locals[cdt][cdn];
->>>>>>> 7f3f5d123 (refactor: total amount calculation on the client-side)
 		if (child.reference_document_type && child.reference_document) {
 			frappe.call({
 				method: "hrms.hr.doctype.full_and_final_statement.full_and_final_statement.get_account_and_amount",

hrms/hr/doctype/full_and_final_statement/full_and_final_statement.json

@@ -187,18 +187,6 @@
  ],
  "index_web_pages_for_search": 1,
  "is_submittable": 1,
-<<<<<<< HEAD
- "links": [],
-<<<<<<< HEAD
-<<<<<<< HEAD
- "modified": "2024-01-11 18:06:22.669089",
-=======
- "modified": "2024-04-01 19:22:40.101070",
->>>>>>> e05357082 (feat(FnF): Option to recover asset costs instead of returning)
-=======
- "modified": "2024-04-01 21:08:52.804868",
->>>>>>> 0a4ea6d10 (feat: map asset recovery in Journal Entry)
-=======
  "links": [
   {
    "is_child_table": 1,
@@ -209,7 +197,6 @@
   }
  ],
  "modified": "2024-04-19 15:45:04.206575",
->>>>>>> bb2c04174 (fix: adjust grid cols and add connection to Journal Entry)
  "modified_by": "Administrator",
  "module": "HR",
  "name": "Full and Final Statement",