From db58829fa47ea4c21ec7a354d6b22e5d91d099e7 Mon Sep 17 00:00:00 2001 From: Marius Mutu Date: Fri, 7 Aug 2026 14:20:58 +0300 Subject: [PATCH] eroare autopass --- Programe/oproceduri_autopass.prg | 14 +++++++++----- roaauto.pj2 | 8 ++++---- 2 files changed, 13 insertions(+), 9 deletions(-) diff --git a/Programe/oproceduri_autopass.prg b/Programe/oproceduri_autopass.prg index a83b7a7..1412d7c 100644 --- a/Programe/oproceduri_autopass.prg +++ b/Programe/oproceduri_autopass.prg @@ -1373,6 +1373,7 @@ ENDFUNC && autopass_export_csv * acest apel cu propriile campuri din forma daca export_operatii_csv se declanseaza * din interiorul ferestrei "Trimitere AUTOPASS"; aici e varianta standalone din xmenu. ***************************************************************************************** +* Se apeleaza cu parametrii prin referinta: autopass_cere_perioada(@ldStart, @ldEnd) FUNCTION autopass_cere_perioada LPARAMETERS tdDataInceput, tdDataSfarsit LOCAL ldInceput, ldSfarsit, lcInceput, lcSfarsit @@ -1382,12 +1383,12 @@ ldSfarsit = IIF(VARTYPE(tdDataSfarsit) = 'D' AND !EMPTY(tdDataSfarsit), tdDataSf lcInceput = INPUTBOX('Data inceput perioada (facturii), format ZZ.LL.AAAA:', 'Perioada export AUTOPASS', DTOC(ldInceput)) IF EMPTY(lcInceput) - RETURN .NULL. + RETURN .F. ENDIF lcSfarsit = INPUTBOX('Data sfarsit perioada (facturii), format ZZ.LL.AAAA:', 'Perioada export AUTOPASS', DTOC(ldSfarsit)) IF EMPTY(lcSfarsit) - RETURN .NULL. + RETURN .F. ENDIF ldInceput = CTOD(lcInceput) @@ -1395,11 +1396,14 @@ ldSfarsit = CTOD(lcSfarsit) IF EMPTY(ldInceput) OR EMPTY(ldSfarsit) OR ldInceput > ldSfarsit MESSAGEBOX('Perioada introdusa este invalida.', 48, 'AUTOPASS') - RETURN .NULL. + RETURN .F. ENDIF -RETURN {||ldInceput, ldSfarsit} -ENDFUNC && autopass_cere_perioada (returneaza .NULL. la Renunta/eroare; altfel array-code-block cu 2 date - inlocuit efectiv de US-004) +tdDataInceput = ldInceput +tdDataSfarsit = ldSfarsit + +RETURN .T. +ENDFUNC && autopass_cere_perioada (returneaza .F. la Renunta/eroare; la .T. datele sunt puse in parametrii transmisi prin referinta) ***************************************************************************************** diff --git a/roaauto.pj2 b/roaauto.pj2 index e884d38..4c6dcc4 100644 --- a/roaauto.pj2 +++ b/roaauto.pj2 @@ -25,7 +25,7 @@ _LegalTrademark = "" _ProductName = " ROA - Devize auto" _MajorVer = "2" _MinorVer = "5" -_Revision = "4" +_Revision = "5" _LanguageID = "Romana" _AutoIncrement = "0" * @@ -403,7 +403,7 @@ WITH loProject.FILES .ADD('comun\utile\web\wwxml.vcx') && *< FileMetadata: Type="V" Cpid="0" Timestamp="0" ID="0" ObjRev="544" User="" /> .ADD('comun\utile\web\wwxmlhttp.prg') && *< FileMetadata: Type="P" Cpid="1252" Timestamp="0" ID="0" ObjRev="544" User="" /> .ADD('config.fpw') && *< FileMetadata: Type="T" Cpid="1252" Timestamp="0" ID="0" ObjRev="0" User="" /> - .ADD('ferestre\frm_autopass.scx') && *< FileMetadata: Type="K" Cpid="1252" Timestamp="0" ID="0" ObjRev="0" User="" /> + .ADD('ferestre\frm_autopass.scx') && *< FileMetadata: Type="K" Cpid="1252" Timestamp="0" ID="0" ObjRev="544" User="" /> .ADD('ferestre\frm_date_comenzi.scx') && *< FileMetadata: Type="K" Cpid="1252" Timestamp="0" ID="0" ObjRev="544" User="" /> .ADD('ferestre\fundal.scx') && *< FileMetadata: Type="K" Cpid="1252" Timestamp="0" ID="0" ObjRev="544" User="" /> .ADD('grafice\clie1.bmp') && *< FileMetadata: Type="x" Cpid="1252" Timestamp="0" ID="0" ObjRev="0" User="" /> @@ -428,14 +428,14 @@ WITH loProject.FILES .ADD('meniuri\verificari_com.mnx') && *< FileMetadata: Type="M" Cpid="1250" Timestamp="0" ID="0" ObjRev="544" User="" /> .ADD('programe\onom_devize.prg') && *< FileMetadata: Type="P" Cpid="1252" Timestamp="0" ID="0" ObjRev="544" User="" /> .ADD('programe\oproceduri_analize.prg') && *< FileMetadata: Type="P" Cpid="1252" Timestamp="0" ID="0" ObjRev="544" User="" /> - .ADD('programe\oproceduri_autopass.prg') && *< FileMetadata: Type="P" Cpid="1252" Timestamp="0" ID="0" ObjRev="0" User="" /> + .ADD('programe\oproceduri_autopass.prg') && *< FileMetadata: Type="P" Cpid="1252" Timestamp="0" ID="0" ObjRev="544" User="" /> .ADD('programe\oproceduri_devize.prg') && *< FileMetadata: Type="P" Cpid="1252" Timestamp="0" ID="0" ObjRev="544" User="" /> .ADD('programe\oproceduri_listari.prg') && *< FileMetadata: Type="P" Cpid="1252" Timestamp="0" ID="0" ObjRev="544" User="" /> .ADD('programe\oproceduri_vizualizare.prg') && *< FileMetadata: Type="P" Cpid="1250" Timestamp="0" ID="0" ObjRev="544" User="" /> .ADD('programe\ovariabile_globale.prg') && *< FileMetadata: Type="P" Cpid="1252" Timestamp="0" ID="0" ObjRev="544" User="" /> .ADD('programe\proceduri.prg') && *< FileMetadata: Type="P" Cpid="1252" Timestamp="0" ID="0" ObjRev="544" User="" /> .ADD('programe\roaauto.prg') && *< FileMetadata: Type="P" Cpid="0" Timestamp="0" ID="0" ObjRev="544" User="" /> - .ADD('programe\test_autopass_driver.prg') && *< FileMetadata: Type="P" Cpid="1252" Timestamp="0" ID="0" ObjRev="0" User="" /> + .ADD('programe\test_autopass_driver.prg') && *< FileMetadata: Type="P" Cpid="1252" Timestamp="0" ID="0" ObjRev="544" User="" /> .ADD('programe\update_devize.prg') && *< FileMetadata: Type="P" Cpid="1252" Timestamp="0" ID="0" ObjRev="544" User="" /> .ADD('programe\update_nomenclator.prg') && *< FileMetadata: Type="P" Cpid="1252" Timestamp="0" ID="0" ObjRev="544" User="" /> .ADD('rapoarte\_deviz.frx') && *< FileMetadata: Type="R" Cpid="0" Timestamp="0" ID="0" ObjRev="0" User="" />