From 16c56282f55950bb3117ab0df9de217d37c5126e Mon Sep 17 00:00:00 2001 From: Marius Mutu Date: Thu, 23 Jul 2026 16:26:11 +0300 Subject: [PATCH] frm_rulaje: coloana Valoare achizitie fara TVA + coloane noi valoare achizitie cu TVA / vanzare / vanzare cu TVA Co-Authored-By: Claude Fable 5 Claude-Session: https://claude.ai/code/session_01AShi6L9LPRYfik7ucXduNB --- clase/rulaje.vc2 | 162 +++++++++++++++++++++++++++++++++++------------ 1 file changed, 123 insertions(+), 39 deletions(-) diff --git a/clase/rulaje.vc2 b/clase/rulaje.vc2 index 1d43e39..b743be5 100644 --- a/clase/rulaje.vc2 +++ b/clase/rulaje.vc2 @@ -385,12 +385,18 @@ DEFINE CLASS frm_rulaje AS _frmbase OF "_frm_base.vcx" *< OBJECTDATA: ObjPath="pgframe.Page1.grdrulaje.cTva.Text1" UniqueID="" Timestamp="" /> *< OBJECTDATA: ObjPath="pgframe.Page1.grdrulaje.cValoare.Header1" UniqueID="" Timestamp="" /> *< OBJECTDATA: ObjPath="pgframe.Page1.grdrulaje.cValoare.Text1" UniqueID="" Timestamp="" /> + *< OBJECTDATA: ObjPath="pgframe.Page1.grdrulaje.cValoareTva.Header1" UniqueID="" Timestamp="" /> + *< OBJECTDATA: ObjPath="pgframe.Page1.grdrulaje.cValoareTva.Text1" UniqueID="" Timestamp="" /> *< OBJECTDATA: ObjPath="pgframe.Page1.grdrulaje.cPretv.Header1" UniqueID="" Timestamp="" /> *< OBJECTDATA: ObjPath="pgframe.Page1.grdrulaje.cPretv.Text1" UniqueID="" Timestamp="" /> *< OBJECTDATA: ObjPath="pgframe.Page1.grdrulaje.cTvav.Header1" UniqueID="" Timestamp="" /> *< OBJECTDATA: ObjPath="pgframe.Page1.grdrulaje.cTvav.Text1" UniqueID="" Timestamp="" /> *< OBJECTDATA: ObjPath="pgframe.Page1.grdrulaje.cPretvtva.Header1" UniqueID="" Timestamp="" /> *< OBJECTDATA: ObjPath="pgframe.Page1.grdrulaje.cPretvtva.Text1" UniqueID="" Timestamp="" /> + *< OBJECTDATA: ObjPath="pgframe.Page1.grdrulaje.cValoareV.Header1" UniqueID="" Timestamp="" /> + *< OBJECTDATA: ObjPath="pgframe.Page1.grdrulaje.cValoareV.Text1" UniqueID="" Timestamp="" /> + *< OBJECTDATA: ObjPath="pgframe.Page1.grdrulaje.cValoareVTva.Header1" UniqueID="" Timestamp="" /> + *< OBJECTDATA: ObjPath="pgframe.Page1.grdrulaje.cValoareVTva.Text1" UniqueID="" Timestamp="" /> *< OBJECTDATA: ObjPath="pgframe.Page1.grdrulaje.cProc_tva.Header1" UniqueID="" Timestamp="" /> *< OBJECTDATA: ObjPath="pgframe.Page1.grdrulaje.cProc_tva.Text1" UniqueID="" Timestamp="" /> *< OBJECTDATA: ObjPath="pgframe.Page1.grdrulaje.cUtil.Header1" UniqueID="" Timestamp="" /> @@ -810,7 +816,7 @@ DEFINE CLASS frm_rulaje AS _frmbase OF "_frm_base.vcx" *< END OBJECT: ClassLib="_cb_base.vcx" BaseClass="combobox" /> ADD OBJECT 'pgframe.Page1.grdrulaje' AS _grdrow WITH ; - ColumnCount = 63, ; + ColumnCount = 66, ; DeleteMark = .F., ; GridLineColor = 128,128,128, ; Height = 351, ; @@ -892,7 +898,7 @@ DEFINE CLASS frm_rulaje AS _frmbase OF "_frm_base.vcx" Column10.Name = "cCont", ; Column10.ReadOnly = .T., ; Column10.Width = 46, ; - Column11.ColumnOrder = 62, ; + Column11.ColumnOrder = 65, ; Column11.ControlSource = "cod", ; Column11.FontName = "Arial", ; Column11.Name = "cCod", ; @@ -956,21 +962,21 @@ DEFINE CLASS frm_rulaje AS _frmbase OF "_frm_base.vcx" Column19.ReadOnly = .T., ; Column19.Width = 75, ; Column20.ColumnOrder = 27, ; - Column20.ControlSource = "round((cant+cante)*(pret+tva),gnPc)", ; + Column20.ControlSource = "round((cant+cante)*pret,gnPc)", ; Column20.FontName = "Arial", ; Column20.Format = "R", ; Column20.InputMask = (get_mask(12,gnPa)), ; Column20.Name = "cValoare", ; Column20.ReadOnly = .T., ; Column20.Width = 93, ; - Column21.ColumnOrder = 29, ; + Column21.ColumnOrder = 30, ; Column21.ControlSource = "pretv", ; Column21.FontName = "Arial", ; Column21.Format = "R", ; Column21.InputMask = (get_mask(14,gnPPretV)), ; Column21.Name = "cPretv", ; Column21.ReadOnly = .T., ; - Column22.ColumnOrder = 30, ; + Column22.ColumnOrder = 31, ; Column22.ControlSource = "tvav", ; Column22.FontName = "Arial", ; Column22.Format = "R", ; @@ -978,7 +984,7 @@ DEFINE CLASS frm_rulaje AS _frmbase OF "_frm_base.vcx" Column22.Name = "cTvav", ; Column22.ReadOnly = .T., ; Column22.Width = 109, ; - Column23.ColumnOrder = 31, ; + Column23.ColumnOrder = 32, ; Column23.ControlSource = "pretv+tvav", ; Column23.FontName = "Arial", ; Column23.Format = "R", ; @@ -986,7 +992,7 @@ DEFINE CLASS frm_rulaje AS _frmbase OF "_frm_base.vcx" Column23.Name = "cPretvtva", ; Column23.ReadOnly = .T., ; Column23.Width = 111, ; - Column24.ColumnOrder = 32, ; + Column24.ColumnOrder = 35, ; Column24.ControlSource = "proc_tvav", ; Column24.FontName = "Arial", ; Column24.Format = "R", ; @@ -994,55 +1000,55 @@ DEFINE CLASS frm_rulaje AS _frmbase OF "_frm_base.vcx" Column24.Name = "cProc_tva", ; Column24.ReadOnly = .T., ; Column24.Width = 54, ; - Column25.ColumnOrder = 49, ; + Column25.ColumnOrder = 52, ; Column25.ControlSource = "util", ; Column25.FontName = "Arial", ; Column25.Name = "cUtil", ; Column25.ReadOnly = .T., ; Column25.Width = 117, ; - Column26.ColumnOrder = 50, ; + Column26.ColumnOrder = 53, ; Column26.ControlSource = "dataora", ; Column26.FontName = "Arial", ; Column26.Name = "cDataora", ; Column26.ReadOnly = .T., ; Column26.Width = 112, ; - Column27.ColumnOrder = 33, ; + Column27.ColumnOrder = 36, ; Column27.ControlSource = "sectie", ; Column27.FontName = "Arial", ; Column27.Name = "cSectie", ; Column27.ReadOnly = .T., ; Column27.Width = 127, ; - Column28.ColumnOrder = 34, ; + Column28.ColumnOrder = 37, ; Column28.ControlSource = "datain", ; Column28.FontName = "Arial", ; Column28.Name = "cDatain", ; Column28.ReadOnly = .T., ; Column28.Width = 96, ; - Column29.ColumnOrder = 35, ; + Column29.ColumnOrder = 38, ; Column29.ControlSource = "dataout", ; Column29.FontName = "Arial", ; Column29.Name = "cDataOut", ; Column29.ReadOnly = .T., ; Column29.Width = 95, ; - Column30.ColumnOrder = 36, ; + Column30.ColumnOrder = 39, ; Column30.ControlSource = "nresp", ; Column30.FontName = "Arial", ; Column30.Name = "cNresp", ; Column30.ReadOnly = .T., ; Column30.Width = 137, ; - Column31.ColumnOrder = 37, ; + Column31.ColumnOrder = 40, ; Column31.ControlSource = "cgestc", ; Column31.FontName = "Arial", ; Column31.Name = "cGestC", ; Column31.ReadOnly = .T., ; Column31.Width = 127, ; - Column32.ColumnOrder = 38, ; + Column32.ColumnOrder = 41, ; Column32.ControlSource = "nrespc", ; Column32.FontName = "Arial", ; Column32.Name = "cNrespC", ; Column32.ReadOnly = .T., ; Column32.Width = 126, ; - Column33.ColumnOrder = 46, ; + Column33.ColumnOrder = 49, ; Column33.ControlSource = "tip_rulaj", ; Column33.FontName = "Arial", ; Column33.Name = "cTipRulaj", ; @@ -1060,7 +1066,7 @@ DEFINE CLASS frm_rulaje AS _frmbase OF "_frm_base.vcx" Column35.Name = "Column35", ; Column35.ReadOnly = .T., ; Column35.Width = 35, ; - Column36.ColumnOrder = 39, ; + Column36.ColumnOrder = 42, ; Column36.ControlSource = "grupa", ; Column36.FontName = "Arial", ; Column36.Name = "cGrupa", ; @@ -1072,19 +1078,19 @@ DEFINE CLASS frm_rulaje AS _frmbase OF "_frm_base.vcx" Column37.Name = "cNract", ; Column37.ReadOnly = .T., ; Column37.Width = 76, ; - Column38.ColumnOrder = 40, ; + Column38.ColumnOrder = 43, ; Column38.ControlSource = "subgrupa", ; Column38.FontName = "Arial", ; Column38.Name = "cSubgrupa", ; Column38.ReadOnly = .T., ; Column38.Width = 114, ; - Column39.ColumnOrder = 51, ; + Column39.ColumnOrder = 54, ; Column39.ControlSource = "utils", ; Column39.FontName = "Arial", ; Column39.Name = "cUtils", ; Column39.ReadOnly = .T., ; Column39.Width = 100, ; - Column40.ColumnOrder = 52, ; + Column40.ColumnOrder = 55, ; Column40.ControlSource = "dataoras", ; Column40.FontName = "Arial", ; Column40.Name = "cDataoras", ; @@ -1102,7 +1108,7 @@ DEFINE CLASS frm_rulaje AS _frmbase OF "_frm_base.vcx" Column42.Name = "cNume_val", ; Column42.ReadOnly = .T., ; Column42.Width = 52, ; - Column43.ColumnOrder = 28, ; + Column43.ColumnOrder = 29, ; Column43.ControlSource = "round((cant+cante)*(pretd),gnPval)", ; Column43.FontName = "Arial", ; Column43.Name = "Column43", ; @@ -1113,88 +1119,88 @@ DEFINE CLASS frm_rulaje AS _frmbase OF "_frm_base.vcx" Column44.Name = "cSerie_act", ; Column44.ReadOnly = .T., ; Column44.Width = 56, ; - Column45.ColumnOrder = 41, ; + Column45.ColumnOrder = 44, ; Column45.ControlSource = "codmatf", ; Column45.FontName = "Arial", ; Column45.Name = "cCodmatF", ; Column45.ReadOnly = .T., ; - Column46.ColumnOrder = 42, ; + Column46.ColumnOrder = 45, ; Column46.ControlSource = "lot", ; Column46.FontName = "Arial", ; Column46.Name = "cLot", ; Column46.ReadOnly = .T., ; - Column47.ColumnOrder = 43, ; + Column47.ColumnOrder = 46, ; Column47.ControlSource = "adata_expirare", ; Column47.FontName = "Arial", ; Column47.Name = "cDataExpirare", ; Column47.ReadOnly = .T., ; Column47.Width = 125, ; - Column48.ColumnOrder = 48, ; + Column48.ColumnOrder = 51, ; Column48.ControlSource = "sucursala", ; Column48.FontName = "Arial", ; Column48.Name = "cSucursala", ; Column48.ReadOnly = .T., ; Column48.Width = 146, ; - Column49.ColumnOrder = 44, ; + Column49.ColumnOrder = 47, ; Column49.ControlSource = "part_rez", ; Column49.FontName = "Arial", ; Column49.Name = "cPart_rez", ; Column49.ReadOnly = .T., ; Column49.Width = 117, ; - Column50.ColumnOrder = 45, ; + Column50.ColumnOrder = 48, ; Column50.ControlSource = "nrord_rez", ; Column50.FontName = "Arial", ; Column50.Name = "cNrord_rez", ; Column50.ReadOnly = .T., ; Column50.Width = 120, ; - Column51.ColumnOrder = 53, ; + Column51.ColumnOrder = 56, ; Column51.ControlSource = "id_articol", ; Column51.FontName = "Arial", ; Column51.Name = "cIdArticol", ; Column51.ReadOnly = .T., ; Column51.Width = 96, ; - Column52.ColumnOrder = 54, ; + Column52.ColumnOrder = 57, ; Column52.ControlSource = "codbare", ; Column52.FontName = "Arial", ; Column52.Name = "cCodBare", ; Column52.ReadOnly = .T., ; Column52.Width = 130, ; - Column53.ColumnOrder = 55, ; + Column53.ColumnOrder = 58, ; Column53.ControlSource = "furnizor", ; Column53.FontName = "Arial", ; Column53.Name = "cFurnizor", ; Column53.ReadOnly = .T., ; Column53.Width = 186, ; - Column54.ColumnOrder = 56, ; + Column54.ColumnOrder = 59, ; Column54.ControlSource = "id_furnizor", ; Column54.FontName = "Arial", ; Column54.Name = "cIdFurnizor", ; Column54.ReadOnly = .T., ; - Column55.ColumnOrder = 57, ; + Column55.ColumnOrder = 60, ; Column55.ControlSource = "codnc8", ; Column55.Name = "cCodNC8", ; Column55.ReadOnly = .T., ; Column55.Width = 159, ; - Column56.ColumnOrder = 58, ; + Column56.ColumnOrder = 61, ; Column56.ControlSource = "greutate", ; Column56.Name = "cGreutate", ; Column56.ReadOnly = .T., ; - Column57.ColumnOrder = 59, ; + Column57.ColumnOrder = 62, ; Column57.ControlSource = "tara_origine", ; Column57.Name = "cTaraOrigine", ; Column57.ReadOnly = .T., ; Column57.Width = 167, ; - Column58.ColumnOrder = 60, ; + Column58.ColumnOrder = 63, ; Column58.ControlSource = "explicatie_tva", ; Column58.Name = "cExplicatieTVA", ; Column58.ReadOnly = .T., ; Column58.Width = 146, ; - Column59.ColumnOrder = 61, ; + Column59.ColumnOrder = 64, ; Column59.ControlSource = "taxname", ; Column59.Name = "cTaxName", ; Column59.ReadOnly = .T., ; Column59.Width = 156, ; - Column60.ColumnOrder = 47, ; + Column60.ColumnOrder = 50, ; Column60.ControlSource = "id_set", ; Column60.Name = "cIdSet", ; Column60.ReadOnly = .T., ; @@ -1211,10 +1217,34 @@ DEFINE CLASS frm_rulaje AS _frmbase OF "_frm_base.vcx" Column62.ReadOnly = .F., ; Column62.Sparse = .F., ; Column62.Width = 28, ; - Column63.ColumnOrder = 63, ; + Column63.ColumnOrder = 66, ; Column63.ControlSource = "id_fact", ; Column63.Name = "cIdFact", ; - Column63.ReadOnly = .T. + Column63.ReadOnly = .T., ; + Column64.ColumnOrder = 28, ; + Column64.ControlSource = "round((cant+cante)*(pret+tva),gnPc)", ; + Column64.FontName = "Arial", ; + Column64.Format = "R", ; + Column64.InputMask = (get_mask(12,gnPa)), ; + Column64.Name = "cValoareTva", ; + Column64.ReadOnly = .T., ; + Column64.Width = 93, ; + Column65.ColumnOrder = 33, ; + Column65.ControlSource = "round((cant+cante)*pretv,gnPc)", ; + Column65.FontName = "Arial", ; + Column65.Format = "R", ; + Column65.InputMask = (get_mask(12,gnPa)), ; + Column65.Name = "cValoareV", ; + Column65.ReadOnly = .T., ; + Column65.Width = 93, ; + Column66.ColumnOrder = 34, ; + Column66.ControlSource = "round((cant+cante)*(pretv+tvav),gnPc)", ; + Column66.FontName = "Arial", ; + Column66.Format = "R", ; + Column66.InputMask = (get_mask(12,gnPa)), ; + Column66.Name = "cValoareVTva", ; + Column66.ReadOnly = .T., ; + Column66.Width = 100 *< END OBJECT: ClassLib="_grd_base.vcx" BaseClass="grid" /> ADD OBJECT 'pgframe.Page1.grdrulaje.cAcont.Header1' AS header WITH ; @@ -2341,6 +2371,60 @@ DEFINE CLASS frm_rulaje AS _frmbase OF "_frm_base.vcx" SelectedBackColor = 100,185,255 *< END OBJECT: BaseClass="textbox" /> + ADD OBJECT 'pgframe.Page1.grdrulaje.cValoareTva.Header1' AS header WITH ; + Alignment = 2, ; + Caption = "Valoare achizitie cu TVA", ; + FontSize = 10, ; + Name = "Header1" + *< END OBJECT: BaseClass="header" /> + + ADD OBJECT 'pgframe.Page1.grdrulaje.cValoareTva.Text1' AS textbox WITH ; + BackColor = 255,255,255, ; + BorderStyle = 0, ; + FontName = "Arial", ; + ForeColor = 0,0,0, ; + Margin = 0, ; + Name = "Text1", ; + ReadOnly = .T., ; + SelectedBackColor = 100,185,255 + *< END OBJECT: BaseClass="textbox" /> + + ADD OBJECT 'pgframe.Page1.grdrulaje.cValoareV.Header1' AS header WITH ; + Alignment = 2, ; + Caption = "Valoare vanzare", ; + FontSize = 10, ; + Name = "Header1" + *< END OBJECT: BaseClass="header" /> + + ADD OBJECT 'pgframe.Page1.grdrulaje.cValoareV.Text1' AS textbox WITH ; + BackColor = 255,255,255, ; + BorderStyle = 0, ; + FontName = "Arial", ; + ForeColor = 0,0,0, ; + Margin = 0, ; + Name = "Text1", ; + ReadOnly = .T., ; + SelectedBackColor = 100,185,255 + *< END OBJECT: BaseClass="textbox" /> + + ADD OBJECT 'pgframe.Page1.grdrulaje.cValoareVTva.Header1' AS header WITH ; + Alignment = 2, ; + Caption = "Valoare vanzare cu TVA", ; + FontSize = 10, ; + Name = "Header1" + *< END OBJECT: BaseClass="header" /> + + ADD OBJECT 'pgframe.Page1.grdrulaje.cValoareVTva.Text1' AS textbox WITH ; + BackColor = 255,255,255, ; + BorderStyle = 0, ; + FontName = "Arial", ; + ForeColor = 0,0,0, ; + Margin = 0, ; + Name = "Text1", ; + ReadOnly = .T., ; + SelectedBackColor = 100,185,255 + *< END OBJECT: BaseClass="textbox" /> + ADD OBJECT 'pgframe.Page1.Label1' AS _label WITH ; Anchor = 9, ; AutoSize = .T., ;