From 6fee2172fd423dcc612fdc2b398806dab4f841f6 Mon Sep 17 00:00:00 2001
From: lazhen <17772815105@139.com>
Date: 星期四, 14 十一月 2024 15:09:08 +0800
Subject: [PATCH] Merge branch 'dev' of http://47.101.211.7:10101/r/VWED into dev-zlg

---
 _Main/BL/Type_LocalColumn/Function_CalcDisplayDate.qbl |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/_Main/BL/Type_LocalColumn/Function_CalcWeekDate.qbl b/_Main/BL/Type_LocalColumn/Function_CalcDisplayDate.qbl
similarity index 88%
rename from _Main/BL/Type_LocalColumn/Function_CalcWeekDate.qbl
rename to _Main/BL/Type_LocalColumn/Function_CalcDisplayDate.qbl
index 81bbd7f..562ceb4 100644
--- a/_Main/BL/Type_LocalColumn/Function_CalcWeekDate.qbl
+++ b/_Main/BL/Type_LocalColumn/Function_CalcDisplayDate.qbl
@@ -1,6 +1,6 @@
 Quintiq file version 2.0
 #parent: #root
-Function CalcWeekDate
+Function CalcDisplayDate
 {
   TextBody:
   [*
@@ -15,7 +15,7 @@
       us_locale := Locale::Construct( 'en_us' );
       
       date := this.CustomDate();
-      stringDate := date.Format( "Y: MM / M" + "鏈�" ,us_locale )
+      stringDate := date.Format( "MM / M" + "鏈�" ,us_locale )
       value := stringDate;
     }else{
       value := this.CustomDate().Format( "Y/M2/D2" );

--
Gitblit v1.9.3