From ca8e7ca694067feea0a4f17160526ceaf87d22db Mon Sep 17 00:00:00 2001 From: Marius Mutu Date: Tue, 29 Sep 2026 11:22:33 +0300 Subject: [PATCH] sync SVN r18221 --- clase/baza.vc2 | 3 ++- programe/coada_contabilizare_ef.prg | 7 ++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/clase/baza.vc2 b/clase/baza.vc2 index ffe3161..2dd5339 100644 --- a/clase/baza.vc2 +++ b/clase/baza.vc2 @@ -10155,7 +10155,8 @@ DEFINE CLASS item AS container Endif If !(Empty(F) Or Empty(C) Or Empty(T) Or Inlist(F,'vnom_parteneri','vnom_gestiuni','vlucrari_validat','vcontracte','vnom_responsabili','vcrm_politici_preturi')) - pcselect = ['select ] + C + [,] + lcIdFis + [ from ] + F + [ where 2=2'] + *!* id intern al valutei, nu ISO + pcselect = ['select ] + C + [,] + Iif(F == 'vnom_valute' And Lower(lcIdFis) == 'id_valuta2', [id_valuta3 as id_valuta2], lcIdFis) + [ from ] + F + [ where 2=2'] pcfiltru = [1=2] pcschema = [''] pcorder = C diff --git a/programe/coada_contabilizare_ef.prg b/programe/coada_contabilizare_ef.prg index 47a352b..b893d47 100644 --- a/programe/coada_contabilizare_ef.prg +++ b/programe/coada_contabilizare_ef.prg @@ -107,8 +107,8 @@ DEFINE CLASS CoadaContabilizareEF AS Custom RETURN '' ENDPROC - *!* Numarul de document dedus din numarul eFacturii: primul grup de cifre de la dreapta - *!* ('ZZT-A1-C' -> 1, 'F1234' -> 1234, 'FACTURA' -> 0). 0 inseamna ca nu s-a putut deduce. + *!* Numarul de document dedus din numarul eFacturii: ultimele 12 cifre din primul grup de cifre + *!* de la dreapta ('ZZT-A1-C' -> 1, 'F1234' -> 1234, 'FACTURA' -> 0). 0 inseamna ca nu s-a putut deduce. PROCEDURE NrActDinNumarAct LPARAMETERS tcNumarAct @@ -126,7 +126,8 @@ DEFINE CLASS CoadaContabilizareEF AS Custom ENDIF ENDIF ENDFOR - RETURN INT(VAL(RIGHT(m.lcCifre, 14))) + *!* ultimele 12 cifre, cat se afiseaza in ROA + RETURN INT(VAL(RIGHT(m.lcCifre, 12))) ENDPROC *!* Textul lipsurilor facturii al carei cursor de linii e deschis (tcAliasDetalii), calculat