sync SVN r18070

Clase/ovanzcump.vc2

@@ -39866,6 +39866,10 @@ DEFINE CLASS frm_regcump2025 AS _frmbase OF "..\comun\clase\_frm_base.vcx"
 	*< OBJECTDATA: ObjPath="_grdbase1.cXX11TIB.Text1" UniqueID="" Timestamp="" />
 	*< OBJECTDATA: ObjPath="_grdbase1.cXX11TIT.Header1" UniqueID="" Timestamp="" />
 	*< OBJECTDATA: ObjPath="_grdbase1.cXX11TIT.Text1" UniqueID="" Timestamp="" />
+	*< OBJECTDATA: ObjPath="_grdbase1.cROB2420.Header1" UniqueID="" Timestamp="" />
+	*< OBJECTDATA: ObjPath="_grdbase1.cROB2420.Text1" UniqueID="" Timestamp="" />
+	*< OBJECTDATA: ObjPath="_grdbase1.cROT2420.Header1" UniqueID="" Timestamp="" />
+	*< OBJECTDATA: ObjPath="_grdbase1.cROT2420.Text1" UniqueID="" Timestamp="" />
 	*< OBJECTDATA: ObjPath="But_excel1" UniqueID="" Timestamp="" />
 	*< OBJECTDATA: ObjPath="But_listare1" UniqueID="" Timestamp="" />
 	*< OBJECTDATA: ObjPath="But_reface1" UniqueID="" Timestamp="" />
@@ -39942,7 +39946,7 @@ DEFINE CLASS frm_regcump2025 AS _frmbase OF "..\comun\clase\_frm_base.vcx"
 
 	ADD OBJECT '_grdbase1' AS _grdbase WITH ;
 		Anchor = 15, ;
-		ColumnCount = 73, ;
+		ColumnCount = 75, ;
 		Comment = "*:OnResize=ss", ;
 		DeleteMark = .F., ;
 		FontSize = 10, ;
@@ -40583,7 +40587,21 @@ DEFINE CLASS frm_regcump2025 AS _frmbase OF "..\comun\clase\_frm_base.vcx"
 		Column73.FontSize = 10, ;
 		Column73.Name = "cXX11TIT", ;
 		Column73.ReadOnly = .T., ;
-		Column73.Width = 95
+		Column73.Width = 95, ;
+		Column74.ColumnOrder = 74, ;
+		Column74.ControlSource = "RO24B+RO20B", ;
+		Column74.FontName = "Arial", ;
+		Column74.FontSize = 10, ;
+		Column74.InputMask = (get_mask(12,gnZ)), ;
+		Column74.Name = "cROB2420", ;
+		Column74.ReadOnly = .T., ;
+		Column75.ColumnOrder = 75, ;
+		Column75.ControlSource = "RO24T+RO20T", ;
+		Column75.FontName = "Arial", ;
+		Column75.FontSize = 10, ;
+		Column75.InputMask = (get_mask(12,gnZ)), ;
+		Column75.Name = "cROT2420", ;
+		Column75.ReadOnly = .T.
 		*< END OBJECT: ClassLib="..\comun\clase\_grd_base.vcx" BaseClass="grid" />
 
 	ADD OBJECT '_grdbase1.cAles._checkbox1' AS _checkbox WITH ;
@@ -41539,6 +41557,27 @@ DEFINE CLASS frm_regcump2025 AS _frmbase OF "..\comun\clase\_frm_base.vcx"
 		Visible = .T.
 		*< END OBJECT: BaseClass="textbox" />
 
+	ADD OBJECT '_grdbase1.cROB2420.Header1' AS header WITH ;
+		Alignment = 2, ;
+		Caption = "Achizitii taxabile la intern =Baza cote vechi (24%, 20%)=", ;
+		FontName = "Arial", ;
+		FontSize = 10, ;
+		Name = "Header1", ;
+		WordWrap = .T.
+		*< END OBJECT: BaseClass="header" />
+
+	ADD OBJECT '_grdbase1.cROB2420.Text1' AS textbox WITH ;
+		BackColor = 255,255,255, ;
+		BorderStyle = 0, ;
+		FontName = "Arial", ;
+		FontSize = 10, ;
+		ForeColor = 0,0,0, ;
+		Margin = 0, ;
+		Name = "Text1", ;
+		ReadOnly = .T., ;
+		SelectedBackColor = 100,185,255
+		*< END OBJECT: BaseClass="textbox" />
+
 	ADD OBJECT '_grdbase1.cRONB.Header1' AS header WITH ;
 		Alignment = 2, ;
 		Caption = "Neexigibil =Baza=", ;
@@ -41605,6 +41644,27 @@ DEFINE CLASS frm_regcump2025 AS _frmbase OF "..\comun\clase\_frm_base.vcx"
 		Visible = .T.
 		*< END OBJECT: BaseClass="textbox" />
 
+	ADD OBJECT '_grdbase1.cROT2420.Header1' AS header WITH ;
+		Alignment = 2, ;
+		Caption = "Achizitii taxabile la intern =TVA cote vechi (24%, 20%)=", ;
+		FontName = "Arial", ;
+		FontSize = 10, ;
+		Name = "Header1", ;
+		WordWrap = .T.
+		*< END OBJECT: BaseClass="header" />
+
+	ADD OBJECT '_grdbase1.cROT2420.Text1' AS textbox WITH ;
+		BackColor = 255,255,255, ;
+		BorderStyle = 0, ;
+		FontName = "Arial", ;
+		FontSize = 10, ;
+		ForeColor = 0,0,0, ;
+		Margin = 0, ;
+		Name = "Text1", ;
+		ReadOnly = .T., ;
+		SelectedBackColor = 100,185,255
+		*< END OBJECT: BaseClass="textbox" />
+
 	ADD OBJECT '_grdbase1.cROtn.Header1' AS header WITH ;
 		Alignment = 2, ;
 		Caption = "Limitare deducere TVA", ;
@@ -42146,7 +42206,7 @@ DEFINE CLASS frm_regcump2025 AS _frmbase OF "..\comun\clase\_frm_base.vcx"
 		Anchor = 14, ;
 		ccolwithlabel = cfdoc, ;
 		csourcegrid = _grdbase1, ;
-		csumcolumns = <fb2p_value>cTotctva,cTotfTvaTax,cTotTvaTax,cRONB,cRONT,cRo21b,cRo21t,cRo21Nb,cRo21Nt,cRo11b,cRo11t,cRo11Nb,cRo11Nt,cRo19b,cRo19t,cRo19nb,cRo19nt,cRo09b,cRo09t,cRo09nb,cRo09nt,cRo05b,cRo05t,cRo05nb,cRo05nt,cRoscn,cFo21b,cFo21t,cFo11b,cFo11t,cFo19b,cFo19t,cFo09b,cFo09t,cFoscn,cCEb,cCEt,cCEsc,cCEn,cTI21b,cTI21T,cTI11b,cTI11T,cTI19b,cTI19T,cTi09b,cTI09t,cROTN,cXX21TIB,cXX21TIT,cXX11TIB,cXX11TIT,cXX19TIB,cXX19TIT,cXX9TIB,cXX9TIT</fb2p_value>, ;
+		csumcolumns = <fb2p_value>cTotctva,cTotfTvaTax,cTotTvaTax,cRONB,cRONT,cRo21b,cRo21t,cRo21Nb,cRo21Nt,cRo11b,cRo11t,cRo11Nb,cRo11Nt,cRo19b,cRo19t,cRo19nb,cRo19nt,cRo09b,cRo09t,cRo09nb,cRo09nt,cRo05b,cRo05t,cRo05nb,cRo05nt,cRoscn,cFo21b,cFo21t,cFo11b,cFo11t,cFo19b,cFo19t,cFo09b,cFo09t,cFoscn,cCEb,cCEt,cCEsc,cCEn,cTI21b,cTI21T,cTI11b,cTI11T,cTI19b,cTI19T,cTi09b,cTI09t,cROTN,cXX21TIB,cXX21TIT,cXX11TIB,cXX11TIT,cXX19TIB,cXX19TIT,cXX9TIB,cXX9TIT,cROB2420,cROT2420</fb2p_value>, ;
 		ctotallabelexpression = 'TOTAL', ;
 		Height = 25, ;
 		Left = 11, ;
@@ -51596,6 +51656,10 @@ DEFINE CLASS frm_regvanz2025 AS _frmbase OF "..\comun\clase\_frm_base.vcx"
 	*< OBJECTDATA: ObjPath="_grdbase1.Column53.Text1" UniqueID="" Timestamp="" />
 	*< OBJECTDATA: ObjPath="_grdbase1.Column54.Header1" UniqueID="" Timestamp="" />
 	*< OBJECTDATA: ObjPath="_grdbase1.Column54.Text1" UniqueID="" Timestamp="" />
+	*< OBJECTDATA: ObjPath="_grdbase1.Column55.Header1" UniqueID="" Timestamp="" />
+	*< OBJECTDATA: ObjPath="_grdbase1.Column55.Text1" UniqueID="" Timestamp="" />
+	*< OBJECTDATA: ObjPath="_grdbase1.Column56.Header1" UniqueID="" Timestamp="" />
+	*< OBJECTDATA: ObjPath="_grdbase1.Column56.Text1" UniqueID="" Timestamp="" />
 	*< OBJECTDATA: ObjPath="_grdfooter1" UniqueID="" Timestamp="" />
 	*< OBJECTDATA: ObjPath="But_excel1" UniqueID="" Timestamp="" />
 	*< OBJECTDATA: ObjPath="But_listare1" UniqueID="" Timestamp="" />
@@ -51669,7 +51733,7 @@ DEFINE CLASS frm_regvanz2025 AS _frmbase OF "..\comun\clase\_frm_base.vcx"
 
 	ADD OBJECT '_grdbase1' AS _grdbase WITH ;
 		Anchor = 15, ;
-		ColumnCount = 54, ;
+		ColumnCount = 56, ;
 		Comment = "*:OnResize=ss", ;
 		DeleteMark = .F., ;
 		FontCharSet = 238, ;
@@ -52169,7 +52233,21 @@ DEFINE CLASS frm_regvanz2025 AS _frmbase OF "..\comun\clase\_frm_base.vcx"
 		Column54.FontSize = 10, ;
 		Column54.InputMask = (get_mask(12,gnZ)), ;
 		Column54.Name = "Column54", ;
-		Column54.ReadOnly = .T.
+		Column54.ReadOnly = .T., ;
+		Column55.ControlSource = "RO24B+RO20B", ;
+		Column55.FontCharSet = 238, ;
+		Column55.FontName = "Arial", ;
+		Column55.FontSize = 10, ;
+		Column55.InputMask = (get_mask(12,gnZ)), ;
+		Column55.Name = "Column55", ;
+		Column55.ReadOnly = .T., ;
+		Column56.ControlSource = "RO24T+RO20T", ;
+		Column56.FontCharSet = 238, ;
+		Column56.FontName = "Arial", ;
+		Column56.FontSize = 10, ;
+		Column56.InputMask = (get_mask(12,gnZ)), ;
+		Column56.Name = "Column56", ;
+		Column56.ReadOnly = .T.
 		*< END OBJECT: ClassLib="..\comun\clase\_grd_base.vcx" BaseClass="grid" />
 
 	ADD OBJECT '_grdbase1.cAles._checkbox1' AS _checkbox WITH ;
@@ -52672,6 +52750,52 @@ DEFINE CLASS frm_regvanz2025 AS _frmbase OF "..\comun\clase\_frm_base.vcx"
 		SelectedBackColor = 100,185,255
 		*< END OBJECT: BaseClass="textbox" />
 
+	ADD OBJECT '_grdbase1.Column55.Header1' AS header WITH ;
+		Alignment = 2, ;
+		Caption = "Taxabile la intern =Baza cote vechi (24%, 20%)=", ;
+		FontCharSet = 238, ;
+		FontName = "Arial", ;
+		FontSize = 10, ;
+		Name = "Header1", ;
+		WordWrap = .T.
+		*< END OBJECT: BaseClass="header" />
+
+	ADD OBJECT '_grdbase1.Column55.Text1' AS textbox WITH ;
+		BackColor = 255,255,255, ;
+		BorderStyle = 0, ;
+		FontCharSet = 238, ;
+		FontName = "Arial", ;
+		FontSize = 10, ;
+		ForeColor = 0,0,0, ;
+		Margin = 0, ;
+		Name = "Text1", ;
+		ReadOnly = .T., ;
+		SelectedBackColor = 100,185,255
+		*< END OBJECT: BaseClass="textbox" />
+
+	ADD OBJECT '_grdbase1.Column56.Header1' AS header WITH ;
+		Alignment = 2, ;
+		Caption = "Taxabile la intern =TVA cote vechi (24%, 20%)=", ;
+		FontCharSet = 238, ;
+		FontName = "Arial", ;
+		FontSize = 10, ;
+		Name = "Header1", ;
+		WordWrap = .T.
+		*< END OBJECT: BaseClass="header" />
+
+	ADD OBJECT '_grdbase1.Column56.Text1' AS textbox WITH ;
+		BackColor = 255,255,255, ;
+		BorderStyle = 0, ;
+		FontCharSet = 238, ;
+		FontName = "Arial", ;
+		FontSize = 10, ;
+		ForeColor = 0,0,0, ;
+		Margin = 0, ;
+		Name = "Text1", ;
+		ReadOnly = .T., ;
+		SelectedBackColor = 100,185,255
+		*< END OBJECT: BaseClass="textbox" />
+
 	ADD OBJECT '_grdbase1.cRo11b.Header1' AS header WITH ;
 		Alignment = 2, ;
 		Caption = "Taxabile la intern =Baza 11%=", ;
@@ -53423,7 +53547,7 @@ DEFINE CLASS frm_regvanz2025 AS _frmbase OF "..\comun\clase\_frm_base.vcx"
 		ccolwithlabel = cfdoc, ;
 		Comment = "*:OnResize=sb", ;
 		csourcegrid = _grdbase1, ;
-		csumcolumns = cTotctva,cTotfTvaTax,cTotTvaTax,cRONB,cRONT,cRo21b,cRo21t,cRo21Nb,cRo21Nt,cRo11b,cRo11t,cRo11Nb,cRo11Nt,cRo19b,cRo19t,cRo19Nb,cRo19Nt,cRo9b,cRo9t,cRo9Nb,cRo9Nt,cRo5b,cRo5t,cRo5Nb,cRo5Nt,cRoti,cCescdd1,cCescdd2,cWrscdd,cFodd,cFofdd,cWrscfdd,cWrn, ;
+		csumcolumns = cTotctva,cTotfTvaTax,cTotTvaTax,cRONB,cRONT,cRo21b,cRo21t,cRo21Nb,cRo21Nt,cRo11b,cRo11t,cRo11Nb,cRo11Nt,cRo19b,cRo19t,cRo19Nb,cRo19Nt,cRo9b,cRo9t,cRo9Nb,cRo9Nt,cRo5b,cRo5t,cRo5Nb,cRo5Nt,cRoti,cCescdd1,cCescdd2,cWrscdd,cFodd,cFofdd,cWrscfdd,cWrn,Column55,Column56, ;
 		ctotallabelexpression = 'TOTAL', ;
 		Height = 25, ;
 		Left = 11, ;
@@ -53637,8 +53761,8 @@ DEFINE CLASS frm_regvanz2025 AS _frmbase OF "..\comun\clase\_frm_base.vcx"
 			Case lnOptiune = 1
 				Thisform.lb_titlu_alb_b121.Caption = [REGISTRUL VANZARI]
 			Case lnOptiune = 2 && Livrari taxabile intern
-				lcFiltru = lcFiltru+ [ and (RO11b<>0 OR RO11t<>0 OR RO21b<>0 OR RO21t<>0 OR ro19b<>0 OR ro19t<>0 OR ro9b<>0 OR ro9t<>0 OR ro5b<>0 OR ro5t<>0 or ] + ;
+				lcFiltru = lcFiltru+ [ and (RO11b<>0 OR RO11t<>0 OR RO21b<>0 OR RO21t<>0 OR ro19b<>0 OR ro19t<>0 OR ro9b<>0 OR ro9t<>0 OR ro5b<>0 OR ro5t<>0 OR RO24b<>0 OR RO24t<>0 OR ro20b<>0 OR ro20t<>0 or ] + ;
-									[RO11nb<>0 OR RO11nt<>0 or RO21nb<>0 OR RO21nt<>0 or ro19nb<>0 OR ro19nt<>0 OR ro9nb<>0 OR ro9nt<>0 OR ro5nb<>0 OR ro5nt<>0)]
+									[RO11nb<>0 OR RO11nt<>0 or RO21nb<>0 OR RO21nt<>0 or ro19nb<>0 OR ro19nt<>0 OR ro9nb<>0 OR ro9nt<>0 OR ro5nb<>0 OR ro5nt<>0 OR RO24nb<>0 OR RO24nt<>0 OR ro20nb<>0 OR ro20nt<>0)]
 				Thisform.lb_titlu_alb_b121.Caption = [REGISTRUL VANZARI - TAXABILE INTERN]
 			Case lnOptiune = 3 && Livrari cu taxare inversa
 				lcFiltru = lcFiltru + [ and (roti<>0)]
@@ -53701,7 +53825,7 @@ DEFINE CLASS frm_regvanz2025 AS _frmbase OF "..\comun\clase\_frm_base.vcx"
 		               a.id_part,
 		               a.totctva,
 		               nvl(b.total_incasat, 0) as total_incasat,
-		               (a.RO11b + a.RO11t + a.RO21b + a.RO21t + a.ro19b + a.ro19t + a.ro9b + a.ro9t + a.ro5b + a.ro5t) as tva_exigibil
+		               (a.RO11b + a.RO11t + a.RO21b + a.RO21t + a.ro19b + a.ro19t + a.ro9b + a.ro9t + a.ro5b + a.ro5t + a.RO24b + a.RO24t + a.ro20b + a.ro20t) as tva_exigibil
 		          from (select an,
 		                       luna,
 		                       id_fact,
@@ -53721,7 +53845,11 @@ DEFINE CLASS frm_regvanz2025 AS _frmbase OF "..\comun\clase\_frm_base.vcx"
 		                       ro9b,
 		                       ro9t,
 		                       ro5b,
-		                       ro5t
+		                       ro5t,
+		                       RO24b,
+		                       RO24t,
+		                       ro20b,
+		                       ro20t
 		                  from jv2007 jc
 		                 where an = <<m.gnAn>>
 		                   and luna = <<m.gnLuna>>
@@ -53729,7 +53857,9 @@ DEFINE CLASS frm_regvanz2025 AS _frmbase OF "..\comun\clase\_frm_base.vcx"
 			            or RO21nb <> 0
 			            or ro19nb <> 0	            
 		    	        or ro9nb <> 0
-		        	    or ro5nb <> 0) <<m.gcCondSucursala>>) a
+		        	    or ro5nb <> 0
+		        	    or RO24nb <> 0
+		        	    or ro20nb <> 0) <<m.gcCondSucursala>>) a
 		          left join (select an,
 		                           luna,
 		                           id_sucursala,
@@ -53773,7 +53903,7 @@ DEFINE CLASS frm_regvanz2025 AS _frmbase OF "..\comun\clase\_frm_base.vcx"
 		           and a.luna = b.luna
 		           and nvl(a.id_sucursala, 0) = nvl(b.id_sucursala, 0)
 		         where nvl(b.total_incasat, 0.00) <> 0 and nvl(b.total_incasat, 0.00) -
-		               (a.RO11b + a.RO11t + a.RO21b + a.ro19b + a.ro19t + a.RO21t + a.ro9b + a.ro9t + a.ro5b + a.ro5t) <> 0)
+		               (a.RO11b + a.RO11t + a.RO21b + a.ro19b + a.ro19t + a.RO21t + a.ro9b + a.ro9t + a.ro5b + a.ro5t + a.RO24b + a.RO24t + a.ro20b + a.ro20t) <> 0)
 		 group by an,
 		          luna,
 		          dataact,
@@ -54016,7 +54146,7 @@ DEFINE CLASS frm_regvanz2025 AS _frmbase OF "..\comun\clase\_frm_base.vcx"
 			If lnTipJurnal <> 0
 				Do Case
 					Case lnTipJurnal = 1 && Livrari taxabile intern
-						lcWhere = "(RO11b<>0 OR RO11t<>0 OR RO21b<>0 OR RO21t<>0 OR ro19b<>0 or ro19t<>0 OR ro9b<>0 OR ro9t<>0 OR ro5b<>0 OR ro5t<>0 )"
+						lcWhere = "(RO11b<>0 OR RO11t<>0 OR RO21b<>0 OR RO21t<>0 OR ro19b<>0 or ro19t<>0 OR ro9b<>0 OR ro9t<>0 OR ro5b<>0 OR ro5t<>0 OR RO24b<>0 OR RO24t<>0 OR ro20b<>0 OR ro20t<>0 )"
 					Case lnTipJurnal = 2 && Livrari cu taxare inversa
 						lcWhere = "(roti<>0)"
 					Case lnTipJurnal = 3 && Livrari scutite cu drept de deducere

changelog_roacont.txt

@@ -1,4 +1,21 @@
 <!--
+09/09/2026
+ROACONT - 2.11.74
+
+:adaugare:
+  Registrul de vanzari si Registrul de cumparari. Doua coloane noi, cu total pe jos, care
+  cumuleaza baza si TVA la cotele vechi 24% si 20%.
+
+:eroare:
+  Registrul de vanzari. La intrarea in registru aparea nejustificat mesajul de diferenta
+  intre rulajul creditor 4427 din balanta si TVA din registru, atunci cand in luna se
+  exigibiliza TVA de la facturi mai vechi cu cotele 24% sau 20%.
+
+:eroare:
+  Registrul de vanzari. Facturile cu cotele 24% si 20% nu apareau in filtrul "Livrari
+  taxabile intern" si apareau ca diferente la filtrul "TVA incasare".
+-->
+<!--
 23/08/2026
 ROACONT - 2.11.73