Borderou eFactura: bife de filtrare "Cu diferente" / "Lipsa din Reg. TVA"

Pe toate cele trei pagini (Facturi emise, Primite, Trimise) doua bife noi, colorate
ca randurile pe care le filtreaza: turcuaz "Cu diferente Reg. TVA" (jtotctva
completat, dar diferenta peste 0,15 lei sau eFactura in valuta) si gri "Lipsa din
Reg. TVA" (jtotctva null). Bifate impreuna se aduna cu OR.

Culorile din grid: gri = nu e in registru, turcuaz = diferenta peste 0,15 lei sau
necalculabila, alb = se potriveste. Expresia DynamicBackColor e sparta in doua
siruri, VFP nu accepta constante peste 255 caractere.

diferenta ramane NULL cand jtotctva e NULL (nu 0 fals), la fel ca la facturile
primite/trimise; jtotctva si diferenta sunt acum nullable in cursorul de facturi
emise.

Corectat lcFiltru3, care se construia din lcFiltru2 si pierdea conditiile paginii.

Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01FW7zDopcHo2fHq5L53MjMM

clase/anaf_efactura.vc2

@@ -9,10 +9,32 @@ DEFINE CLASS anaf_efactura AS _frmbase OF "_frm_base.vcx"
 
 	*-- OBJECTDATA items order determines ZOrder / El orden de los items OBJECTDATA determina el ZOrder 
 	*< OBJECTDATA: ObjPath="But_start_criterii1" UniqueID="" Timestamp="" />
-	*< OBJECTDATA: ObjPath="But_reset_criterii1" UniqueID="" Timestamp="" />
 	*< OBJECTDATA: ObjPath="But_excel1" UniqueID="" Timestamp="" />
+	*< OBJECTDATA: ObjPath="But_reset_criterii1" UniqueID="" Timestamp="" />
 	*< OBJECTDATA: ObjPath="pgfeFactura" UniqueID="" Timestamp="" />
 	*< OBJECTDATA: ObjPath="pgfeFactura.Page1._SHAPE1" UniqueID="" Timestamp="" />
+	*< OBJECTDATA: ObjPath="pgfeFactura.Page1.grdDetaliiFacturi" UniqueID="" Timestamp="" />
+	*< OBJECTDATA: ObjPath="pgfeFactura.Page1.grdDetaliiFacturi.Column1.Header1" UniqueID="" Timestamp="" />
+	*< OBJECTDATA: ObjPath="pgfeFactura.Page1.grdDetaliiFacturi.Column1.Text1" UniqueID="" Timestamp="" />
+	*< OBJECTDATA: ObjPath="pgfeFactura.Page1.grdDetaliiFacturi.Column2.Header1" UniqueID="" Timestamp="" />
+	*< OBJECTDATA: ObjPath="pgfeFactura.Page1.grdDetaliiFacturi.Column2.Text1" UniqueID="" Timestamp="" />
+	*< OBJECTDATA: ObjPath="pgfeFactura.Page1.grdDetaliiFacturi.Column3.Header1" UniqueID="" Timestamp="" />
+	*< OBJECTDATA: ObjPath="pgfeFactura.Page1.grdDetaliiFacturi.Column3.Text1" UniqueID="" Timestamp="" />
+	*< OBJECTDATA: ObjPath="pgfeFactura.Page1.grdDetaliiFacturi.Column3._editbox1" UniqueID="" Timestamp="" />
+	*< OBJECTDATA: ObjPath="pgfeFactura.Page1.grdDetaliiFacturi.Column4.Header1" UniqueID="" Timestamp="" />
+	*< OBJECTDATA: ObjPath="pgfeFactura.Page1.grdDetaliiFacturi.Column4.Text1" UniqueID="" Timestamp="" />
+	*< OBJECTDATA: ObjPath="pgfeFactura.Page1.grdDetaliiFacturi.Column5.Header1" UniqueID="" Timestamp="" />
+	*< OBJECTDATA: ObjPath="pgfeFactura.Page1.grdDetaliiFacturi.Column5.Text1" UniqueID="" Timestamp="" />
+	*< OBJECTDATA: ObjPath="pgfeFactura.Page1.grdDetaliiFacturi.Column6.Header1" UniqueID="" Timestamp="" />
+	*< OBJECTDATA: ObjPath="pgfeFactura.Page1.grdDetaliiFacturi.Column6.Text1" UniqueID="" Timestamp="" />
+	*< OBJECTDATA: ObjPath="pgfeFactura.Page1.grdDetaliiFacturi.Column7.Header1" UniqueID="" Timestamp="" />
+	*< OBJECTDATA: ObjPath="pgfeFactura.Page1.grdDetaliiFacturi.Column7.Text1" UniqueID="" Timestamp="" />
+	*< OBJECTDATA: ObjPath="pgfeFactura.Page1.grdDetaliiFacturi.Column8.Header1" UniqueID="" Timestamp="" />
+	*< OBJECTDATA: ObjPath="pgfeFactura.Page1.grdDetaliiFacturi.Column8.Text1" UniqueID="" Timestamp="" />
+	*< OBJECTDATA: ObjPath="pgfeFactura.Page1.grdDetaliiFacturi.Column9.Header1" UniqueID="" Timestamp="" />
+	*< OBJECTDATA: ObjPath="pgfeFactura.Page1.grdDetaliiFacturi.Column9.Text1" UniqueID="" Timestamp="" />
+	*< OBJECTDATA: ObjPath="pgfeFactura.Page1.grdDetaliiFacturi.Column10.Header1" UniqueID="" Timestamp="" />
+	*< OBJECTDATA: ObjPath="pgfeFactura.Page1.grdDetaliiFacturi.Column10.Text1" UniqueID="" Timestamp="" />
 	*< OBJECTDATA: ObjPath="pgfeFactura.Page1.grdFacturiEmise" UniqueID="" Timestamp="" />
 	*< OBJECTDATA: ObjPath="pgfeFactura.Page1.grdFacturiEmise.cAles.Header1" UniqueID="" Timestamp="" />
 	*< OBJECTDATA: ObjPath="pgfeFactura.Page1.grdFacturiEmise.cAles.Text1" UniqueID="" Timestamp="" />
@@ -93,38 +115,16 @@ DEFINE CLASS anaf_efactura AS _frmbase OF "_frm_base.vcx"
 	*< OBJECTDATA: ObjPath="pgfeFactura.Page1.grdFacturiEmise.cCreditNote._checkbox1" UniqueID="" Timestamp="" />
 	*< OBJECTDATA: ObjPath="pgfeFactura.Page1.cmdTrimite" UniqueID="" Timestamp="" />
 	*< OBJECTDATA: ObjPath="pgfeFactura.Page1.cmdRaspunsuri" UniqueID="" Timestamp="" />
-	*< OBJECTDATA: ObjPath="pgfeFactura.Page1.grdDetaliiFacturi" UniqueID="" Timestamp="" />
-	*< OBJECTDATA: ObjPath="pgfeFactura.Page1.grdDetaliiFacturi.Column1.Header1" UniqueID="" Timestamp="" />
-	*< OBJECTDATA: ObjPath="pgfeFactura.Page1.grdDetaliiFacturi.Column1.Text1" UniqueID="" Timestamp="" />
-	*< OBJECTDATA: ObjPath="pgfeFactura.Page1.grdDetaliiFacturi.Column2.Header1" UniqueID="" Timestamp="" />
-	*< OBJECTDATA: ObjPath="pgfeFactura.Page1.grdDetaliiFacturi.Column2.Text1" UniqueID="" Timestamp="" />
-	*< OBJECTDATA: ObjPath="pgfeFactura.Page1.grdDetaliiFacturi.Column3.Header1" UniqueID="" Timestamp="" />
-	*< OBJECTDATA: ObjPath="pgfeFactura.Page1.grdDetaliiFacturi.Column3.Text1" UniqueID="" Timestamp="" />
-	*< OBJECTDATA: ObjPath="pgfeFactura.Page1.grdDetaliiFacturi.Column3._editbox1" UniqueID="" Timestamp="" />
-	*< OBJECTDATA: ObjPath="pgfeFactura.Page1.grdDetaliiFacturi.Column4.Header1" UniqueID="" Timestamp="" />
-	*< OBJECTDATA: ObjPath="pgfeFactura.Page1.grdDetaliiFacturi.Column4.Text1" UniqueID="" Timestamp="" />
-	*< OBJECTDATA: ObjPath="pgfeFactura.Page1.grdDetaliiFacturi.Column5.Header1" UniqueID="" Timestamp="" />
-	*< OBJECTDATA: ObjPath="pgfeFactura.Page1.grdDetaliiFacturi.Column5.Text1" UniqueID="" Timestamp="" />
-	*< OBJECTDATA: ObjPath="pgfeFactura.Page1.grdDetaliiFacturi.Column6.Header1" UniqueID="" Timestamp="" />
-	*< OBJECTDATA: ObjPath="pgfeFactura.Page1.grdDetaliiFacturi.Column6.Text1" UniqueID="" Timestamp="" />
-	*< OBJECTDATA: ObjPath="pgfeFactura.Page1.grdDetaliiFacturi.Column7.Header1" UniqueID="" Timestamp="" />
-	*< OBJECTDATA: ObjPath="pgfeFactura.Page1.grdDetaliiFacturi.Column7.Text1" UniqueID="" Timestamp="" />
-	*< OBJECTDATA: ObjPath="pgfeFactura.Page1.grdDetaliiFacturi.Column8.Header1" UniqueID="" Timestamp="" />
-	*< OBJECTDATA: ObjPath="pgfeFactura.Page1.grdDetaliiFacturi.Column8.Text1" UniqueID="" Timestamp="" />
-	*< OBJECTDATA: ObjPath="pgfeFactura.Page1.grdDetaliiFacturi.Column9.Header1" UniqueID="" Timestamp="" />
-	*< OBJECTDATA: ObjPath="pgfeFactura.Page1.grdDetaliiFacturi.Column9.Text1" UniqueID="" Timestamp="" />
-	*< OBJECTDATA: ObjPath="pgfeFactura.Page1.grdDetaliiFacturi.Column10.Header1" UniqueID="" Timestamp="" />
-	*< OBJECTDATA: ObjPath="pgfeFactura.Page1.grdDetaliiFacturi.Column10.Text1" UniqueID="" Timestamp="" />
 	*< OBJECTDATA: ObjPath="pgfeFactura.Page1.txtMesajTrimis" UniqueID="" Timestamp="" />
 	*< OBJECTDATA: ObjPath="pgfeFactura.Page1.txtMesajRaspuns" UniqueID="" Timestamp="" />
 	*< OBJECTDATA: ObjPath="pgfeFactura.Page1.edtDetalii" UniqueID="" Timestamp="" />
 	*< OBJECTDATA: ObjPath="pgfeFactura.Page1.lblMesajTrimis" UniqueID="" Timestamp="" />
 	*< OBJECTDATA: ObjPath="pgfeFactura.Page1.lblMesajRaspuns" UniqueID="" Timestamp="" />
 	*< OBJECTDATA: ObjPath="pgfeFactura.Page1.lblDetalii" UniqueID="" Timestamp="" />
-	*< OBJECTDATA: ObjPath="pgfeFactura.Page1.chkPersFizice" UniqueID="" Timestamp="" />
-	*< OBJECTDATA: ObjPath="pgfeFactura.Page1.chkFortareRaspunsuri" UniqueID="" Timestamp="" />
-	*< OBJECTDATA: ObjPath="pgfeFactura.Page1.chkTrimis" UniqueID="" Timestamp="" />
 	*< OBJECTDATA: ObjPath="pgfeFactura.Page1.chkValidareOnline" UniqueID="" Timestamp="" />
+	*< OBJECTDATA: ObjPath="pgfeFactura.Page1.chkTrimis" UniqueID="" Timestamp="" />
+	*< OBJECTDATA: ObjPath="pgfeFactura.Page1.chkFortareRaspunsuri" UniqueID="" Timestamp="" />
+	*< OBJECTDATA: ObjPath="pgfeFactura.Page1.chkPersFizice" UniqueID="" Timestamp="" />
 	*< OBJECTDATA: ObjPath="pgfeFactura.Page1.Cmd_select_adv1" UniqueID="" Timestamp="" />
 	*< OBJECTDATA: ObjPath="pgfeFactura.Page1.Gridextra1" UniqueID="" Timestamp="" />
 	*< OBJECTDATA: ObjPath="pgfeFactura.Page1.Gridextra2" UniqueID="" Timestamp="" />
@@ -137,6 +137,28 @@ DEFINE CLASS anaf_efactura AS _frmbase OF "_frm_base.vcx"
 	*< OBJECTDATA: ObjPath="pgfeFactura.Page1.cboAtasamente" UniqueID="" Timestamp="" />
 	*< OBJECTDATA: ObjPath="pgfeFactura.Page1.lblAtasamente" UniqueID="" Timestamp="" />
 	*< OBJECTDATA: ObjPath="pgfeFactura.Page2._SHAPE1" UniqueID="" Timestamp="" />
+	*< OBJECTDATA: ObjPath="pgfeFactura.Page2.grdDetaliiFacturi" UniqueID="" Timestamp="" />
+	*< OBJECTDATA: ObjPath="pgfeFactura.Page2.grdDetaliiFacturi.Column1.Header1" UniqueID="" Timestamp="" />
+	*< OBJECTDATA: ObjPath="pgfeFactura.Page2.grdDetaliiFacturi.Column1.Text1" UniqueID="" Timestamp="" />
+	*< OBJECTDATA: ObjPath="pgfeFactura.Page2.grdDetaliiFacturi.Column2.Header1" UniqueID="" Timestamp="" />
+	*< OBJECTDATA: ObjPath="pgfeFactura.Page2.grdDetaliiFacturi.Column2.Text1" UniqueID="" Timestamp="" />
+	*< OBJECTDATA: ObjPath="pgfeFactura.Page2.grdDetaliiFacturi.Column3.Header1" UniqueID="" Timestamp="" />
+	*< OBJECTDATA: ObjPath="pgfeFactura.Page2.grdDetaliiFacturi.Column3.Text1" UniqueID="" Timestamp="" />
+	*< OBJECTDATA: ObjPath="pgfeFactura.Page2.grdDetaliiFacturi.Column3._editbox1" UniqueID="" Timestamp="" />
+	*< OBJECTDATA: ObjPath="pgfeFactura.Page2.grdDetaliiFacturi.Column4.Header1" UniqueID="" Timestamp="" />
+	*< OBJECTDATA: ObjPath="pgfeFactura.Page2.grdDetaliiFacturi.Column4.Text1" UniqueID="" Timestamp="" />
+	*< OBJECTDATA: ObjPath="pgfeFactura.Page2.grdDetaliiFacturi.Column5.Header1" UniqueID="" Timestamp="" />
+	*< OBJECTDATA: ObjPath="pgfeFactura.Page2.grdDetaliiFacturi.Column5.Text1" UniqueID="" Timestamp="" />
+	*< OBJECTDATA: ObjPath="pgfeFactura.Page2.grdDetaliiFacturi.Column6.Header1" UniqueID="" Timestamp="" />
+	*< OBJECTDATA: ObjPath="pgfeFactura.Page2.grdDetaliiFacturi.Column6.Text1" UniqueID="" Timestamp="" />
+	*< OBJECTDATA: ObjPath="pgfeFactura.Page2.grdDetaliiFacturi.Column7.Header1" UniqueID="" Timestamp="" />
+	*< OBJECTDATA: ObjPath="pgfeFactura.Page2.grdDetaliiFacturi.Column7.Text1" UniqueID="" Timestamp="" />
+	*< OBJECTDATA: ObjPath="pgfeFactura.Page2.grdDetaliiFacturi.Column8.Header1" UniqueID="" Timestamp="" />
+	*< OBJECTDATA: ObjPath="pgfeFactura.Page2.grdDetaliiFacturi.Column8.Text1" UniqueID="" Timestamp="" />
+	*< OBJECTDATA: ObjPath="pgfeFactura.Page2.grdDetaliiFacturi.Column9.Header1" UniqueID="" Timestamp="" />
+	*< OBJECTDATA: ObjPath="pgfeFactura.Page2.grdDetaliiFacturi.Column9.Text1" UniqueID="" Timestamp="" />
+	*< OBJECTDATA: ObjPath="pgfeFactura.Page2.grdDetaliiFacturi.Column10.Header1" UniqueID="" Timestamp="" />
+	*< OBJECTDATA: ObjPath="pgfeFactura.Page2.grdDetaliiFacturi.Column10.Text1" UniqueID="" Timestamp="" />
 	*< OBJECTDATA: ObjPath="pgfeFactura.Page2.grdFacturiPrimite" UniqueID="" Timestamp="" />
 	*< OBJECTDATA: ObjPath="pgfeFactura.Page2.grdFacturiPrimite.cAles.Header1" UniqueID="" Timestamp="" />
 	*< OBJECTDATA: ObjPath="pgfeFactura.Page2.grdFacturiPrimite.cAles.Text1" UniqueID="" Timestamp="" />
@@ -205,38 +227,40 @@ DEFINE CLASS anaf_efactura AS _frmbase OF "_frm_base.vcx"
 	*< OBJECTDATA: ObjPath="pgfeFactura.Page2.grdFacturiPrimite.cCreditNote.Header1" UniqueID="" Timestamp="" />
 	*< OBJECTDATA: ObjPath="pgfeFactura.Page2.grdFacturiPrimite.cCreditNote.Text1" UniqueID="" Timestamp="" />
 	*< OBJECTDATA: ObjPath="pgfeFactura.Page2.grdFacturiPrimite.cCreditNote._checkbox1" UniqueID="" Timestamp="" />
-	*< OBJECTDATA: ObjPath="pgfeFactura.Page2.cmdTrimiteMesajFurnizor" UniqueID="" Timestamp="" />
-	*< OBJECTDATA: ObjPath="pgfeFactura.Page2.edtDetalii" UniqueID="" Timestamp="" />
-	*< OBJECTDATA: ObjPath="pgfeFactura.Page2.grdDetaliiFacturi" UniqueID="" Timestamp="" />
-	*< OBJECTDATA: ObjPath="pgfeFactura.Page2.grdDetaliiFacturi.Column1.Header1" UniqueID="" Timestamp="" />
-	*< OBJECTDATA: ObjPath="pgfeFactura.Page2.grdDetaliiFacturi.Column1.Text1" UniqueID="" Timestamp="" />
-	*< OBJECTDATA: ObjPath="pgfeFactura.Page2.grdDetaliiFacturi.Column2.Header1" UniqueID="" Timestamp="" />
-	*< OBJECTDATA: ObjPath="pgfeFactura.Page2.grdDetaliiFacturi.Column2.Text1" UniqueID="" Timestamp="" />
-	*< OBJECTDATA: ObjPath="pgfeFactura.Page2.grdDetaliiFacturi.Column3.Header1" UniqueID="" Timestamp="" />
-	*< OBJECTDATA: ObjPath="pgfeFactura.Page2.grdDetaliiFacturi.Column3.Text1" UniqueID="" Timestamp="" />
-	*< OBJECTDATA: ObjPath="pgfeFactura.Page2.grdDetaliiFacturi.Column3._editbox1" UniqueID="" Timestamp="" />
-	*< OBJECTDATA: ObjPath="pgfeFactura.Page2.grdDetaliiFacturi.Column4.Header1" UniqueID="" Timestamp="" />
-	*< OBJECTDATA: ObjPath="pgfeFactura.Page2.grdDetaliiFacturi.Column4.Text1" UniqueID="" Timestamp="" />
-	*< OBJECTDATA: ObjPath="pgfeFactura.Page2.grdDetaliiFacturi.Column5.Header1" UniqueID="" Timestamp="" />
-	*< OBJECTDATA: ObjPath="pgfeFactura.Page2.grdDetaliiFacturi.Column5.Text1" UniqueID="" Timestamp="" />
-	*< OBJECTDATA: ObjPath="pgfeFactura.Page2.grdDetaliiFacturi.Column6.Header1" UniqueID="" Timestamp="" />
-	*< OBJECTDATA: ObjPath="pgfeFactura.Page2.grdDetaliiFacturi.Column6.Text1" UniqueID="" Timestamp="" />
-	*< OBJECTDATA: ObjPath="pgfeFactura.Page2.grdDetaliiFacturi.Column7.Header1" UniqueID="" Timestamp="" />
-	*< OBJECTDATA: ObjPath="pgfeFactura.Page2.grdDetaliiFacturi.Column7.Text1" UniqueID="" Timestamp="" />
-	*< OBJECTDATA: ObjPath="pgfeFactura.Page2.grdDetaliiFacturi.Column8.Header1" UniqueID="" Timestamp="" />
-	*< OBJECTDATA: ObjPath="pgfeFactura.Page2.grdDetaliiFacturi.Column8.Text1" UniqueID="" Timestamp="" />
-	*< OBJECTDATA: ObjPath="pgfeFactura.Page2.grdDetaliiFacturi.Column9.Header1" UniqueID="" Timestamp="" />
-	*< OBJECTDATA: ObjPath="pgfeFactura.Page2.grdDetaliiFacturi.Column9.Text1" UniqueID="" Timestamp="" />
-	*< OBJECTDATA: ObjPath="pgfeFactura.Page2.grdDetaliiFacturi.Column10.Header1" UniqueID="" Timestamp="" />
-	*< OBJECTDATA: ObjPath="pgfeFactura.Page2.grdDetaliiFacturi.Column10.Text1" UniqueID="" Timestamp="" />
 	*< OBJECTDATA: ObjPath="pgfeFactura.Page2.lblDetalii" UniqueID="" Timestamp="" />
-	*< OBJECTDATA: ObjPath="pgfeFactura.Page2.txtMesajFurnizor" UniqueID="" Timestamp="" />
+	*< OBJECTDATA: ObjPath="pgfeFactura.Page2.edtDetalii" UniqueID="" Timestamp="" />
+	*< OBJECTDATA: ObjPath="pgfeFactura.Page2.cmdTrimiteMesajFurnizor" UniqueID="" Timestamp="" />
 	*< OBJECTDATA: ObjPath="pgfeFactura.Page2.txtMesajRaspuns" UniqueID="" Timestamp="" />
+	*< OBJECTDATA: ObjPath="pgfeFactura.Page2.txtMesajFurnizor" UniqueID="" Timestamp="" />
 	*< OBJECTDATA: ObjPath="pgfeFactura.Page2.Gridextra1" UniqueID="" Timestamp="" />
 	*< OBJECTDATA: ObjPath="pgfeFactura.Page2.lblMesajRaspuns" UniqueID="" Timestamp="" />
 	*< OBJECTDATA: ObjPath="pgfeFactura.Page2.Gridextra2" UniqueID="" Timestamp="" />
 	*< OBJECTDATA: ObjPath="pgfeFactura.Page2._grdfooter1" UniqueID="" Timestamp="" />
+	*< OBJECTDATA: ObjPath="pgfeFactura.Page2.chkDiferente" UniqueID="" Timestamp="" />
+	*< OBJECTDATA: ObjPath="pgfeFactura.Page2.chkLipsaRegistru" UniqueID="" Timestamp="" />
 	*< OBJECTDATA: ObjPath="pgfeFactura.Page3._SHAPE1" UniqueID="" Timestamp="" />
+	*< OBJECTDATA: ObjPath="pgfeFactura.Page3.grdDetaliiFacturi" UniqueID="" Timestamp="" />
+	*< OBJECTDATA: ObjPath="pgfeFactura.Page3.grdDetaliiFacturi.Column1.Header1" UniqueID="" Timestamp="" />
+	*< OBJECTDATA: ObjPath="pgfeFactura.Page3.grdDetaliiFacturi.Column1.Text1" UniqueID="" Timestamp="" />
+	*< OBJECTDATA: ObjPath="pgfeFactura.Page3.grdDetaliiFacturi.Column2.Header1" UniqueID="" Timestamp="" />
+	*< OBJECTDATA: ObjPath="pgfeFactura.Page3.grdDetaliiFacturi.Column2.Text1" UniqueID="" Timestamp="" />
+	*< OBJECTDATA: ObjPath="pgfeFactura.Page3.grdDetaliiFacturi.Column3.Header1" UniqueID="" Timestamp="" />
+	*< OBJECTDATA: ObjPath="pgfeFactura.Page3.grdDetaliiFacturi.Column3.Text1" UniqueID="" Timestamp="" />
+	*< OBJECTDATA: ObjPath="pgfeFactura.Page3.grdDetaliiFacturi.Column3._editbox1" UniqueID="" Timestamp="" />
+	*< OBJECTDATA: ObjPath="pgfeFactura.Page3.grdDetaliiFacturi.Column4.Header1" UniqueID="" Timestamp="" />
+	*< OBJECTDATA: ObjPath="pgfeFactura.Page3.grdDetaliiFacturi.Column4.Text1" UniqueID="" Timestamp="" />
+	*< OBJECTDATA: ObjPath="pgfeFactura.Page3.grdDetaliiFacturi.Column5.Header1" UniqueID="" Timestamp="" />
+	*< OBJECTDATA: ObjPath="pgfeFactura.Page3.grdDetaliiFacturi.Column5.Text1" UniqueID="" Timestamp="" />
+	*< OBJECTDATA: ObjPath="pgfeFactura.Page3.grdDetaliiFacturi.Column6.Header1" UniqueID="" Timestamp="" />
+	*< OBJECTDATA: ObjPath="pgfeFactura.Page3.grdDetaliiFacturi.Column6.Text1" UniqueID="" Timestamp="" />
+	*< OBJECTDATA: ObjPath="pgfeFactura.Page3.grdDetaliiFacturi.Column7.Header1" UniqueID="" Timestamp="" />
+	*< OBJECTDATA: ObjPath="pgfeFactura.Page3.grdDetaliiFacturi.Column7.Text1" UniqueID="" Timestamp="" />
+	*< OBJECTDATA: ObjPath="pgfeFactura.Page3.grdDetaliiFacturi.Column8.Header1" UniqueID="" Timestamp="" />
+	*< OBJECTDATA: ObjPath="pgfeFactura.Page3.grdDetaliiFacturi.Column8.Text1" UniqueID="" Timestamp="" />
+	*< OBJECTDATA: ObjPath="pgfeFactura.Page3.grdDetaliiFacturi.Column9.Header1" UniqueID="" Timestamp="" />
+	*< OBJECTDATA: ObjPath="pgfeFactura.Page3.grdDetaliiFacturi.Column9.Text1" UniqueID="" Timestamp="" />
+	*< OBJECTDATA: ObjPath="pgfeFactura.Page3.grdDetaliiFacturi.Column10.Header1" UniqueID="" Timestamp="" />
+	*< OBJECTDATA: ObjPath="pgfeFactura.Page3.grdDetaliiFacturi.Column10.Text1" UniqueID="" Timestamp="" />
 	*< OBJECTDATA: ObjPath="pgfeFactura.Page3.grdFacturiTrimise" UniqueID="" Timestamp="" />
 	*< OBJECTDATA: ObjPath="pgfeFactura.Page3.grdFacturiTrimise.cAles.Header1" UniqueID="" Timestamp="" />
 	*< OBJECTDATA: ObjPath="pgfeFactura.Page3.grdFacturiTrimise.cAles.Text1" UniqueID="" Timestamp="" />
@@ -308,30 +332,8 @@ DEFINE CLASS anaf_efactura AS _frmbase OF "_frm_base.vcx"
 	*< OBJECTDATA: ObjPath="pgfeFactura.Page3.grdFacturiTrimise.cCreditNote.Header1" UniqueID="" Timestamp="" />
 	*< OBJECTDATA: ObjPath="pgfeFactura.Page3.grdFacturiTrimise.cCreditNote.Text1" UniqueID="" Timestamp="" />
 	*< OBJECTDATA: ObjPath="pgfeFactura.Page3.grdFacturiTrimise.cCreditNote._checkbox1" UniqueID="" Timestamp="" />
-	*< OBJECTDATA: ObjPath="pgfeFactura.Page3.edtDetalii" UniqueID="" Timestamp="" />
-	*< OBJECTDATA: ObjPath="pgfeFactura.Page3.grdDetaliiFacturi" UniqueID="" Timestamp="" />
-	*< OBJECTDATA: ObjPath="pgfeFactura.Page3.grdDetaliiFacturi.Column1.Header1" UniqueID="" Timestamp="" />
-	*< OBJECTDATA: ObjPath="pgfeFactura.Page3.grdDetaliiFacturi.Column1.Text1" UniqueID="" Timestamp="" />
-	*< OBJECTDATA: ObjPath="pgfeFactura.Page3.grdDetaliiFacturi.Column2.Header1" UniqueID="" Timestamp="" />
-	*< OBJECTDATA: ObjPath="pgfeFactura.Page3.grdDetaliiFacturi.Column2.Text1" UniqueID="" Timestamp="" />
-	*< OBJECTDATA: ObjPath="pgfeFactura.Page3.grdDetaliiFacturi.Column3.Header1" UniqueID="" Timestamp="" />
-	*< OBJECTDATA: ObjPath="pgfeFactura.Page3.grdDetaliiFacturi.Column3.Text1" UniqueID="" Timestamp="" />
-	*< OBJECTDATA: ObjPath="pgfeFactura.Page3.grdDetaliiFacturi.Column3._editbox1" UniqueID="" Timestamp="" />
-	*< OBJECTDATA: ObjPath="pgfeFactura.Page3.grdDetaliiFacturi.Column4.Header1" UniqueID="" Timestamp="" />
-	*< OBJECTDATA: ObjPath="pgfeFactura.Page3.grdDetaliiFacturi.Column4.Text1" UniqueID="" Timestamp="" />
-	*< OBJECTDATA: ObjPath="pgfeFactura.Page3.grdDetaliiFacturi.Column5.Header1" UniqueID="" Timestamp="" />
-	*< OBJECTDATA: ObjPath="pgfeFactura.Page3.grdDetaliiFacturi.Column5.Text1" UniqueID="" Timestamp="" />
-	*< OBJECTDATA: ObjPath="pgfeFactura.Page3.grdDetaliiFacturi.Column6.Header1" UniqueID="" Timestamp="" />
-	*< OBJECTDATA: ObjPath="pgfeFactura.Page3.grdDetaliiFacturi.Column6.Text1" UniqueID="" Timestamp="" />
-	*< OBJECTDATA: ObjPath="pgfeFactura.Page3.grdDetaliiFacturi.Column7.Header1" UniqueID="" Timestamp="" />
-	*< OBJECTDATA: ObjPath="pgfeFactura.Page3.grdDetaliiFacturi.Column7.Text1" UniqueID="" Timestamp="" />
-	*< OBJECTDATA: ObjPath="pgfeFactura.Page3.grdDetaliiFacturi.Column8.Header1" UniqueID="" Timestamp="" />
-	*< OBJECTDATA: ObjPath="pgfeFactura.Page3.grdDetaliiFacturi.Column8.Text1" UniqueID="" Timestamp="" />
-	*< OBJECTDATA: ObjPath="pgfeFactura.Page3.grdDetaliiFacturi.Column9.Header1" UniqueID="" Timestamp="" />
-	*< OBJECTDATA: ObjPath="pgfeFactura.Page3.grdDetaliiFacturi.Column9.Text1" UniqueID="" Timestamp="" />
-	*< OBJECTDATA: ObjPath="pgfeFactura.Page3.grdDetaliiFacturi.Column10.Header1" UniqueID="" Timestamp="" />
-	*< OBJECTDATA: ObjPath="pgfeFactura.Page3.grdDetaliiFacturi.Column10.Text1" UniqueID="" Timestamp="" />
 	*< OBJECTDATA: ObjPath="pgfeFactura.Page3.lblDetalii" UniqueID="" Timestamp="" />
+	*< OBJECTDATA: ObjPath="pgfeFactura.Page3.edtDetalii" UniqueID="" Timestamp="" />
 	*< OBJECTDATA: ObjPath="pgfeFactura.Page3.txtMesajTrimis" UniqueID="" Timestamp="" />
 	*< OBJECTDATA: ObjPath="pgfeFactura.Page3.txtMesajRaspuns" UniqueID="" Timestamp="" />
 	*< OBJECTDATA: ObjPath="pgfeFactura.Page3.Gridextra1" UniqueID="" Timestamp="" />
@@ -339,28 +341,30 @@ DEFINE CLASS anaf_efactura AS _frmbase OF "_frm_base.vcx"
 	*< OBJECTDATA: ObjPath="pgfeFactura.Page3.lblMesajRaspuns" UniqueID="" Timestamp="" />
 	*< OBJECTDATA: ObjPath="pgfeFactura.Page3.Gridextra2" UniqueID="" Timestamp="" />
 	*< OBJECTDATA: ObjPath="pgfeFactura.Page3._grdfooter1" UniqueID="" Timestamp="" />
+	*< OBJECTDATA: ObjPath="pgfeFactura.Page3.chkDiferente" UniqueID="" Timestamp="" />
+	*< OBJECTDATA: ObjPath="pgfeFactura.Page3.chkLipsaRegistru" UniqueID="" Timestamp="" />
 	*< OBJECTDATA: ObjPath="pgfeFactura.Page4.lblToken" UniqueID="" Timestamp="" />
 	*< OBJECTDATA: ObjPath="pgfeFactura.Page4.txtSaveFurnizoriPath" UniqueID="" Timestamp="" />
 	*< OBJECTDATA: ObjPath="pgfeFactura.Page4.txtSaveFurnizoriFile" UniqueID="" Timestamp="" />
 	*< OBJECTDATA: ObjPath="pgfeFactura.Page4.txtSaveClientiPath" UniqueID="" Timestamp="" />
 	*< OBJECTDATA: ObjPath="pgfeFactura.Page4.txtSaveClientiFile" UniqueID="" Timestamp="" />
-	*< OBJECTDATA: ObjPath="pgfeFactura.Page4.txtResponsesPathLocal" UniqueID="" Timestamp="" />
-	*< OBJECTDATA: ObjPath="pgfeFactura.Page4.txtResponsesPathServer" UniqueID="" Timestamp="" />
-	*< OBJECTDATA: ObjPath="pgfeFactura.Page4.txtServerPath" UniqueID="" Timestamp="" />
-	*< OBJECTDATA: ObjPath="pgfeFactura.Page4._label4" UniqueID="" Timestamp="" />
-	*< OBJECTDATA: ObjPath="pgfeFactura.Page4._label2" UniqueID="" Timestamp="" />
-	*< OBJECTDATA: ObjPath="pgfeFactura.Page4._label3" UniqueID="" Timestamp="" />
-	*< OBJECTDATA: ObjPath="pgfeFactura.Page4._checkbox3" UniqueID="" Timestamp="" />
-	*< OBJECTDATA: ObjPath="pgfeFactura.Page4._checkbox1" UniqueID="" Timestamp="" />
-	*< OBJECTDATA: ObjPath="pgfeFactura.Page4.chkValidareOnline" UniqueID="" Timestamp="" />
-	*< OBJECTDATA: ObjPath="pgfeFactura.Page4._checkbox2" UniqueID="" Timestamp="" />
-	*< OBJECTDATA: ObjPath="pgfeFactura.Page4._label1" UniqueID="" Timestamp="" />
-	*< OBJECTDATA: ObjPath="pgfeFactura.Page4._label5" UniqueID="" Timestamp="" />
-	*< OBJECTDATA: ObjPath="pgfeFactura.Page4.lblMesajTrimis" UniqueID="" Timestamp="" />
-	*< OBJECTDATA: ObjPath="pgfeFactura.Page4._label6" UniqueID="" Timestamp="" />
 	*< OBJECTDATA: ObjPath="pgfeFactura.Page4.txtNetworkPath" UniqueID="" Timestamp="" />
-	*< OBJECTDATA: ObjPath="pgfeFactura.Page4._label7" UniqueID="" Timestamp="" />
+	*< OBJECTDATA: ObjPath="pgfeFactura.Page4.txtServerPath" UniqueID="" Timestamp="" />
+	*< OBJECTDATA: ObjPath="pgfeFactura.Page4.txtResponsesPathServer" UniqueID="" Timestamp="" />
 	*< OBJECTDATA: ObjPath="pgfeFactura.Page4._label8" UniqueID="" Timestamp="" />
+	*< OBJECTDATA: ObjPath="pgfeFactura.Page4._label7" UniqueID="" Timestamp="" />
+	*< OBJECTDATA: ObjPath="pgfeFactura.Page4.txtResponsesPathLocal" UniqueID="" Timestamp="" />
+	*< OBJECTDATA: ObjPath="pgfeFactura.Page4._label6" UniqueID="" Timestamp="" />
+	*< OBJECTDATA: ObjPath="pgfeFactura.Page4.lblMesajTrimis" UniqueID="" Timestamp="" />
+	*< OBJECTDATA: ObjPath="pgfeFactura.Page4._label5" UniqueID="" Timestamp="" />
+	*< OBJECTDATA: ObjPath="pgfeFactura.Page4._label1" UniqueID="" Timestamp="" />
+	*< OBJECTDATA: ObjPath="pgfeFactura.Page4._label3" UniqueID="" Timestamp="" />
+	*< OBJECTDATA: ObjPath="pgfeFactura.Page4._label2" UniqueID="" Timestamp="" />
+	*< OBJECTDATA: ObjPath="pgfeFactura.Page4._label4" UniqueID="" Timestamp="" />
+	*< OBJECTDATA: ObjPath="pgfeFactura.Page4._checkbox2" UniqueID="" Timestamp="" />
+	*< OBJECTDATA: ObjPath="pgfeFactura.Page4.chkValidareOnline" UniqueID="" Timestamp="" />
+	*< OBJECTDATA: ObjPath="pgfeFactura.Page4._checkbox1" UniqueID="" Timestamp="" />
+	*< OBJECTDATA: ObjPath="pgfeFactura.Page4._checkbox3" UniqueID="" Timestamp="" />
 	*< OBJECTDATA: ObjPath="But_sterge1" UniqueID="" Timestamp="" />
 	*< OBJECTDATA: ObjPath="But_listare1" UniqueID="" Timestamp="" />
 	*< OBJECTDATA: ObjPath="chkTest" UniqueID="" Timestamp="" />
@@ -2251,7 +2255,7 @@ DEFINE CLASS anaf_efactura AS _frmbase OF "_frm_base.vcx"
 		ctotallabelexpression = 'Total', ;
 		Left = 4, ;
 		Name = "_grdfooter1", ;
-		Top = 133, ;
+		Top = 113, ;
 		Width = 780
 		*< END OBJECT: ClassLib="_grd_base.vcx" BaseClass="grid" />
 
@@ -2268,6 +2272,38 @@ DEFINE CLASS anaf_efactura AS _frmbase OF "_frm_base.vcx"
 		ZOrderSet = 0
 		*< END OBJECT: ClassLib="_baza.vcx" BaseClass="shape" />
 
+	ADD OBJECT 'pgfeFactura.Page2.chkDiferente' AS _checkbox WITH ;
+		Alignment = 0, ;
+		Anchor = 6, ;
+		AutoSize = .F., ;
+		BackColor = 100,255,255, ;
+		BackStyle = 1, ;
+		Caption = "Cu diferente Reg. Cumparari", ;
+		Height = 25, ;
+		Left = 7, ;
+		Name = "chkDiferente", ;
+		Style = 0, ;
+		Top = 151, ;
+		Value = .F., ;
+		Width = 205
+		*< END OBJECT: ClassLib="_baza.vcx" BaseClass="checkbox" />
+
+	ADD OBJECT 'pgfeFactura.Page2.chkLipsaRegistru' AS _checkbox WITH ;
+		Alignment = 0, ;
+		Anchor = 6, ;
+		AutoSize = .F., ;
+		BackColor = 225,225,225, ;
+		BackStyle = 1, ;
+		Caption = "Lipsa din Reg. Cumparari", ;
+		Height = 25, ;
+		Left = 217, ;
+		Name = "chkLipsaRegistru", ;
+		Style = 0, ;
+		Top = 151, ;
+		Value = .F., ;
+		Width = 190
+		*< END OBJECT: ClassLib="_baza.vcx" BaseClass="checkbox" />
+
 	ADD OBJECT 'pgfeFactura.Page2.cmdTrimiteMesajFurnizor' AS cmd_executa WITH ;
 		Anchor = 6, ;
 		AutoSize = .F., ;
@@ -2584,7 +2620,7 @@ DEFINE CLASS anaf_efactura AS _frmbase OF "_frm_base.vcx"
 		FontSize = 10, ;
 		GridLineColor = 192,192,192, ;
 		HeaderHeight = 37, ;
-		Height = 132, ;
+		Height = 112, ;
 		lcamptextneeditabil = .F., ;
 		Left = 4, ;
 		Name = "grdFacturiPrimite", ;
@@ -3549,7 +3585,7 @@ DEFINE CLASS anaf_efactura AS _frmbase OF "_frm_base.vcx"
 		ctotallabelexpression = 'Total', ;
 		Left = 4, ;
 		Name = "_grdfooter1", ;
-		Top = 133, ;
+		Top = 113, ;
 		Width = 780
 		*< END OBJECT: ClassLib="_grd_base.vcx" BaseClass="grid" />
 
@@ -3566,6 +3602,38 @@ DEFINE CLASS anaf_efactura AS _frmbase OF "_frm_base.vcx"
 		ZOrderSet = 0
 		*< END OBJECT: ClassLib="_baza.vcx" BaseClass="shape" />
 
+	ADD OBJECT 'pgfeFactura.Page3.chkDiferente' AS _checkbox WITH ;
+		Alignment = 0, ;
+		Anchor = 6, ;
+		AutoSize = .F., ;
+		BackColor = 100,255,255, ;
+		BackStyle = 1, ;
+		Caption = "Cu diferente Reg. Vanzari", ;
+		Height = 25, ;
+		Left = 7, ;
+		Name = "chkDiferente", ;
+		Style = 0, ;
+		Top = 151, ;
+		Value = .F., ;
+		Width = 205
+		*< END OBJECT: ClassLib="_baza.vcx" BaseClass="checkbox" />
+
+	ADD OBJECT 'pgfeFactura.Page3.chkLipsaRegistru' AS _checkbox WITH ;
+		Alignment = 0, ;
+		Anchor = 6, ;
+		AutoSize = .F., ;
+		BackColor = 225,225,225, ;
+		BackStyle = 1, ;
+		Caption = "Lipsa din Reg. Vanzari", ;
+		Height = 25, ;
+		Left = 217, ;
+		Name = "chkLipsaRegistru", ;
+		Style = 0, ;
+		Top = 151, ;
+		Value = .F., ;
+		Width = 190
+		*< END OBJECT: ClassLib="_baza.vcx" BaseClass="checkbox" />
+
 	ADD OBJECT 'pgfeFactura.Page3.edtDetalii' AS _editbox WITH ;
 		Anchor = 14, ;
 		ControlSource = "crsFacturiTrimise.detalii", ;
@@ -3868,7 +3936,7 @@ DEFINE CLASS anaf_efactura AS _frmbase OF "_frm_base.vcx"
 		FontSize = 10, ;
 		GridLineColor = 192,192,192, ;
 		HeaderHeight = 37, ;
-		Height = 132, ;
+		Height = 112, ;
 		lcamptextneeditabil = .F., ;
 		Left = 4, ;
 		Name = "grdFacturiTrimise", ;
@@ -5295,7 +5363,7 @@ DEFINE CLASS anaf_efactura AS _frmbase OF "_frm_base.vcx"
 
 	PROCEDURE do_cauta
 		LOCAL lcfiltru, lcFiltru2, lcFiltru3, lcval1, lcColoana, ldData1, ldData2
-		Local lcData1, lcData2, llErori, llNetrimise, llPJ, llTrimise, llDiferente, lnActivePage
+		Local lcData1, lcData2, llErori, llNetrimise, llPJ, llTrimise, llDiferente, lnActivePage, lcCond, lcDif2, lcDif3, lcLipsa
 		
 		WAIT WINDOW 'Selectie inregistrari...' NOWAIT 
 		
@@ -5334,7 +5402,7 @@ DEFINE CLASS anaf_efactura AS _frmbase OF "_frm_base.vcx"
 		* Facturile trimise/primite de pe serverul TEST/productie ANAF
 		lcFiltru = lcFiltru + [ and test = ] + IIF(Thisform.oAnaf.lTest, [1], [0])
 		lcFiltru2 = lcFiltru2 + [ and test = ] + IIF(Thisform.oAnaf.lTest, [1], [0])
-		lcFiltru3 = lcFiltru2 + [ and test = ] + IIF(Thisform.oAnaf.lTest, [1], [0])
+		lcFiltru3 = lcFiltru3 + [ and test = ] + IIF(Thisform.oAnaf.lTest, [1], [0])
 		
 		* Filtre buton cautare
 		IF LEN(THISFORM.filtru_pretty)>0     
@@ -5348,7 +5416,38 @@ DEFINE CLASS anaf_efactura AS _frmbase OF "_frm_base.vcx"
 		ENDIF 
 		
 		IF m.llDiferente
-			lcFiltru = m.lcFiltru + " and (ABS(ROUND(NVL(xtotal_cu_tva , 0.00) * decode(in_valuta,1,curs,1), 2)-NVL(jtotctva, 0.00)) not between 0 and 0.5)"
+			lcFiltru = m.lcFiltru + " and (jtotctva is null or ABS(decode(creditnote,0,1,-1) * ROUND(NVL(xtotal_cu_tva , 0.00) * decode(in_valuta,1,curs,1), 2)-NVL(jtotctva, 0.00)) > 0.15)"
+		ENDIF 
+		
+		* Bifele Diferente / Lipsa din registrul de TVA de pe paginile Primite si Trimise
+		lcLipsa = [(jtotctva is null)]
+		lcDif2 = [(jtotctva is not null and (NVL(nume_valuta,'RON') <> 'RON' or ABS(decode(creditnote,0,1,-1) * NVL(total_cu_tva, 0.00)-(NVL(jtotctva, 0.00)-NVL(jtva_ti, 0.00))) > 0.15))]
+		lcDif3 = [(jtotctva is not null and (NVL(nume_valuta,'RON') <> 'RON' or ABS(decode(creditnote,0,1,-1) * NVL(total_cu_tva, 0.00)-NVL(jtotctva, 0.00)) > 0.15))]
+		
+		lcCond = []
+		WITH this.pgfeFactura.page2
+			IF .chkDiferente.Value
+				lcCond = m.lcDif2
+			ENDIF 
+			IF .chkLipsaRegistru.Value
+				lcCond = IIF(EMPTY(m.lcCond), m.lcLipsa, m.lcCond + [ or ] + m.lcLipsa)
+			ENDIF 
+		ENDWITH 
+		IF !EMPTY(m.lcCond)
+			lcFiltru2 = m.lcFiltru2 + [ and (] + m.lcCond + [)]
+		ENDIF 
+		
+		lcCond = []
+		WITH this.pgfeFactura.page3
+			IF .chkDiferente.Value
+				lcCond = m.lcDif3
+			ENDIF 
+			IF .chkLipsaRegistru.Value
+				lcCond = IIF(EMPTY(m.lcCond), m.lcLipsa, m.lcCond + [ or ] + m.lcLipsa)
+			ENDIF 
+		ENDWITH 
+		IF !EMPTY(m.lcCond)
+			lcFiltru3 = m.lcFiltru3 + [ and (] + m.lcCond + [)]
 		ENDIF 
 		
 		DO CASE 
@@ -6026,8 +6125,11 @@ DEFINE CLASS anaf_efactura AS _frmbase OF "_frm_base.vcx"
 		
 		* Colorez randurile facturi emise netrimise 
 		WITH this.pgfeFactura.page1.grdFacturiEmise
-			* backcolor: rosu = ERORI FACTURA, galben = facturi netrimise, roz = facturi trimise fara raspuns, gri = diferenta fata de Jurnalul TVA, alb = facturi trimise
+			* backcolor: rosu = ERORI FACTURA, galben = facturi netrimise, roz = facturi trimise fara raspuns, gri = nu e in Registrul de Vanzari, turcuaz = diferenta peste 0.15 lei, alb = se potriveste
-			.SetAll("DynamicBackColor","IIF(ALLTRIM(NVL(tip_mesaj_raspuns,'')) = 'ERORI FACTURA', RGB(255,140,140), IIF(NVL(trimis,0) = 0, RGB(255,255,240), IIF(EMPTY(NVL(data_raspuns, {})), RGB(255,165,255), IIF(diferenta <> 0, RGB(235,235,235), RGB(255,255,255)))))", "Column")
+			*!* sirul e spart in doua: VFP nu accepta constante sir peste 255 caractere
+			.SetAll("DynamicBackColor", ;
+				"IIF(ALLTRIM(NVL(tip_mesaj_raspuns,'')) = 'ERORI FACTURA', RGB(255,140,140), IIF(NVL(trimis,0) = 0, RGB(255,255,240), IIF(EMPTY(NVL(data_raspuns, {})), RGB(255,165,255), " + ;
+				"IIF(ISNULL(jtotctva), RGB(225,225,225), IIF(ISNULL(diferenta) OR ABS(NVL(diferenta,0)) > 0.15, RGB(100,255,255), RGB(255,255,255))))))", "Column")
 		
 			* Colorez forecolor pentru Persoane Fizice, si pentru creditnote
 			.SetAll("DynamicForeColor","IIF(tip_persoana = 2, RGB(0,128,192), IIF(creditnote = 1, RGB(255,0,0), RGB(0,0,0)))", "Column")
@@ -6403,6 +6505,14 @@ DEFINE CLASS anaf_efactura AS _frmbase OF "_frm_base.vcx"
 		this.edtDetalii.Refresh()
 	ENDPROC
 
+	PROCEDURE pgfeFactura.Page2.chkDiferente.Valid
+		Thisform.do_cauta()
+	ENDPROC
+
+	PROCEDURE pgfeFactura.Page2.chkLipsaRegistru.Valid
+		Thisform.do_cauta()
+	ENDPROC
+
 	PROCEDURE pgfeFactura.Page2.cmdTrimiteMesajFurnizor.Click
 		Thisform.TrimiteMesajFurnizor()
 	ENDPROC
@@ -6470,6 +6580,14 @@ DEFINE CLASS anaf_efactura AS _frmbase OF "_frm_base.vcx"
 		this.edtDetalii.Refresh()
 	ENDPROC
 
+	PROCEDURE pgfeFactura.Page3.chkDiferente.Valid
+		Thisform.do_cauta()
+	ENDPROC
+
+	PROCEDURE pgfeFactura.Page3.chkLipsaRegistru.Valid
+		Thisform.do_cauta()
+	ENDPROC
+
 	PROCEDURE pgfeFactura.Page3.Deactivate
 		this.FontBold = .F.
 	ENDPROC
@@ -8705,40 +8823,42 @@ DEFINE CLASS frm_import_efactura AS _frmbase OF "_frm_base.vcx"
 	*< OBJECTDATA: ObjPath="But_excel1" UniqueID="" Timestamp="" />
 	*< OBJECTDATA: ObjPath="But_reset_criterii1" UniqueID="" Timestamp="" />
 	*< OBJECTDATA: ObjPath="But_listare1" UniqueID="" Timestamp="" />
+	*< OBJECTDATA: ObjPath="Cmd_executa2" UniqueID="" Timestamp="" />
 	*< OBJECTDATA: ObjPath="Cmd_executa1" UniqueID="" Timestamp="" />
 	*< OBJECTDATA: ObjPath="lblNrAct" UniqueID="" Timestamp="" />
 	*< OBJECTDATA: ObjPath="txtNrAct" UniqueID="" Timestamp="" />
 	*< OBJECTDATA: ObjPath="lblDataAct" UniqueID="" Timestamp="" />
+	*< OBJECTDATA: ObjPath="_label1" UniqueID="" Timestamp="" />
 	*< OBJECTDATA: ObjPath="txtDataAct" UniqueID="" Timestamp="" />
 	*< OBJECTDATA: ObjPath="lblDataScad" UniqueID="" Timestamp="" />
 	*< OBJECTDATA: ObjPath="txtDataScad" UniqueID="" Timestamp="" />
 	*< OBJECTDATA: ObjPath="lblSerieAct" UniqueID="" Timestamp="" />
 	*< OBJECTDATA: ObjPath="txtSerieAct" UniqueID="" Timestamp="" />
+	*< OBJECTDATA: ObjPath="lblResponsabil" UniqueID="" Timestamp="" />
+	*< OBJECTDATA: ObjPath="txtResponsabil" UniqueID="" Timestamp="" />
+	*< OBJECTDATA: ObjPath="lblVenChelt" UniqueID="" Timestamp="" />
+	*< OBJECTDATA: ObjPath="txtVenChelt" UniqueID="" Timestamp="" />
+	*< OBJECTDATA: ObjPath="lblSectie" UniqueID="" Timestamp="" />
+	*< OBJECTDATA: ObjPath="txtExplicatia" UniqueID="" Timestamp="" />
+	*< OBJECTDATA: ObjPath="txtSectie" UniqueID="" Timestamp="" />
+	*< OBJECTDATA: ObjPath="lblContract" UniqueID="" Timestamp="" />
+	*< OBJECTDATA: ObjPath="txtContract" UniqueID="" Timestamp="" />
+	*< OBJECTDATA: ObjPath="lblLucrare" UniqueID="" Timestamp="" />
+	*< OBJECTDATA: ObjPath="txtLucrare" UniqueID="" Timestamp="" />
 	*< OBJECTDATA: ObjPath="lblPartener" UniqueID="" Timestamp="" />
-	*< OBJECTDATA: ObjPath="txtCodFiscal" UniqueID="" Timestamp="" />
-	*< OBJECTDATA: ObjPath="chkDistribuieDiscount" UniqueID="" Timestamp="" />
 	*< OBJECTDATA: ObjPath="txtPartener" UniqueID="" Timestamp="" />
 	*< OBJECTDATA: ObjPath="chkTVAIncasare" UniqueID="" Timestamp="" />
 	*< OBJECTDATA: ObjPath="lblValuta" UniqueID="" Timestamp="" />
 	*< OBJECTDATA: ObjPath="txtValuta" UniqueID="" Timestamp="" />
-	*< OBJECTDATA: ObjPath="txtAcont" UniqueID="" Timestamp="" />
-	*< OBJECTDATA: ObjPath="lblCurs" UniqueID="" Timestamp="" />
-	*< OBJECTDATA: ObjPath="txtCurs" UniqueID="" Timestamp="" />
 	*< OBJECTDATA: ObjPath="lblCont" UniqueID="" Timestamp="" />
 	*< OBJECTDATA: ObjPath="txtCont" UniqueID="" Timestamp="" />
-	*< OBJECTDATA: ObjPath="lblLucrare" UniqueID="" Timestamp="" />
+	*< OBJECTDATA: ObjPath="lblCurs" UniqueID="" Timestamp="" />
-	*< OBJECTDATA: ObjPath="txtLucrare" UniqueID="" Timestamp="" />
+	*< OBJECTDATA: ObjPath="txtCurs" UniqueID="" Timestamp="" />
-	*< OBJECTDATA: ObjPath="lblContract" UniqueID="" Timestamp="" />
+	*< OBJECTDATA: ObjPath="txtCodFiscal" UniqueID="" Timestamp="" />
-	*< OBJECTDATA: ObjPath="txtContract" UniqueID="" Timestamp="" />
+	*< OBJECTDATA: ObjPath="txtAcont" UniqueID="" Timestamp="" />
-	*< OBJECTDATA: ObjPath="lblSectie" UniqueID="" Timestamp="" />
+	*< OBJECTDATA: ObjPath="chkDistribuieDiscount" UniqueID="" Timestamp="" />
-	*< OBJECTDATA: ObjPath="txtSectie" UniqueID="" Timestamp="" />
+	*< OBJECTDATA: ObjPath="chkDiferente" UniqueID="" Timestamp="" />
-	*< OBJECTDATA: ObjPath="lblVenChelt" UniqueID="" Timestamp="" />
+	*< OBJECTDATA: ObjPath="chkLipsaRegistru" UniqueID="" Timestamp="" />
-	*< OBJECTDATA: ObjPath="txtVenChelt" UniqueID="" Timestamp="" />
-	*< OBJECTDATA: ObjPath="lblResponsabil" UniqueID="" Timestamp="" />
-	*< OBJECTDATA: ObjPath="txtResponsabil" UniqueID="" Timestamp="" />
-	*< OBJECTDATA: ObjPath="Cmd_executa2" UniqueID="" Timestamp="" />
-	*< OBJECTDATA: ObjPath="txtExplicatia" UniqueID="" Timestamp="" />
-	*< OBJECTDATA: ObjPath="_label1" UniqueID="" Timestamp="" />
 	*< OBJECTDATA: ObjPath="but_tip" UniqueID="" Timestamp="" />
 	*< OBJECTDATA: ObjPath="but_cont" UniqueID="" Timestamp="" />
 	*< OBJECTDATA: ObjPath="but_gestiune" UniqueID="" Timestamp="" />
@@ -8970,6 +9090,22 @@ DEFINE CLASS frm_import_efactura AS _frmbase OF "_frm_base.vcx"
 		Width = 155
 		*< END OBJECT: ClassLib="_baza.vcx" BaseClass="combobox" />
 
+	ADD OBJECT 'chkDiferente' AS _checkbox WITH ;
+		Alignment = 0, ;
+		Anchor = 0, ;
+		AutoSize = .F., ;
+		BackColor = 100,255,255, ;
+		BackStyle = 1, ;
+		Caption = "Cu diferente Reg. TVA", ;
+		Height = 18, ;
+		Left = 180, ;
+		Name = "chkDiferente", ;
+		Style = 0, ;
+		Top = 35, ;
+		Value = .F., ;
+		Width = 159
+		*< END OBJECT: ClassLib="_baza.vcx" BaseClass="checkbox" />
+
 	ADD OBJECT 'chkDistribuieDiscount' AS _checkbox WITH ;
 		Alignment = 0, ;
 		Anchor = 0, ;
@@ -8987,6 +9123,22 @@ DEFINE CLASS frm_import_efactura AS _frmbase OF "_frm_base.vcx"
 		ZOrderSet = 23
 		*< END OBJECT: ClassLib="_baza.vcx" BaseClass="checkbox" />
 
+	ADD OBJECT 'chkLipsaRegistru' AS _checkbox WITH ;
+		Alignment = 0, ;
+		Anchor = 0, ;
+		AutoSize = .F., ;
+		BackColor = 225,225,225, ;
+		BackStyle = 1, ;
+		Caption = "Lipsa din Reg. TVA", ;
+		Height = 18, ;
+		Left = 9, ;
+		Name = "chkLipsaRegistru", ;
+		Style = 0, ;
+		Top = 35, ;
+		Value = .F., ;
+		Width = 159
+		*< END OBJECT: ClassLib="_baza.vcx" BaseClass="checkbox" />
+
 	ADD OBJECT 'chkTVAIncasare' AS _checkbox WITH ;
 		Alignment = 0, ;
 		Anchor = 0, ;
@@ -9808,7 +9960,7 @@ DEFINE CLASS frm_import_efactura AS _frmbase OF "_frm_base.vcx"
 		FontSize = 10, ;
 		GridLineColor = 192,192,192, ;
 		HeaderHeight = 37, ;
-		Height = 265, ;
+		Height = 245, ;
 		lcamptextneeditabil = .F., ;
 		Left = 7, ;
 		Name = "grdFacturi", ;
@@ -9818,7 +9970,7 @@ DEFINE CLASS frm_import_efactura AS _frmbase OF "_frm_base.vcx"
 		RecordSource = "crsFacturi", ;
 		RowHeight = 19, ;
 		TabIndex = 22, ;
-		Top = 39, ;
+		Top = 57, ;
 		Width = 780, ;
 		ZOrderSet = 3, ;
 		Column1.BackColor = 255,255,255, ;
@@ -11379,6 +11531,7 @@ DEFINE CLASS frm_import_efactura AS _frmbase OF "_frm_base.vcx"
 	ENDPROC
 
 	PROCEDURE do_cauta
+		Local lcCond, lcDif, lcLipsa
 		lcFiltru = '' && filtru facturi primite
 		
 		* DACA FILTRUL NU CONTINE DATA_ACT, SELECTEZ DOAR INREGISTRARILE DIN LUNA CURENTA PANA LA ZI
@@ -11394,6 +11547,20 @@ DEFINE CLASS frm_import_efactura AS _frmbase OF "_frm_base.vcx"
 			lcFiltru = m.lcFiltru + [ and ((data_act >= to_date('] + m.lcData1 + [','ddmmyyyy') and data_act < to_date('] + m.lcData2 + [','ddmmyyyy')) or (data_act is null and data_raspuns >= to_date('] + m.lcData1 + [','ddmmyyyy')))]
 		ENDIF
 		
+		* Bifele Diferente / Lipsa din registrul de TVA
+		lcLipsa = [(jtotctva is null)]
+		lcDif = [(jtotctva is not null and (NVL(nume_valuta,'RON') <> 'RON' or ABS(decode(creditnote,0,1,-1) * NVL(total_cu_tva,0.00) - (NVL(jtotctva,0.00) - NVL(jtva_ti,0.00))) > 0.15))]
+		lcCond = []
+		IF this.chkDiferente.Value
+			lcCond = m.lcDif
+		ENDIF 
+		IF this.chkLipsaRegistru.Value
+			lcCond = IIF(EMPTY(m.lcCond), m.lcLipsa, m.lcCond + [ or ] + m.lcLipsa)
+		ENDIF 
+		IF !EMPTY(m.lcCond)
+			lcFiltru = m.lcFiltru + [ and (] + m.lcCond + [)]
+		ENDIF 
+		
 		* Filtre buton cautare
 		IF LEN(THISFORM.filtru_pretty)>0     
 			lcFiltru = m.lcFiltru + " and (" + ALLTRIM(THISFORM.filtru_pretty) + ")"    	
@@ -13124,6 +13291,14 @@ DEFINE CLASS frm_import_efactura AS _frmbase OF "_frm_base.vcx"
 		thisform.grdDetaliiFacturi.Refresh()
 	ENDPROC
 
+	PROCEDURE chkDiferente.Valid
+		Thisform.do_cauta()
+	ENDPROC
+
+	PROCEDURE chkLipsaRegistru.Valid
+		Thisform.do_cauta()
+	ENDPROC
+
 	PROCEDURE Cmd_executa2.Click
 		lcSql = "select cont, explicatie, tip_sold from vplcont_used where an=?gnAn and tip_cont = 0 order by cont"
 		llSucces = goExecutor.oExecuta(m.lcSql, "crsPlCont")

programe/anaf_efactura.prg

@@ -2909,12 +2909,13 @@ SELECT 0 as ales, id, id_fact, data_act, data_scad, numar_act, xfurnizor, xclien
 		Select crsFacturiTrimise
 		Go Top
 
+		*!* diferenta ramane goala cand factura nu e in Registrul de Vanzari, ca la facturile primite/trimise
 		* FACTURI EMISE
 		Text To lcSchema Noshow
-ales N(1), id N(20), id_fact N(20), id_vanzare N(10), data_act D, numar_act N(14), in_valuta N(1) null, curs N(10,4) null, valval N(16,2), tvaval N(16,2),totval N(16,2), total_fara_tva N(16,2), total_tva N(16,2), total_cu_tva N(16,2), nume_valuta C(5) null, client C(100), id_client N(10), cod_fiscal C(30), tip_persoana N(1) null, trimis N(1) null, data_trimis T null, stare C(100) null, id_incarcare C(36) null, mesaj_trimis C(250) null, id_descarcare c(36) null, tip_mesaj_raspuns C(50) null,mesaj_raspuns C(250) null, data_raspuns D null, cod_fiscal_emitent C(30) null, cod_fiscal_beneficiar C(30) null, detalii M null, xfurnizor C(200), xclient C(200), xdata_act D, xnumar_act C(30), xtotal_fara_tva N(16,4), xtotal_tva N(16,4), xtotal_tva_ron N(16,4), xtotal_cu_tva N(16,4), xdiscount_fara_tva N(16,4), xtaxe_fara_tva N(16,4), xvaloare_fara_tva N(16,4), xtotal_de_plata N(16,4), xnume_valuta C(5), test N(1) null, id_util N(10), utilizator C(100), jtotctva N(16,4), diferenta N(16,4), procesat  N(1), procesat_server N(1), creditnote N(1)
+ales N(1), id N(20), id_fact N(20), id_vanzare N(10), data_act D, numar_act N(14), in_valuta N(1) null, curs N(10,4) null, valval N(16,2), tvaval N(16,2),totval N(16,2), total_fara_tva N(16,2), total_tva N(16,2), total_cu_tva N(16,2), nume_valuta C(5) null, client C(100), id_client N(10), cod_fiscal C(30), tip_persoana N(1) null, trimis N(1) null, data_trimis T null, stare C(100) null, id_incarcare C(36) null, mesaj_trimis C(250) null, id_descarcare c(36) null, tip_mesaj_raspuns C(50) null,mesaj_raspuns C(250) null, data_raspuns D null, cod_fiscal_emitent C(30) null, cod_fiscal_beneficiar C(30) null, detalii M null, xfurnizor C(200), xclient C(200), xdata_act D, xnumar_act C(30), xtotal_fara_tva N(16,4), xtotal_tva N(16,4), xtotal_tva_ron N(16,4), xtotal_cu_tva N(16,4), xdiscount_fara_tva N(16,4), xtaxe_fara_tva N(16,4), xvaloare_fara_tva N(16,4), xtotal_de_plata N(16,4), xnume_valuta C(5), test N(1) null, id_util N(10), utilizator C(100), jtotctva N(16,4) null, diferenta N(16,4) null, procesat  N(1), procesat_server N(1), creditnote N(1)
 		Endtext
 		Text To lcSelect Noshow
-SELECT 0 as ales, id, id_fact, id_vanzare, data_act, numar_act, in_valuta, curs, valval, tvaval, totval, total_fara_tva, total_tva,total_cu_tva, nume_valuta, client, id_client, cod_fiscal, NVL(tip_persoana,1) as tip_persoana, NVL(trimis,0) as trimis, data_trimis, stare, id_incarcare, mesaj_trimis, id_descarcare, tip_mesaj_raspuns, mesaj_raspuns, data_raspuns, cod_fiscal_emitent, cod_fiscal_beneficiar, '' as detalii, xfurnizor, xclient, xdata_act, xnumar_act, xtotal_fara_tva, xtotal_tva, xtotal_tva_ron, xtotal_cu_tva, xdiscount_fara_tva, xtaxe_fara_tva, xvaloare_fara_tva, xtotal_de_plata, xnume_valuta, test, id_util, utilizator, jtotctva, decode(creditnote,0,1,-1) * ROUND(NVL(xtotal_cu_tva , 0.00) * decode(in_valuta,1,curs,1), 2)-NVL(jtotctva, 0.00) as diferenta, procesat, procesat_server,creditnote FROM anaf_vefactura_emis
+SELECT 0 as ales, id, id_fact, id_vanzare, data_act, numar_act, in_valuta, curs, valval, tvaval, totval, total_fara_tva, total_tva,total_cu_tva, nume_valuta, client, id_client, cod_fiscal, NVL(tip_persoana,1) as tip_persoana, NVL(trimis,0) as trimis, data_trimis, stare, id_incarcare, mesaj_trimis, id_descarcare, tip_mesaj_raspuns, mesaj_raspuns, data_raspuns, cod_fiscal_emitent, cod_fiscal_beneficiar, '' as detalii, xfurnizor, xclient, xdata_act, xnumar_act, xtotal_fara_tva, xtotal_tva, xtotal_tva_ron, xtotal_cu_tva, xdiscount_fara_tva, xtaxe_fara_tva, xvaloare_fara_tva, xtotal_de_plata, xnume_valuta, test, id_util, utilizator, jtotctva, case when jtotctva is null then null else decode(creditnote,0,1,-1) * ROUND(NVL(xtotal_cu_tva , 0.00) * decode(in_valuta,1,curs,1), 2)-NVL(jtotctva, 0.00) end as diferenta, procesat, procesat_server,creditnote FROM anaf_vefactura_emis
 		Endtext
 		lcOrder = [data_act,numar_act]
 		lcgroup = []