From ee36dfc028d4f24711b90fb88d4e2c54c869d40e Mon Sep 17 00:00:00 2001 From: Marius Mutu Date: Sat, 25 Jul 2026 10:09:01 +0300 Subject: [PATCH] Achizitie din import: secundara debifata de la participa_valuta nu mai incarca pretul in lei Debifat = exclus complet din pretul articolului (lei si valuta); procent_lei ramane 100 pe import, diferenta e absorbita de randul D (recalc_diferente). Procentele afisate pe randurile neparticipante raman goale. Test nou pe fluxul real: test_secundara_debifata_pret (15/15 PASS); regresie curata (test_valuta_dvi_usd 22/22, test_debifare_invaluta 68/68, scenariu complet PASS). Co-Authored-By: Claude Fable 5 Claude-Session: https://claude.ai/code/session_01KXsyJZBek1e9RvyLAQkoCx --- clase/ointroduceri.vc2 | 24 +- .../test_secundara_debifata_pret.prg | 779 ++++++++++++++++++ .../test_secundara_debifata_pret.ps1 | 12 + 3 files changed, 804 insertions(+), 11 deletions(-) create mode 100644 utile/Teste/achizitie_import/test_secundara_debifata_pret.prg create mode 100644 utile/Teste/achizitie_import/test_secundara_debifata_pret.ps1 diff --git a/clase/ointroduceri.vc2 b/clase/ointroduceri.vc2 index aca3a4d..2884be7 100644 --- a/clase/ointroduceri.vc2 +++ b/clase/ointroduceri.vc2 @@ -11207,11 +11207,11 @@ DEFINE CLASS import_nota AS frm_termin_renunt OF "_frm_child.vcx" *!* direct. 16.07.2026b claude (C4 - corectii T2): pe import, procent_lei NU mai e *!* 100*baza_totala/baza_principala (ar dubla incarcarea documentelor de transport in *!* valuta - do_reface aplica intai procent_val pe pretd, apoi procent_lei pe pret derivat - *!* din pretd*curs) - procent_lei pe import = 100 + contributia DOAR a documentelor - *!* care NU participa la pretul in valuta (restul intra in procent_val). Ramura intern + *!* din pretd*curs) - procent_lei pe import = 100; documentele neparticipante NU mai + *!* incarca pretul, raman pe randul D (recalc_diferente). Ramura intern *!* ramane neschimbata (echivalenta cu vechiul calcul din do_executa). Local lnBazaLei, lnBazaVal, lnBazaVal2, lnTvaLei, lnTvaVal, lnTvaVal2, lcSel - Local lnMinNrDoc, lnBazaPrincipalaLei, lnBazaPrincipalaVal, lnBazaLeiOnly, lnBazaValBased + Local lnMinNrDoc, lnBazaPrincipalaLei, lnBazaPrincipalaVal lcSel = Select() If !Used('introdc') Select (lcSel) @@ -11247,11 +11247,8 @@ DEFINE CLASS import_nota AS frm_termin_renunt OF "_frm_child.vcx" If This.lIntern This.procent_lei = Iif(lnBazaPrincipalaLei <> 0, 100 * lnBazaLei / lnBazaPrincipalaLei, 100) Else - *!* C4b: documentele cu participa_valuta (si cele platite in lei, convertite la curs in - *!* nbaza_val) sunt acoperite de procent_val - in procent_lei raman doar neparticipantele - Sum suma For Inlist(tip_rand,'B','S') And !participa_valuta And !Inlist(scd,'4426','4428') And !Empty(id_jtva_coloana) To lnBazaLeiOnly - Sum suma For Inlist(tip_rand,'B','S') And participa_valuta And !Inlist(scd,'4426','4428') And !Empty(id_jtva_coloana) To lnBazaValBased - This.procent_lei = 100 + Iif(lnBazaValBased <> 0, 100 * lnBazaLeiOnly / lnBazaValBased, 0) + *!* 25.07.2026 claude - debifat participa_valuta = exclus complet din pret; diferenta merge pe randul D + This.procent_lei = 100 Endif This.procent_val = Iif(lnBazaPrincipalaVal <> 0, 100 * lnBazaVal / lnBazaPrincipalaVal, 100) Select (lcSel) @@ -11709,9 +11706,14 @@ DEFINE CLASS import_nota AS frm_termin_renunt OF "_frm_child.vcx" Replace explicatia4 With '100.00' Replace explicatia5 With Iif(in_valuta = 1 Or participa_valuta, '100.00', '') Else - Replace explicatia4 With Iif(This.nbazaprincipala_lei <> 0, Allt(Str(suma/This.nbazaprincipala_lei*100,6,2)), '') - lnValRandProc = Iif(in_valuta = 1 And Nvl(id_valuta,0) = Nvl(This.oact.id_valuta,0), suma_val, Round(suma/This.oact.Curs, gnPval)) - Replace explicatia5 With Iif(This.nbazaprincipala_val <> 0, Allt(Str(lnValRandProc/This.nbazaprincipala_val*100,6,2)), '') + If !This.lIntern And !participa_valuta + Replace explicatia4 With '' + Replace explicatia5 With '' + Else + Replace explicatia4 With Iif(This.nbazaprincipala_lei <> 0, Allt(Str(suma/This.nbazaprincipala_lei*100,6,2)), '') + lnValRandProc = Iif(in_valuta = 1 And Nvl(id_valuta,0) = Nvl(This.oact.id_valuta,0), suma_val, Round(suma/This.oact.Curs, gnPval)) + Replace explicatia5 With Iif(This.nbazaprincipala_val <> 0, Allt(Str(lnValRandProc/This.nbazaprincipala_val*100,6,2)), '') + Endif Endif Endscan Endif diff --git a/utile/Teste/achizitie_import/test_secundara_debifata_pret.prg b/utile/Teste/achizitie_import/test_secundara_debifata_pret.prg new file mode 100644 index 0000000..7d40dbd --- /dev/null +++ b/utile/Teste/achizitie_import/test_secundara_debifata_pret.prg @@ -0,0 +1,779 @@ +* test_secundara_debifata_pret.prg +* Scenariu raportat de Marius (runda9, COMUN\clase\ointroduceri.vcx, clasa import_nota): +* document secundar FARA valuta (in_valuta=0) care participa la pretul in valuta si apoi +* e DEBIFAT ("Participa la pret valuta") nu mai trebuie sa incarce pretul articolelor - +* diferenta se muta pe randul D (recalc_diferente), procent_lei ramane 100 pe import. +* Doc1 (principal) FACTURA 15100 RAJA, 1000 EUR curs 5.2300 (5230 lei), in_valuta, +* participa la pret, TVA normal ('F') autocalculata din sablon (21%). +* Doc2 (secundar) DVI 201 BIROUL VAMAL, 523 lei, FARA valuta (in_valuta=0), adaugat cu +* "Participa la pret valuta" BIFAT (implicit la adaugare), apoi DEBIFAT prin grid +* (Grid1.cParticipaValuta.check1) - sincronizare amanata (lSyncPending/tmrSync). +* Articol: A8/371 (mock_cauta_nom_articole, cont 371), cantitate 1, pret_val 1000 (1000 EUR). +* +* Asteptat DUPA debifare (procent_lei=100 pe import - runda9, secundara neparticipanta +* exclusa complet din pret, diferenta pe randul D): +* rul_temp.pretd = 1000.00 (pretul valuta NU include cei 523 lei ai secundarei) +* rul_temp.pret = 5230.00 (pretul lei NU mai include cei 523 lei) +* goObj.procent_lei = 100, goObj.procent_val = 100 +* rand D (diferenta) cu suma = 523.00, cont dominant clasa 3 = 371 (scd D = 607) +* explicatia4/explicatia5 goale pe randul secundarei (371, doc2) +* valideaza_sume() = .T., cmesajsync gol +* +* Rulare (headless, fara IDE): +* $p = Start-Process 'C:\Program Files (x86)\Microsoft Visual FoxPro 9\vfp9.exe' ` +* -ArgumentList '-A','-T','"D:\ROA\ROAGEST\COMUN\utile\Teste\achizitie_import\test_secundara_debifata_pret.prg"' -PassThru +* $p.WaitForExit(120000); if (!$p.HasExited) { $p.Kill() } +* sau prin wrapper (harness UI generic, cu screenshot-uri): +* powershell -ExecutionPolicy Bypass -File test_secundara_debifata_pret.ps1 +* Log: test_secundara_debifata_pret_log.txt + +SET SAFETY OFF +SET TALK OFF +SET DELETED ON +SET EXACT ON +SET CENTURY ON +SET DATE DMY +SET DECIMALS TO 4 +SET NULLDISPLAY TO '' +CLOSE DATABASES + +PUBLIC gcUILog, gcSyncDir +gcUILog = "D:\ROA\ROAGEST\COMUN\utile\Teste\achizitie_import\test_secundara_debifata_pret_log.txt" +gcSyncDir = "D:\ROA\ROAGEST\COMUN\utile\Teste\achizitie_import\uisync_secundara_debifata\" +STRTOFILE("START " + TTOC(DATETIME()) + CHR(13)+CHR(10), gcUILog) + +ON ERROR DO DcErr WITH ERROR(), MESSAGE(), PROGRAM(), LINENO() +ON SHUTDOWN QUIT + +TRY + LOCAL gcAppPath, lcPath + gcAppPath = "D:\ROA\ROAGEST\" + SET DEFAULT TO (gcAppPath) + + lcPath = gcAppPath + 'Date;' + gcAppPath + 'Include;' + gcAppPath + 'FERESTRE;' + ; + gcAppPath + 'GRAFICE;' + gcAppPath + 'CLASE;' + gcAppPath + 'MENIURI;' + ; + gcAppPath + 'PROGRAME;' + gcAppPath + 'RAPOARTE;' + gcAppPath + 'COMUN;' + ; + gcAppPath + 'COMUN\CLASE;' + gcAppPath + 'COMUN\FERESTRE;' + gcAppPath + 'COMUN\PROGRAME;' + ; + gcAppPath + 'COMUN\GRAFICE;' + gcAppPath + 'COMUN\RAPOARTE;' + gcAppPath + 'COMUN\MENIURI;' + ; + gcAppPath + 'COMUN\UTILE\GRIDEXTRAS;' + gcAppPath + 'COMUN\UTILE\CTL32;' + ; + gcAppPath + 'COMUN\UTILE\HPDF;' + gcAppPath + 'COMUN\UTILE\HPDF\REPORTOUTPUT;' + ; + gcAppPath + 'COMUN\UTILE\WEB;' + gcAppPath + 'COMUN\UTILE\EXCEL;' + ; + ADDBS(SUBSTR(gcAppPath,1,RAT([\],gcAppPath,2)))+[COMUNROA\] + SET PATH TO &lcPath ADDITIVE + DO DcLog WITH 'SET PATH OK' + + *----- CLASE ----- + SET CLASSLIB TO (gcAppPath + "comun\clase\appwiz") ADDITIVE + SET CLASSLIB TO GESTIUNI ADDITIVE + SET CLASSLIB TO CAUT ADDITIVE + SET CLASSLIB TO BAZA ADDITIVE + SET CLASSLIB TO comun ADDITIVE + SET CLASSLIB TO accessibility.vcx ADDITIVE + SET CLASSLIB TO messagebox ADDITIVE + SET CLASSLIB TO registry ADDITIVE + SET CLASSLIB TO cauta_alfa_forms.vcx ADDITIVE + SET CLASSLIB TO DECABAZA ADDITIVE + SET CLASSLIB TO onomenclatoare ADDITIVE + SET CLASSLIB TO stocuri.vcx ADDITIVE + SET CLASSLIB TO rulaje.vcx ADDITIVE + SET CLASSLIB TO ointroduceri ADDITIVE + SET CLASSLIB TO ointroduceri_web ADDITIVE + SET CLASSLIB TO ointroduceri_depozit ADDITIVE + SET CLASSLIB TO overificari ADDITIVE + SET CLASSLIB TO ferestre_oracle ADDITIVE + SET CLASSLIB TO ferestre_cere_date.vcx ADDITIVE + SET CLASSLIB TO configurare.vcx ADDITIVE + SET CLASSLIB TO serii_numere.vcx ADDITIVE + SET CLASSLIB TO omodificari.vcx ADDITIVE + SET CLASSLIB TO ocompensari.vcx ADDITIVE + SET CLASSLIB TO caut_ora ADDITIVE + SET CLASSLIB TO onote_contabile ADDITIVE + SET CLASSLIB TO otoolbar ADDITIVE + SET CLASSLIB TO bon_fisc ADDITIVE + SET CLASSLIB TO onom_articole ADDITIVE + SET CLASSLIB TO onom_retete ADDITIVE + SET CLASSLIB TO orapoarte ADDITIVE + SET CLASSLIB TO orapoarte_gestiuni ADDITIVE + SET CLASSLIB TO orapoarte_parametri ADDITIVE + SET CLASSLIB TO ONOM_CURS ADDITIVE + SET CLASSLIB TO ctl32_statusbar_fals.vcx ADDITIVE + SET CLASSLIB TO ctl32_common.vcx ADDITIVE + SET CLASSLIB TO ctl32_structs.vcx ADDITIVE + SET CLASSLIB TO ctl32_progressbar.vcx ADDITIVE + SET CLASSLIB TO ctl32_balloontip.vcx ADDITIVE + SET CLASSLIB TO ocriterii.vcx ADDITIVE + SET CLASSLIB TO oavize.vcx ADDITIVE + SET CLASSLIB TO onomenclatoare2 ADDITIVE + SET CLASSLIB TO wwdialogs.vcx ADDITIVE + SET CLASSLIB TO oimportxml.vcx ADDITIVE + SET CLASSLIB TO excelxml.vcx ADDITIVE + SET CLASSLIB TO orapoarte_obinv.vcx ADDITIVE + DO DcLog WITH 'SET CLASSLIB OK' + + *----- PROCEDURI (mock-uri PRIMELE, ui_harness la final) ----- + SET PROCEDURE TO PROCEDURI + SET PROCEDURE TO "D:\ROA\ROAGEST\COMUN\utile\Teste\mock_amessagebox.prg" ADDITIVE + SET PROCEDURE TO "D:\ROA\ROAGEST\COMUN\utile\Teste\mock_cauta_nom_articole.prg" ADDITIVE + SET PROCEDURE TO "D:\ROA\ROAGEST\COMUN\utile\Teste\achizitie_import\mock_caut_valuta.prg" ADDITIVE + SET PROCEDURE TO acces_meniu ADDITIVE + SET PROCEDURE TO cauta_alfa ADDITIVE + SET PROCEDURE TO pmenu ADDITIVE + SET PROCEDURE TO proceduri_comune ADDITIVE + SET PROCEDURE TO quitapp ADDITIVE + SET PROCEDURE TO init_program ADDITIVE + SET PROCEDURE TO oproceduri_listari.prg ADDITIVE + SET PROCEDURE TO oproceduri_configurare.prg ADDITIVE + SET PROCEDURE TO oproceduri_articole.prg ADDITIVE + SET PROCEDURE TO oproceduri_retete.prg ADDITIVE + SET PROCEDURE TO orapoarte.prg ADDITIVE + SET PROCEDURE TO mesaje ADDITIVE + SET PROCEDURE TO oserii_numere.prg ADDITIVE + SET PROCEDURE TO oexport.prg ADDITIVE + SET PROCEDURE TO wwConfig.prg ADDITIVE + SET PROCEDURE TO proceduri_rapoarte.prg ADDITIVE + SET PROCEDURE TO OPROCEDURI_CURS.PRG ADDITIVE + SET PROCEDURE TO validare.prg ADDITIVE + SET PROCEDURE TO GENCURSOR.PRG ADDITIVE + SET PROCEDURE TO OPROCEDURI_COMUNE.PRG ADDITIVE + SET PROCEDURE TO OINIT_OPTIUNI.PRG ADDITIVE + SET PROCEDURE TO updateserver.prg ADDITIVE + SET PROCEDURE TO oinainte_de.prg ADDITIVE + SET PROCEDURE TO ooperatii_comune.prg ADDITIVE + SET PROCEDURE TO Ocompensari.PRG ADDITIVE + SET PROCEDURE TO OPROCEDURI_aMS.PRG ADDITIVE + SET PROCEDURE TO oproceduri_rulaje ADDITIVE + SET PROCEDURE TO oproceduri_stocuri ADDITIVE + SET PROCEDURE TO OINTRODUCERI ADDITIVE + SET PROCEDURE TO oHeader.prg ADDITIVE + SET PROCEDURE TO proceduri_excel.PRG ADDITIVE + SET PROCEDURE TO onomenclatoare.PRG ADDITIVE + SET PROCEDURE TO osecurity ADDITIVE + SET PROCEDURE TO ocautare ADDITIVE + SET PROCEDURE TO orefaceri ADDITIVE + SET PROCEDURE TO ofacturare_comun.PRG ADDITIVE + SET PROCEDURE TO ofacturare_stoc.PRG ADDITIVE + SET PROCEDURE TO oproceduri_casademarcat ADDITIVE + SET PROCEDURE TO oproceduri_casa_marcat_e500 ADDITIVE + SET PROCEDURE TO oproceduri_casa_marcat_mp500 ADDITIVE + SET PROCEDURE TO oproceduri_util.prg ADDITIVE + SET PROCEDURE TO wwxmlhttp.prg ADDITIVE + SET PROCEDURE TO ini.prg ADDITIVE + SET PROCEDURE TO odocumente.prg ADDITIVE + SET PROCEDURE TO regex.prg ADDITIVE + SET PROCEDURE TO wwutils.prg ADDITIVE + SET PROCEDURE TO inchidere_k ADDITIVE + SET PROCEDURE TO iniacces.prg ADDITIVE + SET PROCEDURE TO oupdate.prg ADDITIVE + SET PROCEDURE TO procese.prg ADDITIVE + SET PROCEDURE TO version.prg ADDITIVE + SET PROCEDURE TO xmlaccess.prg ADDITIVE + SET PROCEDURE TO xmlparser.prg ADDITIVE + SET PROCEDURE TO filebringer.prg ADDITIVE + SET PROCEDURE TO wwcodeupdate.prg ADDITIVE + SET PROCEDURE TO wwhttp.prg ADDITIVE + SET PROCEDURE TO xdate.prg ADDITIVE + SET PROCEDURE TO ofacturare.prg ADDITIVE + SET PROCEDURE TO oproceduri_obinv.prg ADDITIVE + SET PROCEDURE TO oproceduri_facturare.prg ADDITIVE + SET PROCEDURE TO email.prg ADDITIVE + SET PROCEDURE TO "D:\ROA\ROAGEST\COMUN\utile\Teste\ui_harness.prg" ADDITIVE + DO DcLog WITH 'SET PROCEDURE OK' + + *----- goMockValuta: rezultatul FIX al caut_valuta mock (implicit EUR - vezi test_valuta_dvi_usd) ----- + PUBLIC goMockValuta + goMockValuta = CREATEOBJECT('Custom') + goMockValuta.AddProperty('id_valuta', 978) + goMockValuta.AddProperty('nume_val', 'EUR') + + *----- Globale ----- + PUBLIC gnPc, gnPval, gnPcant, gnPpret, gnPPretval, gnPCurs, gnPVal, gnPPretV, gnPPretVal + STORE 2 TO gnPc, gnPval, gnPVal + gnPcant = 3 + STORE 4 TO gnPpret, gnPPretval, gnPPretVal, gnPPretV, gnPCurs + PUBLIC gl406, gcS, gnAn, gnLuna, gnIdFirma, gnIdSucursala, gcAcces, gcFirma + gl406 = .T. + gcS = 'CONTAFIN' + gnAn = YEAR(DATE()) + gnLuna = MONTH(DATE()) + gnIdFirma = 110 + gnIdSucursala = 110 + gcAcces = "1;2;3;4;5;6;7;8;" + gcFirma = gcS + PUBLIC nror(65000) + + PUBLIC gnButon + STORE 2 TO gnButon + PUBLIC gcMockArtCodmat, gcMockAcontCrt + gcMockArtCodmat = '' + gcMockAcontCrt = '' + PUBLIC gnMockRaspuns + gnMockRaspuns = 6 + + PUBLIC goExecutor, goApp + goExecutor = CREATEOBJECT('dummyexecutor') + goApp = CREATEOBJECT('dummyapp') + + *----- poAct: antetul notei (moneda principala EUR, curs 5.23); dialogul mosteneste din el la Init ----- + PUBLIC poAct + poAct = CREATEOBJECT('Custom') + poAct.AddProperty('nume_val', 'EUR') + poAct.AddProperty('curs', 5.23) + poAct.AddProperty('proc_tva', 1.21) + poAct.AddProperty('nnir', 0) + poAct.AddProperty('id_valuta', 978) + poAct.AddProperty('id_fdoc', 1) + poAct.AddProperty('fdoc', 'Factura') + poAct.AddProperty('id_partc', 601) + poAct.AddProperty('partc', 'RAJA') + poAct.AddProperty('serie_act', '') + poAct.AddProperty('dataact', DATE()) + poAct.AddProperty('tva_incasare', 0) + poAct.AddProperty('id_set', 1) + poAct.AddProperty('id_gestin', 1) + + *----- jtva_coloane2 / saft_taxtable: perechi reale 21% (Oracle dev, vjtva_coloane) ----- + IF USED('jtva_coloane2') + USE IN ('jtva_coloane2') + ENDIF + CREATE CURSOR jtva_coloane2 (ordine N(8), id_jtva_coloana N(14), denumire C(100), ; + jc N(1), jv N(1), afisat N(1), coloana_jc C(20), coloana_jv C(20), cota_tva N(6,2), id_tva N(14)) + INSERT INTO jtva_coloane2 VALUES (0, 0, '', 0, 0, 1, '', '', 0, 0) + INSERT INTO jtva_coloane2 VALUES (1, 208, 'ACH. INT. 21%', 1, 0, 1, 'RO21B', 'RO21T', 21, 209) + INSERT INTO jtva_coloane2 VALUES (2, 209, 'TVA ACH. INT. 21%', 1, 0, 1, 'RO21T', '', 21, 0) + INSERT INTO jtva_coloane2 VALUES (3, 220, 'ACH. IMP. 21%', 1, 0, 1, 'FO21B', 'FO21T', 21, 221) + INSERT INTO jtva_coloane2 VALUES (4, 221, 'TVA ACH. IMP. 21%', 1, 0, 1, 'FO21T', '', 21, 0) + + IF USED('saft_taxtable') + USE IN ('saft_taxtable') + ENDIF + CREATE CURSOR saft_taxtable (taxname C(250) NULL, typename C(250) NULL, taxcode N(6) NULL, ; + taxtype N(3) NULL, descriere C(250) NULL, tip C(100) NULL, descriere_tip C(250) NULL, ; + procent_taxa N(7,2) NULL, procent_prorata N(7,2) NULL, inactiv N(1) NULL, tva N(1) NULL, ; + wht N(1) NULL, tva_achizitii N(1) NULL, tva_livrari N(1) NULL) + INDEX ON taxcode TAG taxcode + INSERT INTO saft_taxtable (taxname, taxcode, descriere, procent_taxa, tva, wht, tva_achizitii, tva_livrari) ; + VALUES ('', 0, '', 0, 1, 1, 1, 1) + INSERT INTO saft_taxtable (taxname, taxcode, descriere, procent_taxa, tva, wht, tva_achizitii, tva_livrari) ; + VALUES ('301104-Achizitii de bunuri si servicii taxabile cu cota de 21%, altele decat importurile si cele supuse masurilor de simplificare', 301104, '', 21, 1, 0, 1, 0) + INSERT INTO saft_taxtable (taxname, taxcode, descriere, procent_taxa, tva, wht, tva_achizitii, tva_livrari) ; + VALUES ('301204-Import de bunuri cota 21%', 301204, '', 21, 1, 0, 1, 0) + + DO CreeazaIntrodc WITH 'introdc' + DO CreeazaIntrodc WITH 'introdc_sablon' + INSERT INTO introdc_sablon (scd, scc, cu_tva, ordine, id_set, participa_valuta, tip_rand, ; + id_jtva_coloana, ptva, explicatie_tva) ; + VALUES ('371', '401', 1, 1, 1, .T., 'B', 208, 21, 'ACH. INT. 21%') + INSERT INTO introdc_sablon (scd, scc, cu_tva, ordine, id_set, participa_valuta, tip_rand, ; + id_jtva_coloana, ptva, explicatie_tva) ; + VALUES ('4426', '401', 1, 2, 1, .T., 'T', 209, 21, 'TVA ACH. INT. 21%') + GO TOP IN introdc_sablon + + DO CreeazaRulTemp + INSERT INTO rul_temp (denumire, codmat, cant, pret, pret_lei, cont, cota_tva) ; + VALUES ('PLACEHOLDER', 'PH', 1, 1, 1, '371', 21) + + *-- F1 (ointroduceri.prg): index ord_doc INAINTE de CREATEOBJECT - vezi docs/testare-ui-vfp.md capcana p. + SELECT introdc + INDEX ON Str(Nvl(nr_doc,0),8) + Icase(tip_rand='B','1', tip_rand='S','2', tip_rand='T','3', tip_rand='D','4', '5') + Padr(Nvl(scd,''),10) TAG ord_doc + SET ORDER TO ord_doc + + DO DcLog WITH 'cursoare pregatite, CREATEOBJECT(import_nota, .F.) - lIntern=.F. (import)' + PUBLIC goObj + goObj = CREATEOBJECT('IMPORT_nota', .F.) + IF VARTYPE(goObj) <> 'O' + DO DcLog WITH 'FAIL: instantiere import_nota' + DO HarnessDone WITH 'done-error' + QUIT + ENDIF + goObj.lDialogAratat = .T. + goObj.oact = poAct + goObj.WindowType = 0 + goObj.Visible = .T. + goObj.Show() + goObj.WindowState = 2 + DOEVENTS FORCE + + SELECT rul_temp + ZAP + goObj.gridart.Refresh() + DOEVENTS FORCE + + *========================= DOC 1 (principal, FACTURA EUR), DOC 2 (secundar, DVI 523 lei fara valuta) ========================= + PUBLIC goDlg, goT + DO AdaugaDoc1 + DO VerificaPereche WITH 15100, 5230, 1000, 'EUR' + DO AdaugaDoc2 + DO VerificaPereche WITH 201, 523, 0, '' + + DO DcLog WITH 'dump introdc dupa cele 2 documente (inainte de articol):' + DO DumpIntrodc + + DO HarnessStep WITH 0, 'dupa 2 documente: introdc=' + TRANSFORM(RECCOUNT_ACTIVE('introdc')) + ' randuri' + + *========================= ARTICOL (flux real do_adauga_articol) - A8/371 ========================= + gcMockArtCodmat = 'ART-A8-371' + gcMockAcontCrt = '4' + TRY + goObj.do_adauga_articol() + CATCH TO loExcA1 + DO DcLog WITH 'EROARE do_adauga_articol (A8/371) ' + TRANSFORM(loExcA1.ErrorNo) + ' [' + loExcA1.Message + '] in ' + loExcA1.Procedure + ':' + TRANSFORM(loExcA1.LineNo) + ENDTRY + DOEVENTS FORCE + SELECT rul_temp + LOCATE FOR ALLTRIM(codmat) == 'ART-A8-371' + IF FOUND() + REPLACE cant WITH 1, pret_val WITH 1000, pretd WITH 1000, pret WITH ROUND(1000*5.23,4), pret_lei WITH ROUND(1000*5.23,4) + DO DcLog WITH 'articol (371) adaugat, cant/pret completate (1000 EUR / ' + TRANSFORM(ROUND(1000*5.23,4)) + ' lei)' + ELSE + DO DcLog WITH 'FAIL: articolul nu a fost adaugat de do_adauga_articol()' + ENDIF + goObj.gridart.Refresh() + DOEVENTS FORCE + + DO HarnessStep WITH 1, 'dupa adaugare articol, rul_temp=' + TRANSFORM(RECCOUNT_ACTIVE('rul_temp')) + + *========================= SINCRONIZARE (secundara INCA bifata "participa la pret valuta") ========================= + LOCAL llEroareSync + llEroareSync = .F. + TRY + goObj.sincronizeaza() + CATCH TO loExcS1 + llEroareSync = .T. + DO DcLog WITH 'EROARE la sincronizeaza() ' + TRANSFORM(loExcS1.ErrorNo) + ' [' + loExcS1.Message + '] in ' + loExcS1.Procedure + ':' + TRANSFORM(loExcS1.LineNo) + ' (' + loExcS1.LineContents + ')' + ENDTRY + DOEVENTS FORCE + goObj.grid1.Refresh() + IF !llEroareSync + DO DcLog WITH 'PASS sincronizare initiala: sincronizeaza() fara eroare' + ELSE + DO DcLog WITH 'FAIL sincronizare initiala: sincronizeaza() a aruncat eroare' + ENDIF + DO DcLog WITH 'dump introdc dupa sincronizare initiala (secundara bifata):' + DO DumpIntrodc + DO DcLog WITH 'INFO (bifat): goObj.procent_val=' + TRANSFORM(goObj.procent_val) + ' goObj.nbaza_val=' + TRANSFORM(goObj.nbaza_val) + ' goObj.procent_lei=' + TRANSFORM(goObj.procent_lei) + + DO HarnessStep WITH 2, 'dupa sincronizare (secundara bifata), introdc=' + TRANSFORM(RECCOUNT_ACTIVE('introdc')) + ' randuri' + + *========================= DEBIFARE "Participa la pret valuta" pe randul secundarei (371, doc 201) ========================= + PRIVATE pnAsserts, pnPass + STORE 0 TO pnAsserts, pnPass + + SELECT introdc + LOCATE FOR nract == 201 AND ALLTRIM(scd) == '371' AND INLIST(tip_rand,'B','S') + DO Assert3 WITH 'D0-rand secundara (371) doc 201 gasit', IIF(FOUND(),1,0), 1 + IF FOUND() + DO DcLog WITH 'pozitionat pe randul secundarei (nract=201), participa_valuta INAINTE=' + TRANSFORM(introdc.participa_valuta) + + goObj.grid1.cParticipaValuta.check1.Value = 0 + goObj.grid1.cParticipaValuta.check1.Valid() + + *-- sincronizarea trebuie doar ARMATA imediat dupa Valid (pre-DOEVENTS) + DO Assert3 WITH 'D1-armare lSyncPending=.T. dupa Valid (pre-DOEVENTS)', IIF(goObj.lSyncPending,1,0), 1 + DO Assert3 WITH 'D2-armare tmrSync.Interval>0 dupa Valid (pre-DOEVENTS)', IIF(goObj.tmrSync.Interval>0,1,0), 1 + + DOEVENTS FORCE + + DO Assert3 WITH 'D3-sync consumat lSyncPending=.F. dupa DOEVENTS', IIF(goObj.lSyncPending,1,0), 0 + DO Assert3 WITH 'D4-sync consumat tmrSync.Interval=0 dupa DOEVENTS', goObj.tmrSync.Interval, 0 + ELSE + pnAsserts = pnAsserts + 4 + DO DcLog WITH ' FAIL D1-D4: nu exista randul secundarei (371) pe doc 201, sar peste debifare' + ENDIF + + DO DcLog WITH 'dump introdc dupa debifare participa_valuta (doc 201):' + DO DumpIntrodc + + DO HarnessStep WITH 3, 'debifare: ' + TRANSFORM(pnPass) + '/' + TRANSFORM(pnAsserts) + ' PASS' + + *========================= ASSERT-URI FINALE (comportament NOU dupa runda9: procent_lei=100 pe import) ========================= + DO DcLog WITH 'goObj.procent_lei=' + TRANSFORM(goObj.procent_lei) + ' goObj.procent_val=' + TRANSFORM(goObj.procent_val) + DO Assert3 WITH '1-procent_lei (astept 100)', goObj.procent_lei, 100 + DO Assert3 WITH '2-procent_val (astept 100, secundara exclusa)', goObj.procent_val, 100 + + SELECT rul_temp + LOCATE FOR ALLTRIM(codmat) == 'ART-A8-371' + IF FOUND() + DO DcLog WITH 'rul_temp: pretd=' + TRANSFORM(pretd) + ' pret=' + TRANSFORM(pret) + DO Assert3 WITH '3a-rul_temp.pretd (astept 1000.00, NU 1100)', pretd, 1000.00 + DO Assert3 WITH '3b-rul_temp.pret (astept 5230.00, NU 5753)', pret, 5230.00 + ELSE + pnAsserts = pnAsserts + 2 + DO DcLog WITH ' FAIL 3a/3b: nu am gasit articolul ART-A8-371 in rul_temp' + ENDIF + + SELECT introdc + LOCATE FOR tip_rand == 'D' + IF FOUND() + DO DcLog WITH 'randul D (diferenta): scd=' + ALLTRIM(scd) + ' scc=' + ALLTRIM(scc) + ' suma=' + TRANSFORM(suma) + DO Assert3 WITH '4a-randul D exista cu suma=523.00 (diferenta absorbita)', suma, 523.00 + DO AssertStr WITH '4b-randul D cont dominant clasa 3 (scc=371)', ALLTRIM(scc), '371' + ELSE + pnAsserts = pnAsserts + 2 + DO DcLog WITH ' FAIL 4a/4b: nu exista randul D (diferenta) - asteptat suma=523.00' + ENDIF + + SELECT introdc + LOCATE FOR nract == 201 AND ALLTRIM(scd) == '371' AND INLIST(tip_rand,'B','S') + IF FOUND() + DO DcLog WITH 'randul secundarei (371) dupa debifare: expl4=[' + ALLTRIM(NVL(explicatia4,'')) + '] expl5=[' + ALLTRIM(NVL(explicatia5,'')) + ']' + DO AssertStr WITH '5a-explicatia4 randul secundarei gol', ALLTRIM(NVL(explicatia4,'?')), '' + DO AssertStr WITH '5b-explicatia5 randul secundarei gol', ALLTRIM(NVL(explicatia5,'?')), '' + ELSE + pnAsserts = pnAsserts + 2 + DO DcLog WITH ' FAIL 5a/5b: nu am gasit randul secundarei (371) doc 201' + ENDIF + + goObj.cmesajsync = '' + LOCAL llValidSume + llValidSume = goObj.valideaza_sume() + DO DcLog WITH '6-valideaza_sume()=' + TRANSFORM(llValidSume) + ' cmesajsync=[' + ALLTRIM(NVL(goObj.cmesajsync,'')) + ']' + DO Assert3 WITH '6a-valideaza_sume()=.T.', IIF(llValidSume,1,0), 1 + DO AssertStr WITH '6b-cmesajsync gol', ALLTRIM(NVL(goObj.cmesajsync,'?')), '' + + DO DcLog WITH 'REZULTAT: ' + TRANSFORM(pnPass) + '/' + TRANSFORM(pnAsserts) + ' assert-uri PASS' + IF pnPass = pnAsserts + DO DcLog WITH 'VERDICT FINAL: PASS (' + TRANSFORM(pnPass) + '/' + TRANSFORM(pnAsserts) + ')' + ELSE + DO DcLog WITH 'VERDICT FINAL: FAIL (' + TRANSFORM(pnPass) + '/' + TRANSFORM(pnAsserts) + ' assert-uri PASS)' + ENDIF + + DO HarnessStep WITH 4, 'final: ' + TRANSFORM(pnPass) + '/' + TRANSFORM(pnAsserts) + ' PASS' + DO HarnessDone WITH 'done' + +CATCH TO loExc + DO DcLog WITH 'CATCH ErrorNo=' + TRANSFORM(loExc.ErrorNo) + ' Message=' + loExc.Message + ' Proc=' + loExc.Procedure + ' Line=' + TRANSFORM(loExc.LineNo) + ' [' + loExc.LineContents + ']' + DO HarnessDone WITH 'done-error' +ENDTRY + +QUIT + +*================================================================================== +PROCEDURE AdaugaDoc1 + *-- FACTURA 15100, RAJA, 1000 EUR curs 5.23 (5230 lei), TVA normal 21% autocalculata din sablon. + goDlg = CREATEOBJECT('import_adauga_factura', goObj) + goDlg.cFelDoc = 'Factura' + goDlg.nIdFdoc = 1 + goDlg.nNract = 15100 + goDlg.dDataAct = DATE() + goDlg.nIdPartener = 601 + goDlg.cPartener = 'RAJA' + goDlg.cExplicatia = 'Import marfa RAJA' + goDlg.nSuma = 1000 + goDlg.nSumaLei = 0 + goDlg.nCurs = 5.23 + goDlg.nIdValuta = 978 + goDlg.cValuta = 'EUR' + goDlg.nIdExplicatieTva = 208 + goDlg.cExplicatieTva = 'ACH. INT. 21%' + goDlg.optTipTva.Value = 1 && F = furnizor (normal, autocalc din sablon) + goDlg.chkInValutaCont.Value = 1 + goDlg.chkParticipaValuta.Value = 1 + goDlg.WindowType = 0 + goDlg.Visible = .T. + goDlg.Show() + DOEVENTS FORCE + DO DcLog WITH 'DOC1: valideaza = ' + TRANSFORM(goDlg.valideaza()) + DO ConstruiesteToDlg + DO DcLog WITH 'DOC1: do_adauga_factura = ' + TRANSFORM(goObj.do_adauga_factura(goT)) + goDlg.Hide() + DOEVENTS FORCE +ENDPROC + +PROCEDURE AdaugaDoc2 + *-- DVI 201, BIROUL VAMAL, 523 lei FARA valuta (in_valuta=0) - "Participa la pret valuta" + *-- BIFAT la adaugare (implicit), se DEBIFEAZA ulterior prin grid. Fara TVA (cTipTva='N'). + goDlg = CREATEOBJECT('import_adauga_factura', goObj) + goDlg.cFelDoc = 'DVI' + goDlg.nIdFdoc = 2 + goDlg.nNract = 201 + goDlg.dDataAct = DATE() + goDlg.nIdPartener = 900 + goDlg.cPartener = 'BIROUL VAMAL' + goDlg.cExplicatia = 'DVI 201 taxe vamale (fara valuta)' + goDlg.nSuma = 523 + goDlg.nSumaLei = 0 + goDlg.nCurs = 0 + goDlg.nIdValuta = 0 + goDlg.cValuta = '' + goDlg.nIdExplicatieTva = 0 + goDlg.cExplicatieTva = '' + goDlg.optTipTva.Value = 3 && N = fara TVA + goDlg.chkInValutaCont.Value = 0 + goDlg.chkParticipaValuta.Value = 1 && bifat la adaugare - se debifeaza ulterior prin grid + goDlg.WindowType = 0 + goDlg.Visible = .T. + goDlg.Show() + DOEVENTS FORCE + DO DcLog WITH 'DOC2: valideaza = ' + TRANSFORM(goDlg.valideaza()) + DO ConstruiesteToDlg + DO DcLog WITH 'DOC2: do_adauga_factura = ' + TRANSFORM(goObj.do_adauga_factura(goT)) + goDlg.Hide() + DOEVENTS FORCE +ENDPROC + +PROCEDURE ConstruiesteToDlg + *-- toDlg construit INLINE (nu intr-o functie apelata din procedura de business) - vezi + *-- docs/testare-ui-vfp.md capcana l; aici functioneaza fiindca goT e PUBLIC (nu return local). + goT = CREATEOBJECT('Empty') + =ADDPROPERTY(goT,'serie_act',ALLTRIM(NVL(goDlg.cSerieAct,''))) + =ADDPROPERTY(goT,'nract',goDlg.nNract) + =ADDPROPERTY(goT,'dataact',goDlg.dDataAct) + =ADDPROPERTY(goT,'fdoc',goDlg.cFelDoc) + =ADDPROPERTY(goT,'id_fdoc',goDlg.nIdFdoc) + =ADDPROPERTY(goT,'id_partc',goDlg.nIdPartener) + =ADDPROPERTY(goT,'partc',goDlg.cPartener) + =ADDPROPERTY(goT,'explicatia',ALLTRIM(NVL(goDlg.cExplicatia,''))) + =ADDPROPERTY(goT,'suma',IIF(goDlg.chkInValutaCont.Value=1 AND goDlg.nCurs<>0,IIF(goDlg.nSumaLei<>0,goDlg.nSumaLei,ROUND(goDlg.nSuma*goDlg.nCurs,gnPC)),goDlg.nSuma)) + =ADDPROPERTY(goT,'suma_val',IIF(goDlg.chkInValutaCont.Value=1 AND goDlg.nCurs<>0,goDlg.nSuma,0)) + =ADDPROPERTY(goT,'in_valuta',goDlg.chkInValutaCont.Value) + =ADDPROPERTY(goT,'participa_valuta',(goDlg.chkParticipaValuta.Value=1)) + =ADDPROPERTY(goT,'id_valuta',IIF(goDlg.chkInValutaCont.Value=1,goDlg.nIdValuta,0)) + =ADDPROPERTY(goT,'curs',IIF(goDlg.chkInValutaCont.Value=1,goDlg.nCurs,0)) + =ADDPROPERTY(goT,'nume_val',IIF(goDlg.chkInValutaCont.Value=1,ALLTRIM(NVL(goDlg.cValuta,'')),'')) + =ADDPROPERTY(goT,'cTipTva',IIF(goDlg.optTipTva.Value=1,'F',IIF(goDlg.optTipTva.Value=2,'D','N'))) + =ADDPROPERTY(goT,'id_jtva_coloana',goDlg.nIdExplicatieTva) + =ADDPROPERTY(goT,'dvi_serie',CHRTRAN(ALLTRIM(NVL(goDlg.cSerieDvi,'')),CHR(34),'')) + =ADDPROPERTY(goT,'dvi_nract',goDlg.nNractDvi) + =ADDPROPERTY(goT,'dvi_dataact',goDlg.dDviData) + =ADDPROPERTY(goT,'dvi_id_fdoc',goDlg.nIdFdocDVI) + =ADDPROPERTY(goT,'dvi_fdoc',goDlg.cFelDocDvi) + =ADDPROPERTY(goT,'dvi_id_partc',goDlg.nDviIdPartener) + =ADDPROPERTY(goT,'dvi_partc',goDlg.cDviPartener) + =ADDPROPERTY(goT,'dvi_scc','401') + =ADDPROPERTY(goT,'dvi_tva_lei',goDlg.nDviTvaLei) + =ADDPROPERTY(goT,'dvi_tva_val',goDlg.nDviTvaVal) +ENDPROC + +PROCEDURE CreeazaRulTemp + *-- structura reala rul_temp (VRUL, Oracle dev). + IF USED('rul_temp') + USE IN ('rul_temp') + ENDIF + CREATE CURSOR rul_temp ( ; + id_rul N(20,0), an N(4,0), luna N(2,0), cod N(20,0); + , serie C(100), nnir N(20,0), id_articol N(10,0), denumire C(100); + , codmat C(50), codmatf C(50), codbare C(50), um C(20); + , id_gestiune N(5,0), nume_gestiune C(50), cgest C(20), nr_pag N(2,0); + , gestionar C(50), comisie_receptie1 C(50), comisie_receptie2 C(50), comisie_receptie3 C(50); + , cant N(14,3), cante N(14,3), cont C(10), acont C(20); + , pret N(18,4), tva N(18,4), valoare N(18,4), valtva N(18,4); + , proc_tva N(5,2), pretv N(18,4), pretvtva N(18,4), tvav N(18,4); + , valoarev N(18,4), valtvav N(18,4), proc_tvav N(5,2), adaos N(18,4); + , adaos_tva N(18,4), valoare_adaos N(18,4), valtva_adaos N(18,4), procent N(10,3); + , discunitar N(18,4), discount_tva N(18,4), valoare_discount N(18,4), valtva_discount N(18,4); + , proc_disc N(7,3), pretd N(14,4), curs N(18,4), id_valuta N(10,0); + , nume_val C(20), id_lucrare N(20,0), nrord C(100), id_responsabil N(10,0); + , nresp C(100), resp_marca N(18,4), dataact T, id_util N(5,0); + , util C(30), dataora T, id_sectie N(5,0), sectie C(50); + , csectie C(10), alcooltutun N(1,0), datain T, dataout T; + , id_fact N(20,0), id_gestiunec N(10,0), nume_gestiunec C(50), cgestc C(20); + , id_responsabilc N(5,0), id_reteta N(10,0), reteta C(50), nrespc C(100); + , respc_marca N(18,4), id_set N(20,0), id_tip_rulaj N(10,0), tip_rulaj C(50); + , id_obiect_depozit N(10,0), id_rul_aux N(10,0), nract N(20,0), serie_act C(10); + , dataoras T, id_utils N(10,0), lot C(30), adata_expirare T; + , id_sucursala N(5,0), sucursala C(250), id_part_rez N(10,0), part_rez C(100); + , id_lucrare_rez N(10,0), nrord_rez C(100), subgrupa C(100), grupa C(100); + , id_subgrupa N(5,0), id_grupa N(5,0), in_stoc N(1,0), in_crm N(1,0); + , id_furnizor N(10,0), furnizor C(100), id_jtva_coloana N(4,0), explicatie_tva C(100); + , taxcode N(6,0), taxname C(254), saft_procent N(18,4), codnc8 C(20); + , id_tara_origine N(4,0), cod_tara_origine C(5), tara_origine C(50), greutate N(12,4); + , fdoc C(30), id_fdoc N(18,4); + , pret_lei N(18,4), pret_val N(14,4), cota_tva N(6,2)) +ENDPROC + +PROCEDURE CreeazaIntrodc + LPARAMETERS tcAlias + IF USED(tcAlias) + USE IN (tcAlias) + ENDIF + CREATE CURSOR (tcAlias) ( ; + id_note N(14), explicatia C(100), scd C(10), ascd C(20), scc C(10), ascc C(20), ; + cu_tva N(1), id_set N(14), ordine N(8), in_valuta N(1), id_jtva_coloana N(14) NULL, ; + ptva N(6,2), explicatie_tva C(50), tipjurnal C(2), taxcode N(6), paymentcode C(9), ; + suma N(18,4), suma_val N(18,4), id_partd N(14), id_partc N(14), partd C(100), partc C(100), ; + id_fact N(14), id_factd N(14), id_factc N(14), pereched N(14), perechec N(14), ; + nract N(14), serie_act C(10), explicatia4 C(50), explicatia5 C(50), participa_valuta L, ; + id_valuta N(14), curs N(14,4), nume_val C(10), dataact D, fdoc C(50), id_fdoc N(14), ; + se_scrie N(1), tva_incasare N(1), doc_color N(10), doc_label C(10), tip_rand C(1), ; + doc_key C(80), nr_doc N(8), suma_doc N(18,4), suma_doc_val N(18,4), mod_manual N(1), ; + scd_orig C(20), ascd_orig C(20)) +ENDPROC + +PROCEDURE VerificaPereche + LPARAMETERS tnNract, tnBazaLei, tnBazaVal, tcVal + LOCAL lnSel, lcMsg, llB, lnBS, lnBSV, lcNV + lnSel = SELECT() + SELECT introdc + LOCATE FOR nract = tnNract AND tip_rand == 'B' + llB = FOUND() + IF llB + lnBS = suma + lnBSV = suma_val + lcNV = ALLTRIM(NVL(nume_val,'')) + ENDIF + IF llB AND ABS(lnBS - tnBazaLei) < 0.01 AND ABS(lnBSV - tnBazaVal) < 0.01 AND ALLTRIM(NVL(lcNV,'')) == tcVal + lcMsg = 'PASS pereche nract=' + TRANSFORM(tnNract) + ': B(suma=' + TRANSFORM(lnBS) + ' val=' + TRANSFORM(lnBSV) + ' ' + lcNV + ')' + ELSE + lcMsg = 'FAIL pereche nract=' + TRANSFORM(tnNract) + ': B?=' + TRANSFORM(llB) + ' bazaLei=' + TRANSFORM(IIF(llB,lnBS,-1)) + '(astept ' + TRANSFORM(tnBazaLei) + ') bazaVal=' + TRANSFORM(IIF(llB,lnBSV,-1)) + '(astept ' + TRANSFORM(tnBazaVal) + ') val=[' + IIF(llB,lcNV,'?') + '](astept [' + tcVal + '])' + ENDIF + DO DcLog WITH lcMsg + SELECT (lnSel) +ENDPROC + +PROCEDURE DumpIntrodc + LOCAL lnSel + lnSel = SELECT() + SELECT introdc + SCAN + DO DcLog WITH ' recno=' + TRANSFORM(RECNO()) + ' nr_doc=' + TRANSFORM(NVL(nr_doc,0)) + ' nract=' + TRANSFORM(nract) + ' fdoc=[' + ALLTRIM(NVL(fdoc,'')) + '] tip_rand=' + tip_rand + ; + ' scd=' + ALLTRIM(scd) + ' ascd=[' + ALLTRIM(NVL(ascd,'')) + '] scc=' + ALLTRIM(scc) + ' ptva=' + TRANSFORM(ptva) + ' suma=' + TRANSFORM(suma) + ' suma_val=' + TRANSFORM(suma_val) + ; + ' in_valuta=' + TRANSFORM(NVL(in_valuta,0)) + ' participa_valuta=' + TRANSFORM(NVL(participa_valuta,.F.)) + ' id_valuta=' + TRANSFORM(NVL(id_valuta,0)) + ' partc=[' + ALLTRIM(NVL(partc,'')) + '] expl4=[' + ALLTRIM(NVL(explicatia4,'')) + '] expl5=[' + ALLTRIM(NVL(explicatia5,'')) + '] doc_key=[' + ALLTRIM(doc_key) + ']' + ENDSCAN + SELECT (lnSel) +ENDPROC + +FUNCTION RECCOUNT_ACTIVE + LPARAMETERS tcAlias + LOCAL lnSel, lnCnt + lnSel = SELECT() + SELECT (tcAlias) + COUNT TO lnCnt FOR !DELETED() + SELECT (lnSel) + RETURN lnCnt +ENDFUNC + +PROCEDURE Assert3 + *-- compara numeric cu toleranta 0.02, logheaza PASS/FAIL, incrementeaza contoare (byref). + LPARAMETERS tcLabel, tuActual, tuExpected + pnAsserts = pnAsserts + 1 + IF ABS(NVL(tuActual,0) - tuExpected) < 0.02 + pnPass = pnPass + 1 + DO DcLog WITH ' PASS ' + tcLabel + ' (=' + TRANSFORM(tuActual) + ')' + ELSE + DO DcLog WITH ' FAIL ' + tcLabel + ' (actual=' + TRANSFORM(tuActual) + ' asteptat=' + TRANSFORM(tuExpected) + ')' + ENDIF +ENDPROC + +PROCEDURE AssertStr + LPARAMETERS tcLabel, tcActual, tcExpected + pnAsserts = pnAsserts + 1 + IF tcActual == tcExpected + pnPass = pnPass + 1 + DO DcLog WITH ' PASS ' + tcLabel + ' (=[' + tcActual + '])' + ELSE + DO DcLog WITH ' FAIL ' + tcLabel + ' (actual=[' + tcActual + '] asteptat=[' + tcExpected + '])' + ENDIF +ENDPROC + +PROCEDURE DcErr + LPARAMETERS tnErr, tcMsg, tcProg, tnLine + DO DcLog WITH 'ON ERROR ' + TRANSFORM(tnErr) + ' [' + tcProg + ':' + TRANSFORM(tnLine) + '] ' + tcMsg +ENDPROC + +PROCEDURE DcLog + LPARAMETERS tcMsg + SET SAFETY OFF + LOCAL lcL + lcL = IIF(FILE(gcUILog), FILETOSTR(gcUILog), '') + STRTOFILE(lcL + tcMsg + CHR(13)+CHR(10), gcUILog) +ENDPROC + +DEFINE CLASS dummyapp AS Custom + PROCEDURE ReadIni + LPARAMETERS tcSection, tcKey + RETURN '' + ENDPROC + PROCEDURE WriteIni + LPARAMETERS tcSection, tcKey, tcValue + RETURN .T. + ENDPROC +ENDDEFINE + +DEFINE CLASS dummyexecutor AS Custom + cEroare = '' + PROCEDURE oExecute + LPARAMETERS tcSql, tcCursor + IF USED(m.tcCursor) + USE IN (m.tcCursor) + ENDIF + *-- update_jtva_coloane (SELECT * FROM vjtva_coloane ...): mock cu date reale. + IF 'VJTVA_COLOANE' $ UPPER(m.tcSql) + DO CreeazaJtvaColoaneView WITH m.tcCursor + RETURN 1 + ENDIF + *-- rul_temp (recreat de import_nota.Init din vrul cand e gol): structura completa. + IF UPPER(ALLTRIM(m.tcCursor)) == 'RUL_TEMP' + CREATE CURSOR (m.tcCursor) (denumire C(100), codmat C(30), cant N(14,3), ; + pret_val N(18,4), pretd N(18,4), pret N(18,4), pret_lei N(18,4), cont C(10), ; + acont C(20), serie C(30), lot C(30), adata_expirare C(10), proc_disc N(6,2), cota_tva N(6,2)) + RETURN 1 + ENDIF + *-- assign_analitic (creeaza_rand_s / do_adauga_articol): config_analitice - prefix/sufix goale, + *-- deci acont-ul vine direct din fconturi_analitice (mai jos), controlat de gcMockAcontCrt. + IF 'CONFIG_ANALITICE' $ UPPER(m.tcSql) + CREATE CURSOR (m.tcCursor) (camp_leg_prefix C(30), camp_leg_sufix C(30)) + INSERT INTO (m.tcCursor) VALUES ('', '') + RETURN 1 + ENDIF + *-- fconturi_analitice: acont-ul curent, setat explicit de test (gcMockAcontCrt) inainte de + *-- fiecare do_adauga_articol() - simplu si deterministic, fara sa depinda de binding real. + IF 'FCONTURI_ANALITICE' $ UPPER(m.tcSql) + CREATE CURSOR (m.tcCursor) (acont C(20)) + INSERT INTO (m.tcCursor) VALUES (IIF(TYPE('gcMockAcontCrt') = 'C', gcMockAcontCrt, '')) + RETURN 1 + ENDIF + *-- vplcont_analitic: validare analitic vs plan de conturi. + IF 'VPLCONT_ANALITIC' $ UPPER(m.tcSql) + CREATE CURSOR (m.tcCursor) (cont C(10), acont C(20)) + INSERT INTO (m.tcCursor) VALUES ('371', '4') + RETURN 1 + ENDIF + *-- ramura generica: cursor gol (nu afecteaza fluxurile testate mai sus). + CREATE CURSOR (m.tcCursor) (id_temp N(1)) + RETURN 1 + ENDPROC + PROCEDURE oExecuta + LPARAMETERS tcSql, tcCursor + IF !EMPTY(m.tcCursor) + IF USED(m.tcCursor) + USE IN (m.tcCursor) + ENDIF + IF UPPER(m.tcCursor) == 'CJTVACOL4427' + *-- coloana_jc 'FO21T' (import) NU se potriveste patternurilor TI%T/XX%TIT/CE%T - + *-- cursor gol => scc ramane '401' (nu 4427). + CREATE CURSOR (m.tcCursor) (id_jtva_coloana N(14)) + ELSE + CREATE CURSOR (m.tcCursor) (id_temp N(1)) + ENDIF + ENDIF + RETURN .T. + ENDPROC + PROCEDURE oSelect2Value + LPARAMETERS tcSql, toValue + toValue = '' + RETURN 1 + ENDPROC + PROCEDURE oReset + ENDPROC +ENDDEFINE + +PROCEDURE CreeazaJtvaColoaneView + LPARAMETERS tcCursor + IF USED(m.tcCursor) + USE IN (m.tcCursor) + ENDIF + CREATE CURSOR (m.tcCursor) (id_jtva_coloana N(14), denumire C(100), jc N(1), jv N(1), ; + coloana_jc C(20), coloana_jv C(20), cota_tva N(6,2), id_tva N(14) NULL, afisat N(1), ; + id_jtva_ex N(14) NULL, id_jtva_neex N(14) NULL, ordine N(8), ; + taxcode N(6) NULL, taxcode_neexigibil N(6) NULL, taxcode_n50 N(6) NULL, ; + taxcode_n50_tvai N(6) NULL, taxcode_n100 N(6) NULL, taxcode_regularizare N(6) NULL, taxcode_tvai N(6) NULL) + INSERT INTO (m.tcCursor) (id_jtva_coloana, denumire, jc, jv, afisat, ordine, cota_tva) VALUES (0, '', 0, 0, 1, 0, 0) + INSERT INTO (m.tcCursor) (id_jtva_coloana, denumire, jc, jv, coloana_jc, cota_tva, id_tva, afisat, ordine, taxcode) ; + VALUES (208, 'ACH. INT. 21%', 1, 0, 'RO21B', 21, 209, 1, 1, 301104) + INSERT INTO (m.tcCursor) (id_jtva_coloana, denumire, jc, jv, coloana_jc, cota_tva, afisat, ordine, taxcode) ; + VALUES (209, 'TVA ACH. INT. 21%', 1, 0, 'RO21T', 21, 1, 2, 301104) + INSERT INTO (m.tcCursor) (id_jtva_coloana, denumire, jc, jv, coloana_jc, cota_tva, id_tva, afisat, ordine, taxcode) ; + VALUES (220, 'ACH. IMP. 21%', 1, 0, 'FO21B', 21, 221, 1, 3, 301204) + INSERT INTO (m.tcCursor) (id_jtva_coloana, denumire, jc, jv, coloana_jc, cota_tva, afisat, ordine, taxcode) ; + VALUES (221, 'TVA ACH. IMP. 21%', 1, 0, 'FO21T', 21, 1, 4, 301204) +ENDPROC diff --git a/utile/Teste/achizitie_import/test_secundara_debifata_pret.ps1 b/utile/Teste/achizitie_import/test_secundara_debifata_pret.ps1 new file mode 100644 index 0000000..e788c64 --- /dev/null +++ b/utile/Teste/achizitie_import/test_secundara_debifata_pret.ps1 @@ -0,0 +1,12 @@ +# test_secundara_debifata_pret.ps1 - wrapper peste harness-ul generic pentru scenariul de +# debifare "Participa la pret valuta" pe un document secundar fara valuta (runda9). Rulare: +# powershell -ExecutionPolicy Bypass -File test_secundara_debifata_pret.ps1 +$ErrorActionPreference = 'Stop' +$Teste = $PSScriptRoot +& (Join-Path (Split-Path $Teste -Parent) 'vfp_ui_harness.ps1') ` + -TestPrg (Join-Path $Teste 'test_secundara_debifata_pret.prg') ` + -Steps @('2documente','articol_adaugat','sync_bifat','debifare','final') ` + -ShotsDir (Join-Path $Teste 'screenshots_secundara_debifata') ` + -SyncDir (Join-Path $Teste 'uisync_secundara_debifata') ` + -StepTimeoutSec 180 ` + -ReadyTimeoutSec 180