Merge pull request #1699 from frappe/version-15-hotfix

chore: release v15

Author: ruchamahabal

.github/workflows/ci.yml

@@ -24,6 +24,7 @@ jobs:
     timeout-minutes: 60
     env:
       NODE_ENV: "production"
+      WITH_COVERAGE: ${{ github.event_name != 'pull_request' }}
 
     strategy:
       fail-fast: false
@@ -108,14 +109,14 @@ jobs:
           BRANCH_TO_CLONE: ${{ env.HR_BRANCH }}
 
       - name: Run Tests
-        run: cd ~/frappe-bench/ && bench --site test_site run-parallel-tests --app hrms --with-coverage --total-builds 2 --build-number ${{ matrix.container }}
+        run: cd ~/frappe-bench/ && bench --site test_site run-parallel-tests --app hrms --total-builds 2 --build-number ${{ matrix.container }}
         env:
           TYPE: server
-          CI_BUILD_ID: ${{ github.run_id }}
-          ORCHESTRATOR_URL: http://test-orchestrator.frappe.io
+          CAPTURE_COVERAGE: ${{ github.event_name != 'pull_request' }}
 
       - name: Upload coverage data
         uses: actions/upload-artifact@v3
+        if: github.event_name != 'pull_request'
         with:
           name: coverage-${{ matrix.container }}
           path: /home/runner/frappe-bench/sites/coverage.xml
@@ -124,6 +125,7 @@ jobs:
     name: Coverage Wrap Up
     needs: tests
     runs-on: ubuntu-latest
+    if: ${{ github.event_name != 'pull_request' }}
     steps:
       - name: Clone
         uses: actions/checkout@v2

frontend/src/components/ExpenseTaxesTable.vue

@@ -191,14 +191,6 @@ const taxesTableFields = createResource({
 	params: { doctype: "Expense Taxes and Charges" },
 	transform(data) {
 		const excludeFields = ["description_sb"]
-		const dimensionFields = [
-			"cost_center",
-			"project",
-			"accounting_dimensions_section",
-		]
-
-		if (!props.id) excludeFields.push(...dimensionFields)
-
 		return data
 			.map((field) => {
 				if (field.fieldname === "account_head") {

frontend/src/components/ExpensesTable.vue

@@ -197,15 +197,6 @@ const expensesTableFields = createResource({
 	params: { doctype: "Expense Claim Detail" },
 	transform(data) {
 		const excludeFields = ["description_sb", "amounts_sb"]
-		const dimensionFields = [
-			"cost_center",
-			"project",
-			"branch",
-			"accounting_dimensions_section",
-		]
-
-		if (!props.id) excludeFields.push(...dimensionFields)
-
 		return data.filter((field) => !excludeFields.includes(field.fieldname))
 	},
 })

hrms/hr/doctype/full_and_final_asset/full_and_final_asset.json

@@ -8,11 +8,18 @@
   "reference",
   "asset_name",
   "date",
+  "actual_cost",
+  "cost",
+  "column_break_xezj",
+  "account",
+  "action",
   "status",
+  "section_break_hudu",
   "description"
  ],
  "fields": [
   {
+   "columns": 2,
    "fieldname": "reference",
    "fieldtype": "Link",
    "in_list_view": 1,
@@ -22,6 +29,7 @@
    "reqd": 1
   },
   {
+   "columns": 1,
    "fieldname": "status",
    "fieldtype": "Select",
    "in_list_view": 1,
@@ -35,6 +43,7 @@
    "label": "Description"
   },
   {
+   "columns": 2,
    "fieldname": "asset_name",
    "fieldtype": "Data",
    "in_list_view": 1,
@@ -44,15 +53,55 @@
   {
    "fieldname": "date",
    "fieldtype": "Datetime",
-   "in_list_view": 1,
    "label": "Date",
    "read_only": 1
+  },
+  {
+   "fieldname": "column_break_xezj",
+   "fieldtype": "Column Break"
+  },
+  {
+   "columns": 2,
+   "default": "Return",
+   "fieldname": "action",
+   "fieldtype": "Select",
+   "in_list_view": 1,
+   "label": "Action",
+   "options": "Return\nRecover Cost",
+   "reqd": 1
+  },
+  {
+   "fieldname": "section_break_hudu",
+   "fieldtype": "Section Break"
+  },
+  {
+   "columns": 2,
+   "fieldname": "cost",
+   "fieldtype": "Currency",
+   "in_list_view": 1,
+   "label": "Cost",
+   "mandatory_depends_on": "eval:doc.action == \"Recover Cost\"",
+   "read_only_depends_on": "eval:doc.action != \"Recover Cost\""
+  },
+  {
+   "columns": 1,
+   "fieldname": "account",
+   "fieldtype": "Link",
+   "in_list_view": 1,
+   "label": "Account",
+   "options": "Account"
+  },
+  {
+   "fieldname": "actual_cost",
+   "fieldtype": "Currency",
+   "label": "Actual Cost",
+   "read_only": 1
   }
  ],
  "index_web_pages_for_search": 1,
  "istable": 1,
  "links": [],
- "modified": "2021-07-15 15:17:31.309834",
+ "modified": "2024-04-19 13:20:41.123440",
  "modified_by": "Administrator",
  "module": "HR",
  "name": "Full and Final Asset",

hrms/hr/doctype/full_and_final_outstanding_statement/full_and_final_outstanding_statement.json

@@ -21,7 +21,7 @@
    "fieldtype": "Column Break"
   },
   {
-   "columns": 2,
+   "columns": 1,
    "default": "Unsettled",
    "fieldname": "status",
    "fieldtype": "Select",
@@ -54,8 +54,10 @@
    "reqd": 1
   },
   {
+   "columns": 1,
    "fieldname": "account",
    "fieldtype": "Link",
+   "in_list_view": 1,
    "label": "Account",
    "options": "Account"
   },
@@ -84,7 +86,7 @@
  "index_web_pages_for_search": 1,
  "istable": 1,
  "links": [],
- "modified": "2021-07-20 16:59:34.447934",
+ "modified": "2024-04-19 15:34:03.923481",
  "modified_by": "Administrator",
  "module": "HR",
  "name": "Full and Final Outstanding Statement",

hrms/hr/doctype/full_and_final_statement/full_and_final_statement.js

@@ -54,7 +54,11 @@ frappe.ui.form.on('Full and Final Statement', {
 		frm.events.get_outstanding_statements(frm);
 	},
 
-	get_outstanding_statements: function(frm) {
+	total_asset_recovery_cost: function (frm) {
+		frm.trigger("calculate_total_receivable_amt");
+	},
+
+	get_outstanding_statements: function (frm) {
 		if (frm.doc.employee) {
 			frappe.call({
 				method: "get_outstanding_statements",
@@ -66,7 +70,46 @@ frappe.ui.form.on('Full and Final Statement', {
 		}
 	},
 
-	create_journal_entry: function(frm) {
+	calculate_total_payable_amt: function (frm) {
+		let total_payable_amount = 0;
+
+		frm.doc.payables?.forEach(
+			(row) => (total_payable_amount += flt(row.amount, precision("amount", row))),
+		);
+		frm.set_value(
+			"total_payable_amount",
+			flt(total_payable_amount, precision("total_payable_amount")),
+		);
+	},
+
+	calculate_total_receivable_amt: function (frm) {
+		let total_asset_recovery_cost = 0;
+		let total_receivable_amount = 0;
+
+		frm.doc.assets_allocated?.forEach((row) => {
+			if (row.action === "Recover Cost") {
+				total_asset_recovery_cost += flt(row.cost, precision("cost", row));
+			}
+		});
+
+		frm.doc.receivables?.forEach(
+			(row) => (total_receivable_amount += flt(row.amount, precision("amount", row))),
+		);
+
+		frm.set_value(
+			"total_asset_recovery_cost",
+			flt(total_asset_recovery_cost, precision("total_asset_recovery_cost")),
+		);
+		frm.set_value(
+			"total_receivable_amount",
+			flt(
+				total_asset_recovery_cost + total_receivable_amount,
+				precision("total_receivable_amount"),
+			),
+		);
+	},
+
+	create_journal_entry: function (frm) {
 		frappe.call({
 			method: "create_journal_entry",
 			doc: frm.doc,
@@ -79,8 +122,8 @@ frappe.ui.form.on('Full and Final Statement', {
 });
 
 frappe.ui.form.on("Full and Final Outstanding Statement", {
-	reference_document: function(frm, cdt, cdn) {
-		var child = locals[cdt][cdn];
+	reference_document: function (frm, cdt, cdn) {
+		const child = locals[cdt][cdn];
 		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",
@@ -98,18 +141,20 @@ frappe.ui.form.on("Full and Final Outstanding Statement", {
 		}
 	},
 
-	amount: function(frm) {
-		var total_payable_amount = 0;
-		var total_receivable_amount = 0;
+	amount: function (frm, cdt, cdn) {
+		const child_row = locals[cdt][cdn];
+		const table = child_row.parentfield;
 
-		frm.doc.payables.forEach(element => {
-			total_payable_amount = total_payable_amount + element.amount;
-		});
+		if (table === "payables") {
+			frm.trigger("calculate_total_payable_amt");
+		} else {
+			frm.trigger("calculate_total_receivable_amt");
+		}
+	},
+});
 
-		frm.doc.receivables.forEach(element => {
-			total_receivable_amount = total_receivable_amount + element.amount;
-		});
-		frm.set_value("total_payable_amount", flt(total_payable_amount));
-		frm.set_value("total_receivable_amount", flt(total_receivable_amount));
-	}
+frappe.ui.form.on("Full and Final Asset", {
+	cost: function (frm, _cdt, _cdn) {
+		frm.trigger("calculate_total_receivable_amt");
+	},
 });

hrms/hr/doctype/full_and_final_statement/full_and_final_statement.json

@@ -23,12 +23,13 @@
   "payables",
   "section_break_10",
   "receivables",
+  "section_break_15",
+  "assets_allocated",
+  "total_asset_recovery_cost",
   "totals_section",
   "total_payable_amount",
   "column_break_21",
-  "total_receivable_amount",
-  "section_break_15",
-  "assets_allocated"
+  "total_receivable_amount"
  ],
  "fields": [
   {
@@ -176,12 +177,26 @@
    "in_list_view": 1,
    "label": "Total Receivable Amount",
    "read_only": 1
+  },
+  {
+   "fieldname": "total_asset_recovery_cost",
+   "fieldtype": "Currency",
+   "label": "Total Asset Recovery Cost",
+   "read_only": 1
   }
  ],
  "index_web_pages_for_search": 1,
  "is_submittable": 1,
- "links": [],
- "modified": "2024-01-11 18:06:22.669089",
+ "links": [
+  {
+   "is_child_table": 1,
+   "link_doctype": "Journal Entry Account",
+   "link_fieldname": "reference_name",
+   "parent_doctype": "Journal Entry",
+   "table_fieldname": "accounts"
+  }
+ ],
+ "modified": "2024-04-19 15:45:04.206575",
  "modified_by": "Administrator",
  "module": "HR",
  "name": "Full and Final Statement",
@@ -213,6 +228,7 @@
    "write": 1
   },
   {
+   "cancel": 1,
    "create": 1,
    "delete": 1,
    "email": 1,