sync SVN r18142

This commit is contained in:
2026-09-16 15:18:07 +03:00
parent 97ac068474
commit 257721aebb
5 changed files with 25 additions and 7 deletions

View File

@@ -501,7 +501,7 @@ Define Class ExtrasBanca As Custom
* Solduri facturi deschise (401/4111 + extinderile 404/461/462; 419/4091-4094 doar pentru avans existent)
If This.lFactura
lcSqlSolduri = [select i.id_part, i.cont, i.acont, i.id_fact, max(i.nract) nract, min(i.dataact) dataact, ] + ;
lcSqlSolduri = [select i.id_part, i.cont, Nvl(i.acont, ' ') acont, i.id_fact, max(i.nract) nract, min(i.dataact) dataact, ] + ;
[max(i.id_valuta) id_valuta, sum(i.precdeb+i.debit-i.preccred-i.credit) sold ] + ;
[from ireg_parteneri i where i.an = ?gnAn and i.luna = ?gnLuna ] + ;
[and i.cont in ('401','4111','419','4091','4092','4093','4094','404','461','462') ] + ;
@@ -522,7 +522,7 @@ Define Class ExtrasBanca As Custom
Index On id_part Tag id_part
Use In (Select("cSolduriBrut"))
Endif
Create Cursor cAlocTemp (nrec I, npoz I, id_fact I, nract I, cont C(4), acont C(20), suma N(15, 2), csursa C(1))
Create Cursor cAlocTemp (nrec I, npoz I, id_fact I, nract I, cont C(4) Null, acont C(20) Null, suma N(15, 2), csursa C(1))
Endif
* Caut/creez parteneri
@@ -1251,8 +1251,8 @@ Procedure AplicaAlocareFactura
lnAlocat = Min(m.tnRest, ramas)
lnIdFact = id_fact
lnNract = nract
lcCont = Alltrim(Cont)
lcAcont = acont
lcCont = Alltrim(Nvl(Cont, ''))
lcAcont = Alltrim(Nvl(acont, ''))
tnNpoz = m.tnNpoz + 1
* campurile sursa (cSolduriFact) copiate in variabile - Insert Into rezolva numele necalificate pe cursorul tinta, nu pe cel curent
Insert Into cAlocTemp (nrec, npoz, id_fact, nract, cont, acont, suma, csursa) ;
@@ -2914,8 +2914,8 @@ Define Class ExtrasBanca_General As ExtrasBanca
USE IN (SELECT('cXLSXTmp'))
UPDATE C_TMP_I SET data_v = TRANSFORM(ExcelSerialNumber2Date(INT(VAL(data_v)))) WHERE !('.'$data_v OR '/'$data_v)
UPDATE C_TMP_I SET data_t = TRANSFORM(ExcelSerialNumber2Date(INT(VAL(data_t)))) WHERE !('.'$data_v OR '/'$data_t)
UPDATE C_TMP_I SET data_v = TRANSFORM(ExcelSerialNumber2Date(INT(VAL(data_v)))) WHERE !('.'$data_v OR '/'$data_v OR '-'$data_v)
UPDATE C_TMP_I SET data_t = TRANSFORM(ExcelSerialNumber2Date(INT(VAL(data_t)))) WHERE !('.'$data_t OR '/'$data_t OR '-'$data_t)
Select C_TMP_I
Scan For !Empty(data_v)
Select c_iex