Index: APPS/TRANSP/impl/TransportService/Nacalculator/RapportDataFactory.cls.xml
===================================================================
diff -u -r54139 -r54149
--- APPS/TRANSP/impl/TransportService/Nacalculator/RapportDataFactory.cls.xml (.../RapportDataFactory.cls.xml) (revision 54139)
+++ APPS/TRANSP/impl/TransportService/Nacalculator/RapportDataFactory.cls.xml (.../RapportDataFactory.cls.xml) (revision 54149)
@@ -27,6 +27,9 @@
Do ..VoegToeEigenschap(KeyValueList, "OphaalTijdstip")
Do ..VoegToeEigenschap(KeyValueList, "AantalEuroPallet")
Do ..VoegToeEigenschap(KeyValueList, "AantalHalveEuroPallet")
+ Do ..VoegToeEigenschap(KeyValueList, "Palletprijs")
+ Do ..VoegToeEigenschap(KeyValueList, "LijnTotaal")
+ Do ..VoegToeEigenschap(KeyValueList, "TeBetalen")
Do ..VoegToeEigenschap(KeyValueList, "Land")
Do ..VoegToeEigenschap(KeyValueList, "LeveradresNaam")
Do ..VoegToeEigenschap(KeyValueList, "LeveradresStraat")
Index: APPS/TRANSP/dto/Nacalculatie.cls.xml
===================================================================
diff -u -r54139 -r54149
--- APPS/TRANSP/dto/Nacalculatie.cls.xml (.../Nacalculatie.cls.xml) (revision 54139)
+++ APPS/TRANSP/dto/Nacalculatie.cls.xml (.../Nacalculatie.cls.xml) (revision 54149)
@@ -54,6 +54,21 @@
%String
1
+
+
+%Double
+1
+
+
+
+%Double
+1
+
+
+
+%Double
+1
+
Index: APPS/TRANSP/impl/TransportService/Nacalculator/TransportdataVoorKlantBepaler.cls.xml
===================================================================
diff -u -r54141 -r54149
--- APPS/TRANSP/impl/TransportService/Nacalculator/TransportdataVoorKlantBepaler.cls.xml (.../TransportdataVoorKlantBepaler.cls.xml) (revision 54141)
+++ APPS/TRANSP/impl/TransportService/Nacalculator/TransportdataVoorKlantBepaler.cls.xml (.../TransportdataVoorKlantBepaler.cls.xml) (revision 54149)
@@ -44,6 +44,9 @@
Set NacalculatieDto.RitNummer = RitId
Set NacalculatieDto.Bonnummers = ..MaakBonnummerLijstje(Levering)
Set NacalculatieDto.Land = Levering.GeefAdres().GeefLand().GeefNaam()
+ Set NacalculatieDto.Palletprijs = $$$If(Levering.GeefAdres().GeefLand()=##class(DOM.common.enu.Land).Belgie(),..#PalletprijsBelgie,..#PalletprijsNederland)
+ Set NacalculatieDto.LijnTotaal = NacalculatieDto.Palletprijs * (Levering.GeefAantalEuroPalletten() + Levering.GeefAantalHalveEuroPalletten())
+ Set NacalculatieDto.TeBetalen = NacalculatieDto/2
Do Resultaat.Insert(NacalculatieDto)
}
}