Index: WS/AX/DocGen/OfferteService.cls.xml
===================================================================
diff -u -r74870 -r74902
--- WS/AX/DocGen/OfferteService.cls.xml (.../OfferteService.cls.xml) (revision 74870)
+++ WS/AX/DocGen/OfferteService.cls.xml (.../OfferteService.cls.xml) (revision 74902)
@@ -56,20 +56,20 @@
1
= $$$Datum01mei2025) && (CurrentDate < $$$Datum01juni2025) && $IsObject(OfferteData.MEMO) {
+ If (CurrentDate >= $$$Datum01mei2025) && (CurrentDate < $$$Datum01juli2025) && $IsObject(OfferteData.MEMO) {
Set MemoTekstIterator = ##class(TECH.ListIterator).%New(OfferteData.MEMO)
While (MemoTekstIterator.HasNext()) {
#dim MemoTag As BL.FOP.Basis.pxTekstHTML = MemoTekstIterator.Next()
If (MemoTag.Tag = "MEMO") { // && (MemoTag.Attributes.GetAt("type") = "PRIJS_GELDIG_BTWCLAUSULE")
- If (MemoTag.Tekst [ "Geldig 30 dagen" ) Set MemoTag.Tekst = ##class(TECH.StringUtils).Replace(MemoTag.Tekst, "Geldig 30 dagen" ,"Geldig tot en met 30/05/2025")
- If (MemoTag.Tekst [ "Valable 30 jours") Set MemoTag.Tekst = ##class(TECH.StringUtils).Replace(MemoTag.Tekst, "Valable 30 jours","Valable jusqu'au 30/05/2025")
- If (MemoTag.Tekst [ "Valid 30 days" ) Set MemoTag.Tekst = ##class(TECH.StringUtils).Replace(MemoTag.Tekst, "Valid 30 days" ,"Valid until 30/05/2025")
- If (MemoTag.Tekst [ "Gueltig 30 tage" ) Set MemoTag.Tekst = ##class(TECH.StringUtils).Replace(MemoTag.Tekst, "Gueltig 30 tage","Gueltig bis 30/05/2025")
+ If (MemoTag.Tekst [ "Geldig 30 dagen" ) Set MemoTag.Tekst = ##class(TECH.StringUtils).Replace(MemoTag.Tekst, "Geldig 30 dagen" ,"Geldig tot en met 30/06/2025")
+ If (MemoTag.Tekst [ "Valable 30 jours") Set MemoTag.Tekst = ##class(TECH.StringUtils).Replace(MemoTag.Tekst, "Valable 30 jours","Valable jusqu'au 30/06/2025")
+ If (MemoTag.Tekst [ "Valid 30 days" ) Set MemoTag.Tekst = ##class(TECH.StringUtils).Replace(MemoTag.Tekst, "Valid 30 days" ,"Valid until 30/06/2025")
+ If (MemoTag.Tekst [ "Gueltig 30 tage" ) Set MemoTag.Tekst = ##class(TECH.StringUtils).Replace(MemoTag.Tekst, "Gueltig 30 tage","Gueltig bis 30/06/2025")
}
}
}
Index: WS/AX/DocGen/ProxyDataHelper.cls.xml
===================================================================
diff -u -r74893 -r74902
--- WS/AX/DocGen/ProxyDataHelper.cls.xml (.../ProxyDataHelper.cls.xml) (revision 74893)
+++ WS/AX/DocGen/ProxyDataHelper.cls.xml (.../ProxyDataHelper.cls.xml) (revision 74902)
@@ -69,11 +69,11 @@
1
= $$$Datum01mei2025) && (CurrentDate < $$$Datum01juni2025) && $IsObject(OrderLijnen) {
+ If (CurrentDate >= $$$Datum01mei2025) && (CurrentDate < $$$Datum01juli2025) && $IsObject(OrderLijnen) {
#dim TekstLeveringenVanaf01mei As %String = ..GeefTekstLeveringenVanaf01mei(Taal)
#dim TekstLijn As BL.Flow.Proxy.pxTekstLijn = ..MaakTekstLijnLeveringenVanaf01mei($$$CRLF_TekstLeveringenVanaf01mei_$$$CRLF_$$$CRLF_"")
Do OrderLijnen.InsertAt(TekstLijn,1) ; Voeg tekstlijn VOORAAN toe