diff --git a/Clase/oacnpro.VCT b/Clase/oacnpro.VCT index 878bf49..c36e975 100644 Binary files a/Clase/oacnpro.VCT and b/Clase/oacnpro.VCT differ diff --git a/Clase/oacnpro.vcx b/Clase/oacnpro.vcx index 6d47877..438bc42 100644 Binary files a/Clase/oacnpro.vcx and b/Clase/oacnpro.vcx differ diff --git a/Programe/ovariabile_globale.prg b/Programe/ovariabile_globale.prg index 45aebbd..367cdbe 100644 --- a/Programe/ovariabile_globale.prg +++ b/Programe/ovariabile_globale.prg @@ -1 +1,3 @@ -**OVARIABILE_GLOBALE.PRG \ No newline at end of file +**OVARIABILE_GLOBALE.PRG +PUBLIC gnProcDistPrecizie +gnProcDistPrecizie = 2 && precizie zecimale rotunjire calcul si afisare procent distanta parcursa / lungime CDMN 64.4 km \ No newline at end of file diff --git a/Programe/proceduri_acnpro.prg b/Programe/proceduri_acnpro.prg index cb8a202..5f3ec26 100644 --- a/Programe/proceduri_acnpro.prg +++ b/Programe/proceduri_acnpro.prg @@ -5743,7 +5743,7 @@ Procedure mod_calcul_tranzit Select vye_id, intern, indicativ, tarif, valuta, cant, um, procdist, corect, procdiv, valval, Curs, valftva From (m.tcTabel) Where vye_id = m.tcVyeId Order By indicativ Into Cursor cModCalculTemp Select cModCalculTemp Scan - lcModCalcul = lcModCalcul + Alltrim(Transform(tarif, GET_MASK(10, 4))) + [ ] + Allt(valuta) + [ * ] + Allt(Str(cant, 8, 2)) + [ ] + Allt(um) + [ * ] + Allt(Str(procdist, 6, 3)) + [ * ] + Allt(Str(corect + procdiv, 5, 3)) + [ = ] + Alltrim(Transform(valval, GET_MASK(16, 2))) + [ ] + Allt(valuta) + lcModCalcul = lcModCalcul + Alltrim(Transform(tarif, GET_MASK(10, 4))) + [ ] + Allt(valuta) + [ * ] + Allt(Str(cant, 8, 2)) + [ ] + Allt(um) + [ * ] + Allt(Str(procdist, 6, m.gnProcDistPrecizie)) + [ * ] + Allt(Str(corect + procdiv, 5, 3)) + [ = ] + Alltrim(Transform(valval, GET_MASK(16, 2))) + [ ] + Allt(valuta) llIntern = intern lnCurs = Curs If m.llIntern diff --git a/changelog_roaacnpro.txt b/changelog_roaacnpro.txt index 61a3d7f..eb27283 100644 --- a/changelog_roaacnpro.txt +++ b/changelog_roaacnpro.txt @@ -1,4 +1,14 @@ - + +