sync SVN r18026

2026-08-20 22:44:54 +03:00
parent 5de25c4e36
commit 58d4c4a891
4 changed files with 152 additions and 29 deletions
--- a/clase/ofacturare_comun.vc2
+++ b/clase/ofacturare_comun.vc2
@@ -4647,6 +4647,8 @@ DEFINE CLASS frm_facturi AS _frmbase OF "_frm_base.vcx"
 			Select crsDetalii
 			Scatter Name poRec Memo
 			poRec.explicatie = NVL(poRec.explicatie, ' ')
+			AddProperty(poRec, 'data_act', crsfacturi.data_act)
+			AddProperty(poRec, 'id_part',  Nvl(crsfacturi.id_part, 0))
 			If poRec.sters = 0
 				ofrmmodificare = Createobject("frm_modifica_articol_factura")
 				ofrmmodificare.Show()
@@ -5135,9 +5137,14 @@ DEFINE CLASS frm_modifica_articol_factura AS frm_termin_renunt OF "_frm_child.vc
 	*< OBJECTDATA: ObjPath="Ed_tx_simplu1" UniqueID="" Timestamp="" />
 	*< OBJECTDATA: ObjPath="cbo_saft" UniqueID="" Timestamp="" />
 	*< OBJECTDATA: ObjPath="lbSaft" UniqueID="" Timestamp="" />
+	*< OBJECTDATA: ObjPath="_shape4" UniqueID="" Timestamp="" />
+	*< OBJECTDATA: ObjPath="lbExplTva" UniqueID="" Timestamp="" />
+	*< OBJECTDATA: ObjPath="cbo_expl_tva" UniqueID="" Timestamp="" />
+	*< OBJECTDATA: ObjPath="lbExplTvaInfo" UniqueID="" Timestamp="" />

 	*<DefinedPropArrayMethod>
 		*p: nid
+		*p: nidjtvaales
 		*p: ntip_selectie		&& 0 - cautare in toti delegatii; 1 - cautare in delegatii clientului
 		*p: orec
 	*</DefinedPropArrayMethod>
@@ -5145,9 +5152,10 @@ DEFINE CLASS frm_modifica_articol_factura AS frm_termin_renunt OF "_frm_child.vc
 	*<PropValue>
 		BorderStyle = 1
 		DoCreate = .T.
-		Height = 370
+		Height = 431
 		Name = "frm_modifica_articol_factura"
 		nid = .F.
+		nidjtvaales = 0
 		ntip_selectie = 0
 		orec = .F.
 		Width = 376
@@ -5161,17 +5169,17 @@ DEFINE CLASS frm_modifica_articol_factura AS frm_termin_renunt OF "_frm_child.vc
 		_shape2.ZOrderSet = 2
 		Lb_titlu_alb_b121.Caption = "Modific<69> explica<63>ie articol"
 		Lb_titlu_alb_b121.Name = "Lb_titlu_alb_b121"
-		Lb_titlu_alb_b121.TabIndex = 5
+		Lb_titlu_alb_b121.TabIndex = 6
 		Lb_titlu_alb_b121.ZOrderSet = 3
 		BUT_TERMIN1.Left = 344
 		BUT_TERMIN1.Name = "BUT_TERMIN1"
-		BUT_TERMIN1.TabIndex = 3
+		BUT_TERMIN1.TabIndex = 4
 		BUT_TERMIN1.Top = 1
 		BUT_TERMIN1.ZOrderSet = 4
 		Gridsort1.Name = "Gridsort1"
 		But_renunt1.Left = 315
 		But_renunt1.Name = "But_renunt1"
-		But_renunt1.TabIndex = 4
+		But_renunt1.TabIndex = 5
 		But_renunt1.Top = 1
 		But_renunt1.ZOrderSet = 6
 	*</PropValue>
@@ -5181,11 +5189,36 @@ DEFINE CLASS frm_modifica_articol_factura AS frm_termin_renunt OF "_frm_child.vc
 		Height = 37, ;
 		Left = 13, ;
 		Name = "_shape3", ;
-		Top = 323, ;
+		Top = 384, ;
 		Width = 348, ;
 		ZOrderSet = 0
 		*< END OBJECT: ClassLib="_baza.vcx" BaseClass="shape" />

+	ADD OBJECT '_shape4' AS _shape WITH ;
+		BackStyle = 0, ;
+		Height = 58, ;
+		Left = 13, ;
+		Name = "_shape4", ;
+		Top = 323, ;
+		Width = 348, ;
+		ZOrderSet = 10
+		*< END OBJECT: ClassLib="_baza.vcx" BaseClass="shape" />
+
+	ADD OBJECT 'cbo_expl_tva' AS _cbbase WITH ;
+		BoundColumn = 3, ;
+		BoundTo = .T., ;
+		ColumnCount = 2, ;
+		ColumnWidths = "400,60", ;
+		Height = 24, ;
+		Left = 110, ;
+		Name = "cbo_expl_tva", ;
+		RowSourceType = 3, ;
+		TabIndex = 2, ;
+		Top = 329, ;
+		Width = 238, ;
+		ZOrderSet = 12
+		*< END OBJECT: ClassLib="_cb_base.vcx" BaseClass="combobox" />
+
 	ADD OBJECT 'cbo_saft' AS _cbbase WITH ;
 		BoundColumn = 4, ;
 		BoundTo = .T., ;
@@ -5197,8 +5230,8 @@ DEFINE CLASS frm_modifica_articol_factura AS frm_termin_renunt OF "_frm_child.vc
 		Name = "cbo_saft", ;
 		RowSource = "Select taxname, tip, procent_taxa, taxcode From saft_taxtable where tva = 1 order by taxcode Into Cursor crsTaxTableX", ;
 		RowSourceType = 3, ;
-		TabIndex = 2, ;
-		Top = 329, ;
+		TabIndex = 3, ;
+		Top = 390, ;
 		Width = 266, ;
 		ZOrderSet = 8
 		*< END OBJECT: ClassLib="_cb_base.vcx" BaseClass="combobox" />
@@ -5221,20 +5254,54 @@ DEFINE CLASS frm_modifica_articol_factura AS frm_termin_renunt OF "_frm_child.vc
 		_lbbase1.Name = "_lbbase1"
 		*< END OBJECT: ClassLib="lb_tx.vcx" BaseClass="container" />

+	ADD OBJECT 'lbExplTva' AS _label WITH ;
+		Caption = "Explica<63>ie TVA", ;
+		Left = 24, ;
+		Name = "lbExplTva", ;
+		TabIndex = 8, ;
+		Top = 332, ;
+		ZOrderSet = 11
+		*< END OBJECT: ClassLib="_baza.vcx" BaseClass="label" />
+
+	ADD OBJECT 'lbExplTvaInfo' AS _label WITH ;
+		Caption = "", ;
+		ForeColor = RGB(128,0,0), ;
+		Height = 20, ;
+		Left = 24, ;
+		Name = "lbExplTvaInfo", ;
+		Top = 355, ;
+		Visible = .F., ;
+		Width = 324, ;
+		WordWrap = .T., ;
+		ZOrderSet = 13
+		*< END OBJECT: ClassLib="_baza.vcx" BaseClass="label" />
+
 	ADD OBJECT 'lbSaft' AS _label WITH ;
 		Caption = "Cod taxa", ;
 		Left = 24, ;
 		Name = "lbSaft", ;
-		TabIndex = 6, ;
-		Top = 332, ;
+		TabIndex = 7, ;
+		Top = 393, ;
 		ZOrderSet = 9
 		*< END OBJECT: ClassLib="_baza.vcx" BaseClass="label" />
 	
+	PROCEDURE Destroy
+		If Used('crsExplTvaCbo')
+			Use In crsExplTvaCbo
+		Endif
+		If Used('crsExplTvaArt')
+			Use In crsExplTvaArt
+		Endif
+		DoDefault()
+	ENDPROC
+
 	PROCEDURE inainte_de_do_termin
-		Local llReturn
+		Local llReturn, lcParamJtva
 		If amessagebox("Doriti sa salvati modificarile?",4+32,"Confirmare salvare explicatie") = 6
+			lcParamJtva = Iif(Vartype(Thisform.nidjtvaales) = 'N' And Thisform.nidjtvaales > 0, ;
+				Alltrim(Str(Thisform.nidjtvaales)), [null])
 			lcSql = [begin pack_facturare.modifica_explicatie_articol(] + Alltrim(Str(poRec.id_vanzare_det)) + [,] + ;
-				['] + Nvl(Alltrim(OracleSpecialCharacters(poRec.explicatie)),'') + [',?gnIdUtil,?poRec.taxcode); end;]
+				['] + Nvl(Alltrim(OracleSpecialCharacters(poRec.explicatie)),'') + [',?gnIdUtil,?poRec.taxcode,] + lcParamJtva + [); end;]
 			llReturn = goExecutor.oExecuta(lcSql)
 		Else
 			llReturn = .F.
@@ -5258,6 +5325,46 @@ DEFINE CLASS frm_modifica_articol_factura AS frm_termin_renunt OF "_frm_child.vc
 			Endwith
 		Endif
 		
+		Local lnCota, lcSqlTva, lcCursorTva
+		Thisform.nidjtvaales = 0
+		
+		If Isnull(poRec.proc_tvav) Or Nvl(poRec.proc_tvav, 0) = 0
+			Thisform.cbo_expl_tva.Enabled = .F.
+			Thisform.lbExplTvaInfo.Caption = [Cota de TVA a acestei linii nu este cunoscuta; explicatia TVA nu poate fi modificata prin acest buton.]
+			Thisform.lbExplTvaInfo.Visible = .T.
+			Return
+		Endif
+		
+		lnCota = Round((poRec.proc_tvav - 1) * 100, 2)
+		lcCursorTva = [crsExplTvaArt]
+		*!* afisat > 0 = doar bazele, fara liniile de TVA; jv = 1 = doar jurnalul de vanzari
+		lcSqlTva = [select id_jtva_coloana, denumire, cota_tva from vjtva_coloane where id_jtva_coloana > 0 ] + ;
+			[and afisat > 0 and jv = 1 and cota_tva = ] + Alltrim(Str(lnCota, 10, 2)) + [ order by denumire]
+		If goExecutor.oExecuta(lcSqlTva, lcCursorTva) And Reccount(lcCursorTva) > 0
+			Thisform.cbo_expl_tva.RowSource = [select denumire, cota_tva, id_jtva_coloana from ] + lcCursorTva + [ into cursor crsExplTvaCbo]
+			Thisform.cbo_expl_tva.Requery()
+			Thisform.cbo_expl_tva.Value = Nvl(poRec.id_jtva_coloana, 0)
+		Else
+			Thisform.cbo_expl_tva.Enabled = .F.
+			Thisform.lbExplTvaInfo.Caption = [Nu exista nicio explicatie TVA activa cu aceeasi cota ca linia facturata (cota: ] + ;
+				Alltrim(Str(lnCota, 10, 2)) + [ %).]
+			Thisform.lbExplTvaInfo.Visible = .T.
+		Endif
+		
+	ENDPROC
+
+	PROCEDURE cbo_expl_tva.InteractiveChange
+		Local lnIdJtva
+		lnIdJtva = Nvl(This.Value, 0)
+		If lnIdJtva <= 0
+			Return
+		Endif
+		Thisform.nidjtvaales = lnIdJtva
+		poRec.id_jtva_coloana = lnIdJtva
+		If Type('gl406') = 'L' And m.gl406
+			poRec.taxcode = GetTaxCodeIdPart(m.gnAn, m.gnLuna, poRec.data_act, m.lnIdJtva, poRec.id_part)
+			Thisform.cbo_saft.Refresh()
+		Endif
 	ENDPROC

 ENDDEFINE
--- a/clase/omodificari.vc2
+++ b/clase/omodificari.vc2
@@ -14481,17 +14481,6 @@ DEFINE CLASS frm_modific2024 AS _frmbase OF "_frm_base.vcx"
 			ENDIF
 			SELECT (m.lnAreaTvd)
 		ENDIF
-		*!* al doilea punct de declansare al sincronizarii: enumerarea diferentelor la salvare, cu
-		*!* continuarea salvarii daca utilizatorul renunta - de aceea llRet nu se schimba aici;
-		*!* pe document fara linii active nu porneste: propunerea ar marca toata sursa ca "Adaugare"
-		IF m.llRet AND This.lAreArticoleVanzari AND !This.lArticoleReadOnly AND Used('tvd') AND m.lnLiniiActive > 0
-			LOCAL lcSemnaturaAcum
-			lcSemnaturaAcum = This.SemnaturaDivergenteSincronizare()
-			*!* doar divergentele aparute in sesiunea curenta deschid dialogul; N-A nu intra in semnatura
-			IF !Empty(m.lcSemnaturaAcum) AND !(m.lcSemnaturaAcum == This.cSemnaturaSincronizare)
-				This.AfiseazaDialogSincronizareArticole()
-			ENDIF
-		ENDIF
 		RETURN m.llRet