diff --git a/clase/ofacturare_rapoarte.vc2 b/clase/ofacturare_rapoarte.vc2
index 0ae66e2..db7c342 100644
--- a/clase/ofacturare_rapoarte.vc2
+++ b/clase/ofacturare_rapoarte.vc2
@@ -22,6 +22,7 @@ DEFINE CLASS frm_date_rapoarte_articole AS _frmbase OF "_frm_base.vcx"
 	*< OBJECTDATA: ObjPath="Ct_selectie1.Ct_selectie_nume_client" UniqueID="" Timestamp="" />
 	*< OBJECTDATA: ObjPath="Ct_selectie1.Ct_selectie_serie" UniqueID="" Timestamp="" />
 	*< OBJECTDATA: ObjPath="Ct_selectie1.Ct_selectie_numar_act" UniqueID="" Timestamp="" />
+	*< OBJECTDATA: ObjPath="Ct_selectie1.Ct_selectie_cont" UniqueID="" Timestamp="" />
 	*< OBJECTDATA: ObjPath="But_listare1" UniqueID="" Timestamp="" />
 	*< OBJECTDATA: ObjPath="But_excel1" UniqueID="" Timestamp="" />
 	*< OBJECTDATA: ObjPath="Ct_opt_categorie" UniqueID="" Timestamp="" />
@@ -243,9 +244,9 @@ DEFINE CLASS frm_date_rapoarte_articole AS _frmbase OF "_frm_base.vcx"
 		*< END OBJECT: ClassLib="caut_ora.vcx" BaseClass="container" />
 
 	ADD OBJECT 'Ct_selectie1' AS ct_selectie WITH ;
-		ccoloanesuma = cantitate,valoare_ftva,valoare, ;
+		ccoloanesuma = cantitate|valoare_ftva|valoare, ;
 		clistacoloaneordine = 1,2, ;
-		cnumecoloanesuma = Cantitate,Valoare fara TVA,Valoare cu TVA, ;
+		cnumecoloanesuma = Cantitate|Valoare fara TVA|Valoare cu TVA, ;
 		cnumetabela = fact_vrap_fact_articole, ;
 		Height = 384, ;
 		Left = 24, ;
@@ -292,6 +293,18 @@ DEFINE CLASS frm_date_rapoarte_articole AS _frmbase OF "_frm_base.vcx"
 		ck_camp.Name = "ck_camp"
 		*< END OBJECT: ClassLib="orapoarte.vcx" BaseClass="container" />
 
+	ADD OBJECT 'Ct_selectie1.Ct_selectie_cont' AS ct_selectie_camp WITH ;
+		ccamp = cont, ;
+		cnumecamp = Cont, ;
+		Left = 120, ;
+		Name = "Ct_selectie_cont", ;
+		nid_container = 8, ;
+		TabIndex = 9, ;
+		Top = 57, ;
+		ck_camp.Alignment = 0, ;
+		ck_camp.Name = "ck_camp"
+		*< END OBJECT: ClassLib="orapoarte.vcx" BaseClass="container" />
+
 	ADD OBJECT 'Ct_selectie1.Ct_selectie_data_act' AS ct_selectie_camp WITH ;
 		ccamp = data_act, ;
 		cnumecamp = Data factura, ;
@@ -927,9 +940,9 @@ DEFINE CLASS frm_date_rapoarte_articole_tr AS frm_termin OF "_frm_child.vcx"
 		*< END OBJECT: ClassLib="caut_ora.vcx" BaseClass="container" />
 
 	ADD OBJECT 'Ct_selectie1' AS ct_selectie WITH ;
-		ccoloanesuma = adaos,cantitate,valoare_ftva,valoare,val_achizitie, ;
+		ccoloanesuma = adaos|cantitate|valoare_ftva|valoare|val_achizitie, ;
 		clistacoloaneordine = 1,2,3,4, ;
-		cnumecoloanesuma = Adaos,Cantitate,Valoare fara TVA,Valoare cu TVA,Valoare achizitie, ;
+		cnumecoloanesuma = Adaos|Cantitate|Valoare fara TVA|Valoare cu TVA|Valoare achizitie, ;
 		cnumetabela = fact_vrap_articole_transfer, ;
 		Height = 158, ;
 		Left = 7, ;
@@ -1576,6 +1589,7 @@ DEFINE CLASS frm_date_rapoarte_articole_v AS frm_termin OF "_frm_child.vcx"
 	*< OBJECTDATA: ObjPath="Ct_selectie1.Ct_selectie_procent_adaos" UniqueID="" Timestamp="" />
 	*< OBJECTDATA: ObjPath="Ct_selectie1.Ct_selectie_valoare_achizitie" UniqueID="" Timestamp="" />
 	*< OBJECTDATA: ObjPath="Ct_selectie1.Ct_selectie_valoare_adaos" UniqueID="" Timestamp="" />
+	*< OBJECTDATA: ObjPath="Ct_selectie1.Ct_selectie_cont" UniqueID="" Timestamp="" />
 	*< OBJECTDATA: ObjPath="Ct_opt_categorie" UniqueID="" Timestamp="" />
 	*< OBJECTDATA: ObjPath="Ct_opt_grupa" UniqueID="" Timestamp="" />
 	*< OBJECTDATA: ObjPath="Ct_opt_subgrupa" UniqueID="" Timestamp="" />
@@ -1794,9 +1808,9 @@ DEFINE CLASS frm_date_rapoarte_articole_v AS frm_termin OF "_frm_child.vcx"
 
 	ADD OBJECT 'Ct_selectie1' AS ct_selectie WITH ;
 		Anchor = 15, ;
-		ccoloanesuma = cantitate,valoare_ftva,valoare, ;
+		ccoloanesuma = cantitate|valoare_ftva|valoare, ;
 		clistacoloaneordine = 1,2, ;
-		cnumecoloanesuma = Cantitate,Valoare fara TVA, Valoare cu TVA, ;
+		cnumecoloanesuma = Cantitate|Valoare fara TVA| Valoare cu TVA, ;
 		cnumetabela = fact_vrap_articole_vandute, ;
 		Height = 479, ;
 		Left = 4, ;
@@ -1857,6 +1871,18 @@ DEFINE CLASS frm_date_rapoarte_articole_v AS frm_termin OF "_frm_child.vcx"
 		ck_camp.Name = "ck_camp"
 		*< END OBJECT: ClassLib="orapoarte.vcx" BaseClass="container" />
 
+	ADD OBJECT 'Ct_selectie1.Ct_selectie_cont' AS ct_selectie_camp WITH ;
+		ccamp = cont, ;
+		cnumecamp = Cont, ;
+		Left = 248, ;
+		Name = "Ct_selectie_cont", ;
+		nid_container = 15, ;
+		TabIndex = 8, ;
+		Top = 57, ;
+		ck_camp.Alignment = 0, ;
+		ck_camp.Name = "ck_camp"
+		*< END OBJECT: ClassLib="orapoarte.vcx" BaseClass="container" />
+
 	ADD OBJECT 'Ct_selectie1.Ct_selectie_data_act' AS ct_selectie_camp WITH ;
 		ccamp = data_act, ;
 		cnumecamp = Data factura, ;
@@ -2041,7 +2067,6 @@ DEFINE CLASS frm_date_rapoarte_articole_v AS frm_termin OF "_frm_child.vcx"
 			Thisform.clb_data_referinta.SetFocus()
 			Return
 		Otherwise
-		SET STEP ON 
 			With This.ct_selectie1
 				.do_instructiune_sql()
 				lcSql = .csql
@@ -2544,9 +2569,9 @@ DEFINE CLASS frm_date_rapoarte_avize AS _frmbase OF "_frm_base.vcx"
 		*< END OBJECT: ClassLib="caut_ora.vcx" BaseClass="container" />
 
 	ADD OBJECT 'Ct_selectie1' AS ct_selectie WITH ;
-		ccoloanesuma = avizat,facturat, ;
+		ccoloanesuma = avizat|facturat, ;
 		clistacoloaneordine = 1, ;
-		cnumecoloanesuma = Valoare avizata,Valoare facturata, ;
+		cnumecoloanesuma = Valoare avizata|Valoare facturata, ;
 		cnumetabela = fact_vrap_avize_fact, ;
 		Height = 408, ;
 		Left = 24, ;
@@ -3202,7 +3227,7 @@ DEFINE CLASS frm_date_rapoarte_avize_tr AS _frmbase OF "_frm_base.vcx"
 	ADD OBJECT 'Ct_selectie1' AS ct_selectie WITH ;
 		ccoloanesuma = avizat, ;
 		clistacoloaneordine = 1, ;
-		cnumecoloanesuma = Valoare avizata,Valoare facturata, ;
+		cnumecoloanesuma = Valoare avizata|Valoare facturata, ;
 		cnumetabela = fact_vrap_avize_transfer, ;
 		Height = 408, ;
 		Left = 24, ;
@@ -3802,9 +3827,9 @@ DEFINE CLASS frm_date_rapoarte_facturi AS _frmbase OF "_frm_base.vcx"
 		*< END OBJECT: ClassLib="caut_ora.vcx" BaseClass="container" />
 
 	ADD OBJECT 'Ct_selectie1' AS ct_selectie WITH ;
-		ccoloanesuma = facturat,incasat, ;
+		ccoloanesuma = facturat|incasat, ;
 		clistacoloaneordine = 1, ;
-		cnumecoloanesuma = Valoare facturata,Valoare incasata, ;
+		cnumecoloanesuma = Valoare facturata|Valoare incasata, ;
 		cnumetabela = fact_vrap_fact_incasari, ;
 		Height = 444, ;
 		Left = 24, ;
diff --git a/clase/orapoarte.vc2 b/clase/orapoarte.vc2
index 0ffbc20..75912ef 100644
--- a/clase/orapoarte.vc2
+++ b/clase/orapoarte.vc2
@@ -832,7 +832,6 @@ DEFINE CLASS ct_selectie AS _container OF "_baza.vcx"
 		Else
 			lnPozitii = 1
 		Endif
-		SET STEP ON 
 		For i = lnPozitii To Alen(Thisform.ct_selectie1.aselectie,1)
 			If !Empty(Thisform.ct_selectie1.aselectie[i,1])
 				llSelectieVida = .F.
@@ -1219,7 +1218,7 @@ DEFINE CLASS ct_selectie AS _container OF "_baza.vcx"
 				Else
 					lcNumeCamp = lcNume
 				Endif
-				This.do_adauga(lcNume,lcNumeCamp,.F.,.T.)
+				This.do_adauga(lcNume,lcNumeCamp,.F.,.T.,.F.,.NULL.)
 			Endfor
 		Endif
 		Bindevent(This,"lcrosstabulare",This,"do_actualizeaza_culori_sume",1)
@@ -1812,7 +1811,7 @@ DEFINE CLASS ct_selectie_sql AS _container OF "_baza.vcx"
 				Else
 					lcNumeCamp = lcNume
 				Endif
-				This.do_adauga(lcNume,lcNumeCamp,.F.,.T.)
+				This.do_adauga(lcNume,lcNumeCamp,.F.,.T.,.F.,.NULL.)
 			Endfor
 		Endif
 		Bindevent(This,"lcrosstabulare",This,"do_actualizeaza_culori_sume",1)
@@ -2046,7 +2045,7 @@ DEFINE CLASS frm_date_rapoarte AS _frmbase OF "_frm_base.vcx"
 		*< END OBJECT: ClassLib="caut_ora.vcx" BaseClass="container" />
 
 	ADD OBJECT 'Ct_selectie1' AS ct_selectie WITH ;
-		ccoloanesuma = facturat,incasat, ;
+		ccoloanesuma = facturat|incasat, ;
 		cnumetabela = fact_vrap_fact_incasari, ;
 		Left = 24, ;
 		Name = "Ct_selectie1", ;