From a67dc2f0b8dd2803982cfa9c6ea42b77c191d22c Mon Sep 17 00:00:00 2001
From: lihongji <3117313295@qq.com>
Date: 星期一, 11 十一月 2024 12:02:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
_Main/BL/Type_FinancialSalesReport/Method_GenerateShow.qbl | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/_Main/BL/Type_FinancialSalesReport/Method_GenerateShow.qbl b/_Main/BL/Type_FinancialSalesReport/Method_GenerateShow.qbl
index e56d045..52030a0 100644
--- a/_Main/BL/Type_FinancialSalesReport/Method_GenerateShow.qbl
+++ b/_Main/BL/Type_FinancialSalesReport/Method_GenerateShow.qbl
@@ -33,8 +33,8 @@
showrow.FinancialSalesCell( relinsert, yearcell );
}
- traverse( row, FinancialSalesCell, cell, not cell.FinancialSalesColumn().IsDay() ){
- column := selectobject( this, FinancialSalesColumn, column, column.Name() = cell.FinancialSalesColumn().Name() and not column.IsDay());
+ traverse( row, FinancialSalesCell, cell ){
+ column := selectobject( this, FinancialSalesColumn, column, column.Name() = cell.FinancialSalesColumn().Name() );
if( isnull( column ) ){
column := this.FinancialSalesColumn( relnew, Name := cell.FinancialSalesColumn().Name(), Period := cell.FinancialSalesColumn().Period() );
}
--
Gitblit v1.9.3