nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-13 10:11:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: resolve conflict

Browse Source
This commit is contained in:
ruthra kumar
2024-11-29 10:43:36 +05:30
parent 633be8d06b
commit 48d6fcaab8
1 changed files with 0 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
erpnext/public/js/financial_statements.js
View File

@@ -28,13 +28,10 @@ erpnext.financial_statements = {
return value; return value;
} else if (frappe.query_report.get_filter_value("selected_view") == "Margin" && data) { } else if (frappe.query_report.get_filter_value("selected_view") == "Margin" && data) {
<<<<<<< HEAD
=======
if (column.fieldname == "stub" && data.account_name == __("Income")) { if (column.fieldname == "stub" && data.account_name == __("Income")) {
//Taking the total income from each column (for all the financial years) as the base (100%) //Taking the total income from each column (for all the financial years) as the base (100%)
this.baseData = row; this.baseData = row;
} }
>>>>>>> b94af28587 (fix: link cash flow rows and fix summary linking)
if (column.colIndex >= 2) { if (column.colIndex >= 2) {
const marginPercent = data[column.fieldname]; const marginPercent = data[column.fieldname];