From e9061cc50d0f58f2e92ea1fae0382dceb20c0aa5 Mon Sep 17 00:00:00 2001 From: Marius Mutu Date: Mon, 20 Jul 2026 14:19:05 +0300 Subject: [PATCH] Introducere compacta: explicatia/4/5 editabile pe fiecare rand Grila din frm_introd_compact2007 primeste 3 coloane noi legate la explicatia, explicatia4 si explicatia5 din introdc; valorile implicite vin din poAct, iar cele editate se salveaza in ACT prin Gather ointr. Liniile derivate (TVA, incasare/plata) pastreaza valorile din poAct. explicatia a fost adaugata si in cele 4 INSERT INTO actactan ... SELECT. Modificarea din COMUN/programe/pmenu.prg se comite separat (repo partajat). Co-Authored-By: Claude Opus 4.8 (1M context) Claude-Session: https://claude.ai/code/session_015DQoCUF3QSCgQCwCBK1qbz --- Clase/ointroduceri_cont.vc2 | 119 +++++++++++++++++++++++++++++++----- changelog_roacont.txt | 10 ++- 2 files changed, 112 insertions(+), 17 deletions(-) diff --git a/Clase/ointroduceri_cont.vc2 b/Clase/ointroduceri_cont.vc2 index 3041e28..b205734 100644 --- a/Clase/ointroduceri_cont.vc2 +++ b/Clase/ointroduceri_cont.vc2 @@ -2293,6 +2293,12 @@ DEFINE CLASS frm_introd_compact2007 AS formtermin OF "..\comun\clase\baza.vcx" *< OBJECTDATA: ObjPath="Gridb1.Column23.Header1" UniqueID="" Timestamp="" /> *< OBJECTDATA: ObjPath="Gridb1.Column23.Text1" UniqueID="" Timestamp="" /> *< OBJECTDATA: ObjPath="Gridb1.Column23._combobox1" UniqueID="" Timestamp="" /> + *< OBJECTDATA: ObjPath="Gridb1.Column24.Header1" UniqueID="" Timestamp="" /> + *< OBJECTDATA: ObjPath="Gridb1.Column24.Text1" UniqueID="" Timestamp="" /> + *< OBJECTDATA: ObjPath="Gridb1.Column25.Header1" UniqueID="" Timestamp="" /> + *< OBJECTDATA: ObjPath="Gridb1.Column25.Text1" UniqueID="" Timestamp="" /> + *< OBJECTDATA: ObjPath="Gridb1.Column26.Header1" UniqueID="" Timestamp="" /> + *< OBJECTDATA: ObjPath="Gridb1.Column26.Text1" UniqueID="" Timestamp="" /> *< OBJECTDATA: ObjPath="Renunt1" UniqueID="" Timestamp="" /> *< OBJECTDATA: ObjPath="Item1" UniqueID="" Timestamp="" /> *< OBJECTDATA: ObjPath="Gridextra1" UniqueID="" Timestamp="" /> @@ -2543,7 +2549,7 @@ DEFINE CLASS frm_introd_compact2007 AS formtermin OF "..\comun\clase\baza.vcx" ADD OBJECT 'Gridb1' AS gridb WITH ; Anchor = 15, ; BackColor = 244,250,255, ; - ColumnCount = 23, ; + ColumnCount = 26, ; FontSize = 10, ; GridLineColor = 192,192,192, ; Height = 254, ; @@ -2748,7 +2754,31 @@ DEFINE CLASS frm_introd_compact2007 AS formtermin OF "..\comun\clase\baza.vcx" Column23.FontSize = 10, ; Column23.Name = "Column23", ; Column23.Sparse = .F., ; - Column23.Width = 93 + Column23.Width = 93, ; + Column24.BackColor = 244,250,255, ; + Column24.ColumnOrder = 24, ; + Column24.ControlSource = "explicatia", ; + Column24.FontName = "Arial", ; + Column24.FontSize = 10, ; + Column24.Name = "Column24", ; + Column24.ReadOnly = .F., ; + Column24.Width = 120, ; + Column25.BackColor = 244,250,255, ; + Column25.ColumnOrder = 25, ; + Column25.ControlSource = "explicatia4", ; + Column25.FontName = "Arial", ; + Column25.FontSize = 10, ; + Column25.Name = "Column25", ; + Column25.ReadOnly = .F., ; + Column25.Width = 120, ; + Column26.BackColor = 244,250,255, ; + Column26.ColumnOrder = 26, ; + Column26.ControlSource = "explicatia5", ; + Column26.FontName = "Arial", ; + Column26.FontSize = 10, ; + Column26.Name = "Column26", ; + Column26.ReadOnly = .F., ; + Column26.Width = 120 *< END OBJECT: ClassLib="..\comun\clase\baza.vcx" BaseClass="grid" /> ADD OBJECT 'Gridb1.Column10.Header1' AS header WITH ; @@ -3067,6 +3097,63 @@ DEFINE CLASS frm_introd_compact2007 AS formtermin OF "..\comun\clase\baza.vcx" Visible = .T. *< END OBJECT: BaseClass="textbox" /> + ADD OBJECT 'Gridb1.Column24.Header1' AS header WITH ; + Alignment = 2, ; + Caption = "Explicatia act", ; + FontName = "Arial", ; + FontSize = 10, ; + Name = "Header1" + *< END OBJECT: BaseClass="header" /> + + ADD OBJECT 'Gridb1.Column24.Text1' AS textbox WITH ; + BackColor = 244,250,255, ; + BorderStyle = 0, ; + FontName = "Arial", ; + FontSize = 10, ; + ForeColor = 0,0,0, ; + Margin = 0, ; + Name = "Text1", ; + ReadOnly = .F. + *< END OBJECT: BaseClass="textbox" /> + + ADD OBJECT 'Gridb1.Column25.Header1' AS header WITH ; + Alignment = 2, ; + Caption = "Explicatia 4", ; + FontName = "Arial", ; + FontSize = 10, ; + Name = "Header1" + *< END OBJECT: BaseClass="header" /> + + ADD OBJECT 'Gridb1.Column25.Text1' AS textbox WITH ; + BackColor = 244,250,255, ; + BorderStyle = 0, ; + FontName = "Arial", ; + FontSize = 10, ; + ForeColor = 0,0,0, ; + Margin = 0, ; + Name = "Text1", ; + ReadOnly = .F. + *< END OBJECT: BaseClass="textbox" /> + + ADD OBJECT 'Gridb1.Column26.Header1' AS header WITH ; + Alignment = 2, ; + Caption = "Explicatia 5", ; + FontName = "Arial", ; + FontSize = 10, ; + Name = "Header1" + *< END OBJECT: BaseClass="header" /> + + ADD OBJECT 'Gridb1.Column26.Text1' AS textbox WITH ; + BackColor = 244,250,255, ; + BorderStyle = 0, ; + FontName = "Arial", ; + FontSize = 10, ; + ForeColor = 0,0,0, ; + Margin = 0, ; + Name = "Text1", ; + ReadOnly = .F. + *< END OBJECT: BaseClass="textbox" /> + ADD OBJECT 'Gridb1.Column3.Header1' AS header WITH ; Alignment = 2, ; Caption = "Cont Deb", ; @@ -3911,7 +3998,7 @@ DEFINE CLASS frm_introd_compact2007 AS formtermin OF "..\comun\clase\baza.vcx" Append Blank Gather Name &lcObj Fields Except taxcode, paymentcode Gather Name loLinieTva Fields ascc, proc_tva, id_jtva_coloana, taxcode - Gather Name ointr Fields Except ascc, proc_tva, id_partc, id_partd, partd, id_factc, id_factd, perechec, pereched, id_jtva_coloana, taxcode, paymentcode + Gather Name ointr Fields Except explicatia, explicatia4, explicatia5, ascc, proc_tva, id_partc, id_partd, partd, id_factc, id_factd, perechec, pereched, id_jtva_coloana, taxcode, paymentcode Replace scd With tctva, scc With tcscc, ascd With '', ascc With loLinieTva.ascc, suma With lnsuma, id_partc With loLinieTva.id_part, partc With loLinieTva.nume_part *!* 28.02.2012 Replace suma_val With 0 @@ -3946,7 +4033,7 @@ DEFINE CLASS frm_introd_compact2007 AS formtermin OF "..\comun\clase\baza.vcx" Append Blank Gather Name &lcObj Fields Except taxcode, paymentcode Gather Name loLinieTva Fields ascd, proc_tva, id_jtva_coloana, taxcode - Gather Name ointr Fields Except suma, ascd, id_partd, id_partc, partc, id_factc, id_factd, perechec, pereched, id_jtva_coloana, taxcode, paymentcode + Gather Name ointr Fields Except explicatia, explicatia4, explicatia5, suma, ascd, id_partd, id_partc, partc, id_factc, id_factd, perechec, pereched, id_jtva_coloana, taxcode, paymentcode Replace scc With tctva, scd With tcscd, ascc With '', ascd With loLinieTva.ascd, suma With lnsuma, id_partd With loLinieTva.id_part, partd With loLinieTva.nume_part *!* 28.02.2012 Replace suma_val With 0 @@ -4058,7 +4145,7 @@ DEFINE CLASS frm_introd_compact2007 AS formtermin OF "..\comun\clase\baza.vcx" If !Inlist(&lcObj..scc, '408', '409') Replace id_jtva_coloana With Null, proc_tva With 0 Endif - Gather Name ointr Fields Except suma, ascc, scc, id_partc, id_factc, id_factd, perechec, pereched, id_jtva_coloana, proc_tva, serie_act, taxcode, paymentcode + Gather Name ointr Fields Except explicatia, explicatia4, explicatia5, suma, ascc, scc, id_partc, id_factc, id_factd, perechec, pereched, id_jtva_coloana, proc_tva, serie_act, taxcode, paymentcode Replace partd With partc, id_partd With id_partc, suma With lnsuma *!* modificare ROACONT v 2.4.0 : am adaugat Thisform.seriechit Replace scd With scc, ascd With ascc, scc With '5311', ascc With '', pereched With nract, id_factd With - 1, ; @@ -4099,7 +4186,7 @@ DEFINE CLASS frm_introd_compact2007 AS formtermin OF "..\comun\clase\baza.vcx" If !Inlist(&lcObj..scd, '418', '419') Replace id_jtva_coloana With Null, proc_tva With 0 Endif - Gather Name ointr Fields Except suma, ascd, scd, id_partd, id_factd, id_factc, pereched, perechec, id_jtva_coloana, proc_tva, serie_act, taxcode, paymentcode + Gather Name ointr Fields Except explicatia, explicatia4, explicatia5, suma, ascd, scd, id_partd, id_factd, id_factc, pereched, perechec, id_jtva_coloana, proc_tva, serie_act, taxcode, paymentcode Replace partc With partd, id_partc With id_partd, suma With lnsuma *!* modificare ROACONT v 2.4.0 : am adaugat Thisform.seriechit Replace scc With scd, ascc With ascd, scd With '5311', ascd With '', perechec With nract, id_factc With - 1, ; @@ -4152,7 +4239,7 @@ DEFINE CLASS frm_introd_compact2007 AS formtermin OF "..\comun\clase\baza.vcx" If !Inlist(&lcObj..scc, '408', '409') Replace id_jtva_coloana With Null, proc_tva With 0 Endif - Gather Name ointr Fields Except suma, ascc, scc, id_partc, id_jtva_coloana, proc_tva, serie_act, taxcode, paymentcode + Gather Name ointr Fields Except explicatia, explicatia4, explicatia5, suma, ascc, scc, id_partc, id_jtva_coloana, proc_tva, serie_act, taxcode, paymentcode Replace partd With partc, id_partd With id_partc, suma With lnsuma *!* modificare ROACONT v 2.4.0 : am adaugat Thisform.seriechit Replace scd With scc, ascd With ascc, scc With '542 ', ascc With '', pereched With nract, id_factd With - 1, ; @@ -4249,7 +4336,7 @@ DEFINE CLASS frm_introd_compact2007 AS formtermin OF "..\comun\clase\baza.vcx" If !Inlist(&lcObj..scc, '408', '409') Replace id_jtva_coloana With Null, proc_tva With 0 Endif - Gather Name ointr Fields Except suma, ascc, scc, id_partc, id_factc, id_factd, perechec, pereched, id_jtva_coloana, proc_tva, serie_act, taxcode, paymentcode + Gather Name ointr Fields Except explicatia, explicatia4, explicatia5, suma, ascc, scc, id_partc, id_factc, id_factd, perechec, pereched, id_jtva_coloana, proc_tva, serie_act, taxcode, paymentcode Replace partd With partc, id_partd With id_partc, suma With lnsuma *!* modificare ROACONT v 2.4.0 : am adaugat Thisform.seriechit Replace scd With scc, ascd With ascc, scc With '462 ', ascc With '', pereched With nract, id_factd With - 1, ; @@ -4276,7 +4363,7 @@ DEFINE CLASS frm_introd_compact2007 AS formtermin OF "..\comun\clase\baza.vcx" If Inlist(Thisform.optAchitat.Value, 2, 3, 4) Insert Into actactan(nr_nota, serie_act, luna, an, nract, scd, ascc, scc, ; - suma, suma_val, pereched, perechec, explicatia4, explicatia5, Curs, id_util, ; + suma, suma_val, pereched, perechec, explicatia, explicatia4, explicatia5, Curs, id_util, ; id_responsabil, nresp, id_venchelt, dst_chlt, id_lucrare, nrord, ; id_ctr, contract, id_sectie, sectie, proc_tva, id_set, id_fact, ; id_factd, id_factc, id_partd, partd, id_partc, partc, ; @@ -4284,7 +4371,7 @@ DEFINE CLASS frm_introd_compact2007 AS formtermin OF "..\comun\clase\baza.vcx" gestin, id_gestout, gestout, id_valuta, nume_val, dataact, dataireg); Select a.nr_nota, Nvl(Thisform.seriechit, '') As serie_act, a.luna, a.an, Thisform.nrchit As nract, '4426' As scd, a.ascd As ascc, '4428' As scc, ; Round(a.suma * m.lnCoeficientAchitat, m.gnPA) As suma, Round(a.suma_val * m.lnCoeficientAchitat, m.gnPval) As suma_val, ; - a.nract As pereched, a.perechec, a.explicatia4, a.explicatia5, a.Curs, a.id_util, ; + a.nract As pereched, a.perechec, a.explicatia, a.explicatia4, a.explicatia5, a.Curs, a.id_util, ; a.id_responsabil, a.nresp, a.id_venchelt, a.dst_chlt, a.id_lucrare, a.nrord, ; a.id_ctr, a.contract, a.id_sectie, a.sectie, a.proc_tva, a.id_set, -5 As id_fact, ; 0 As id_factd, 0 As id_factc, 0 As id_partd, '' As partd, 0 As id_partc, '' As partc, ; @@ -4298,7 +4385,7 @@ DEFINE CLASS frm_introd_compact2007 AS formtermin OF "..\comun\clase\baza.vcx" Where a.scd = '4428' And Like('4*', a.scc) And !Isnull(b.id_jtva_ex) Insert Into actactan(nr_nota, serie_act, luna, an, nract, scc, ascd, scd, ; - suma, suma_val, pereched, perechec, explicatia4, explicatia5, Curs, id_util, ; + suma, suma_val, pereched, perechec, explicatia, explicatia4, explicatia5, Curs, id_util, ; id_responsabil, nresp, id_venchelt, dst_chlt, id_lucrare, nrord, ; id_ctr, contract, id_sectie, sectie, proc_tva, id_set, id_fact, ; id_factd, id_factc, id_partd, partd, id_partc, partc, ; @@ -4306,7 +4393,7 @@ DEFINE CLASS frm_introd_compact2007 AS formtermin OF "..\comun\clase\baza.vcx" gestin, id_gestout, gestout, id_valuta, nume_val, dataact, dataireg); Select a.nr_nota, Nvl(Thisform.seriechit, '') As serie_act, a.luna, a.an, Thisform.nrchit As nract, '4427' As scc, a.ascc As ascd, '4428' As scd, ; Round(a.suma * m.lnCoeficientAchitat, m.gnPA) As suma, Round(a.suma_val * m.lnCoeficientAchitat, m.gnPval) As suma_val, ; - a.pereched, a.nract As perechec, a.explicatia4, a.explicatia5, a.Curs, a.id_util, ; + a.pereched, a.nract As perechec, a.explicatia, a.explicatia4, a.explicatia5, a.Curs, a.id_util, ; a.id_responsabil, a.nresp, a.id_venchelt, a.dst_chlt, a.id_lucrare, a.nrord, ; a.id_ctr, a.contract, a.id_sectie, a.sectie, a.proc_tva, a.id_set, -5 As id_fact, ; 0 As id_factd, 0 As id_factc, 0 As id_partd, '' As partd, 0 As id_partc, '' As partc, ; @@ -4350,7 +4437,7 @@ DEFINE CLASS frm_introd_compact2007 AS formtermin OF "..\comun\clase\baza.vcx" llN100 = (m.lnIdSet = 10647) Or m.llLimitareDeducere100 Insert Into actactan(nr_nota, serie_act, luna, an, nract, ascd, scd, scc, ; - suma, suma_val, pereched, perechec, explicatia4, explicatia5, Curs, id_util, ; + suma, suma_val, pereched, perechec, explicatia, explicatia4, explicatia5, Curs, id_util, ; id_responsabil, nresp, id_venchelt, dst_chlt, id_lucrare, nrord, ; id_ctr, contract, id_sectie, sectie, proc_tva, id_set, id_fact, ; id_factd, id_factc, id_partd, partd, id_partc, partc, ; @@ -4360,7 +4447,7 @@ DEFINE CLASS frm_introd_compact2007 AS formtermin OF "..\comun\clase\baza.vcx" '4426' As scc, ; Round(Round(a.suma * (a.proc_tva - 1), gnPC) * m.lnProcentNedeductibil, gnPC) As suma, ; Round(Round(a.suma_val * (a.proc_tva - 1), gnPC) * m.lnProcentNedeductibil, gnPC) As suma_val, ; - a.pereched, a.perechec, a.explicatia4, a.explicatia5, a.Curs, a.id_util, ; + a.pereched, a.perechec, a.explicatia, a.explicatia4, a.explicatia5, a.Curs, a.id_util, ; a.id_responsabil, a.nresp, a.id_venchelt, a.dst_chlt, a.id_lucrare, a.nrord, ; a.id_ctr, a.contract, a.id_sectie, a.sectie, 0 As proc_tva, a.id_set, a.id_fact, ; 0 As id_factd, 0 As id_factc, 0 As id_partd, '' As partd, 0 As id_partc, '' As partc, ; @@ -4383,7 +4470,7 @@ DEFINE CLASS frm_introd_compact2007 AS formtermin OF "..\comun\clase\baza.vcx" Inlist(&lcObj..id_set, 10609, 10647) Or ; (&lcObj..id_set = 10457 And &lcObj..deducere = 1) Or m.llLimitareDeducere50 Or m.llLimitareDeducere100) Insert Into actactan(nr_nota, serie_act, luna, an, nract, scd, scc, ; - suma, suma_val, pereched, perechec, explicatia4, explicatia5, Curs, id_util, ; + suma, suma_val, pereched, perechec, explicatia, explicatia4, explicatia5, Curs, id_util, ; id_responsabil, nresp, id_venchelt, dst_chlt, id_lucrare, nrord, ; id_ctr, contract, id_sectie, sectie, proc_tva, id_set, id_fact, ; id_factd, id_factc, id_partd, partd, id_partc, partc, ; @@ -4392,7 +4479,7 @@ DEFINE CLASS frm_introd_compact2007 AS formtermin OF "..\comun\clase\baza.vcx" Select a.nr_nota, a.serie_act, a.luna, a.an, a.nract, '4426' As scd, '4428' As scc, ; Round(Round(a.suma * (a.proc_tva - 1), gnPC) * m.lnProcentNedeductibil, gnPC) As suma, ; Round(Round(a.suma_val * (a.proc_tva - 1), gnPC) * m.lnProcentNedeductibil, gnPC) As suma_val, ; - a.pereched, a.perechec, a.explicatia4, a.explicatia5, a.Curs, a.id_util, ; + a.pereched, a.perechec, a.explicatia, a.explicatia4, a.explicatia5, a.Curs, a.id_util, ; a.id_responsabil, a.nresp, a.id_venchelt, a.dst_chlt, a.id_lucrare, a.nrord, ; a.id_ctr, a.contract, a.id_sectie, a.sectie, a.proc_tva, a.id_set, a.id_fact, ; 0 As id_factd, 0 As id_factc, 0 As id_partd, '' As partd, 0 As id_partc, '' As partc, ; diff --git a/changelog_roacont.txt b/changelog_roacont.txt index be95322..6876414 100644 --- a/changelog_roacont.txt +++ b/changelog_roacont.txt @@ -1,3 +1,11 @@ + +