sync SVN r17991: garda valuta la nota de curs eFactura, scos SET STEP ON
xmlefactura.prg: mentiunea despre cursul valutar din textul aditional se emite doar cand documentul e chiar in valuta (in_valuta = 1). ofacturare.vcx: scos SET STEP ON neconditionat din frm_facturare.do_scrie_factura.
This commit is contained in:
@@ -14006,7 +14006,6 @@ DEFINE CLASS frm_facturare_articole AS _frmbase OF "_frm_base.vcx"
|
|||||||
pnParametruAditional = 0
|
pnParametruAditional = 0
|
||||||
llReturn = .T.
|
llReturn = .T.
|
||||||
lcListaIncasare = ''
|
lcListaIncasare = ''
|
||||||
SET STEP ON
|
|
||||||
llEproforma = (poDate.eProforma = 1)
|
llEproforma = (poDate.eProforma = 1)
|
||||||
|
|
||||||
If Inlist(poDate.ntip_incasare, 11, 2, 3) && 11 = CHITANTA, 2 = BON FISCAL, 3 = POS/Card
|
If Inlist(poDate.ntip_incasare, 11, 2, 3) && 11 = CHITANTA, 2 = BON FISCAL, 3 = POS/Card
|
||||||
|
|||||||
@@ -371,7 +371,7 @@ Define Class ExportEFactura As Custom
|
|||||||
lcTextAditional = m.lcTextAditional + Iif(!Empty(m.lcTextAditional), ' # ', '') + "Taxare inversa"
|
lcTextAditional = m.lcTextAditional + Iif(!Empty(m.lcTextAditional), ' # ', '') + "Taxare inversa"
|
||||||
ENDIF
|
ENDIF
|
||||||
|
|
||||||
IF !EMPTY(NVL(loDate.curs,0)) AND ATC('curs', m.lcTextAditional) = 0
|
IF loDate.in_valuta = 1 AND !EMPTY(NVL(loDate.curs,0)) AND ATC('curs', m.lcTextAditional) = 0
|
||||||
lcTextAditional = m.lcTextAditional + Iif(!Empty(m.lcTextAditional), ' # ', '') + "Curs: " + ALLTRIM(STR(loDate.curs, 10,4)) + " RON/" + STRTRAN(ALLTRIM(Nvl(loDate.cValuta, '')),'EURO', 'EUR',1,1,1)
|
lcTextAditional = m.lcTextAditional + Iif(!Empty(m.lcTextAditional), ' # ', '') + "Curs: " + ALLTRIM(STR(loDate.curs, 10,4)) + " RON/" + STRTRAN(ALLTRIM(Nvl(loDate.cValuta, '')),'EURO', 'EUR',1,1,1)
|
||||||
ENDIF
|
ENDIF
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user