Merge branch 'adempiere:main' into feature/solop-develop/spuy

src/main/java/org/spin/report_engine/data/ColumnInfo.java

@@ -40,6 +40,7 @@ public class ColumnInfo {
 	private String mappingClassName;
 	private PrintFormatItem item;
 	private String columnName;
+	private boolean isHideGrandTotal;
 
 
 	private ColumnInfo(PrintFormatItem item) {
@@ -56,6 +57,7 @@ private ColumnInfo(PrintFormatItem item) {
 		this.color = item.getColor();
 		this.mappingClassName = item.getMappingClassName();
 		this.item = item;
+		this.isHideGrandTotal = item.isHideGrandTotal();
 	}
 
 	public static ColumnInfo newInstance(PrintFormatItem item) {
@@ -163,6 +165,15 @@ public boolean isGroupColumn() {
 		return isGroupColumn;
 	}
 
+	public final boolean isHideGrandTotal() {
+		return isHideGrandTotal;
+	}
+
+	public final ColumnInfo withHideGrandTotal(boolean isHideGrandTotal) {
+		this.isHideGrandTotal = isHideGrandTotal;
+		return this;
+	}
+
 	@Override
 	public String toString() {
 		return "ColumnInfo [color=" + color + ", style=" + style + ", code=" + code + ", title=" + title + "]";

src/main/java/org/spin/report_engine/service/Service.java

@@ -267,6 +267,7 @@ private static Report.Builder convertReport(ReportInfo reportInfo, int limit, in
 						.setDisplayType(column.getDisplayTypeId())
 						.setIsGroupColumn(column.isGroupColumn())
 						.setSequence(column.getSequence())
+						.setIsHideGrandTotal(column.isHideGrandTotal())
 						.build()
 						).collect(Collectors.toList())
 				)

src/main/proto/service/report_engine.proto

@@ -118,6 +118,7 @@ message ReportColumn {
 	bool is_fixed_width = 10;
 	string font_code = 11;
 	string column_name = 12;
+	bool is_hide_grand_total = 13;
 }
 
 message ReportRow {