From 48612208b9265bf595794c81917e31f533841194 Mon Sep 17 00:00:00 2001
From: xiaoding721 <33130084+xiaoding721@users.noreply.github.com>
Date: 星期一, 28 十月 2024 17:14:24 +0800
Subject: [PATCH] Merge branch 'dev' of http://47.101.211.7:10101/r/VWED into dev

---
 _Main/BL/Type_FinancialSalesSource/Method_AfterImport.qbl |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/_Main/BL/Type_FinancialSalesSource/Method_AfterImport.qbl b/_Main/BL/Type_FinancialSalesSource/Method_AfterImport.qbl
index ba14ab4..a57f712 100644
--- a/_Main/BL/Type_FinancialSalesSource/Method_AfterImport.qbl
+++ b/_Main/BL/Type_FinancialSalesSource/Method_AfterImport.qbl
@@ -36,7 +36,7 @@
           periodname        := period.Format( "M2/D2/Y" );
           quantity          := [Real]cell.Value()
           previouscolumn    := cell.FinancialSalesColumn().PreviousColumn();
-          if( period = yearday.Date() and not isnull( previouscolumn ) and beforeyearday = cnv2.Convert( previouscolumn.Name() ) ){
+          if( period = yearday.Date() and not isnull( previouscolumn ) and cnv2.CanConvert( previouscolumn.Name() )  and beforeyearday = cnv2.Convert( previouscolumn.Name() ) ){
             previouscell    := selectobject( row, FinancialSalesCell, previouscell, previouscell.FinancialSalesColumn() = previouscolumn );
             quantity        := [Real]cell.Value() + [Real]previouscell.Value();
           }

--
Gitblit v1.9.3