diff --git a/Clase/oviz_devize.vc2 b/Clase/oviz_devize.vc2
index bcb1375..beafe4a 100644
--- a/Clase/oviz_devize.vc2
+++ b/Clase/oviz_devize.vc2
@@ -9112,1399 +9112,6 @@ DEFINE CLASS frm_inchidere_regie AS _frmbase OF "..\comun\clase\_frm_base.vcx"
ENDDEFINE
-DEFINE CLASS frm_istoric_comenzi AS _frmbase OF "..\comun\clase\_frm_base.vcx"
- *< CLASSDATA: Baseclass="form" Timestamp="" Scale="Pixels" Uniqueid="" />
-
- *-- OBJECTDATA items order determines ZOrder / El orden de los items OBJECTDATA determina el ZOrder
- *< OBJECTDATA: ObjPath="grdcomenzi" UniqueID="" Timestamp="" />
- *< OBJECTDATA: ObjPath="grdcomenzi.cNrord.Header1" UniqueID="" Timestamp="" />
- *< OBJECTDATA: ObjPath="grdcomenzi.cNrord.Text1" UniqueID="" Timestamp="" />
- *< OBJECTDATA: ObjPath="grdcomenzi.cDatai.Header1" UniqueID="" Timestamp="" />
- *< OBJECTDATA: ObjPath="grdcomenzi.cDatai.Text1" UniqueID="" Timestamp="" />
- *< OBJECTDATA: ObjPath="grdcomenzi.cNume.Header1" UniqueID="" Timestamp="" />
- *< OBJECTDATA: ObjPath="grdcomenzi.cNume.Text1" UniqueID="" Timestamp="" />
- *< OBJECTDATA: ObjPath="grdcomenzi.cValidat.Header1" UniqueID="" Timestamp="" />
- *< OBJECTDATA: ObjPath="grdcomenzi.cValidat.Text1" UniqueID="" Timestamp="" />
- *< OBJECTDATA: ObjPath="grdcomenzi.cAsigurator.Header1" UniqueID="" Timestamp="" />
- *< OBJECTDATA: ObjPath="grdcomenzi.cAsigurator.Text1" UniqueID="" Timestamp="" />
- *< OBJECTDATA: ObjPath="grdcomenzi.cFacturat.Header1" UniqueID="" Timestamp="" />
- *< OBJECTDATA: ObjPath="grdcomenzi.cFacturat.Text1" UniqueID="" Timestamp="" />
- *< OBJECTDATA: ObjPath="grdcomenzi.cMarca.Header1" UniqueID="" Timestamp="" />
- *< OBJECTDATA: ObjPath="grdcomenzi.cMarca.Text1" UniqueID="" Timestamp="" />
- *< OBJECTDATA: ObjPath="grdcomenzi.cMasina.Header1" UniqueID="" Timestamp="" />
- *< OBJECTDATA: ObjPath="grdcomenzi.cMasina.Text1" UniqueID="" Timestamp="" />
- *< OBJECTDATA: ObjPath="grdcomenzi.cTip_comanda.Header1" UniqueID="" Timestamp="" />
- *< OBJECTDATA: ObjPath="grdcomenzi.cTip_comanda.Text1" UniqueID="" Timestamp="" />
- *< OBJECTDATA: ObjPath="grdcomenzi.cDataFact.Header1" UniqueID="" Timestamp="" />
- *< OBJECTDATA: ObjPath="grdcomenzi.cDataFact.Text1" UniqueID="" Timestamp="" />
- *< OBJECTDATA: ObjPath="grdcomenzi.cNrFact.Header1" UniqueID="" Timestamp="" />
- *< OBJECTDATA: ObjPath="grdcomenzi.cNrFact.Text1" UniqueID="" Timestamp="" />
- *< OBJECTDATA: ObjPath="grdcomenzi.cInspector.Header1" UniqueID="" Timestamp="" />
- *< OBJECTDATA: ObjPath="grdcomenzi.cInspector.Text1" UniqueID="" Timestamp="" />
- *< OBJECTDATA: ObjPath="grdcomenzi.cNr_dosar.Header1" UniqueID="" Timestamp="" />
- *< OBJECTDATA: ObjPath="grdcomenzi.cNr_dosar.Text1" UniqueID="" Timestamp="" />
- *< OBJECTDATA: ObjPath="grdcomenzi.cArhivat.Header1" UniqueID="" Timestamp="" />
- *< OBJECTDATA: ObjPath="grdcomenzi.cArhivat.Text1" UniqueID="" Timestamp="" />
- *< OBJECTDATA: ObjPath="grdcomenzi.cPartRef.Header1" UniqueID="" Timestamp="" />
- *< OBJECTDATA: ObjPath="grdcomenzi.cPartRef.Text1" UniqueID="" Timestamp="" />
- *< OBJECTDATA: ObjPath="grdcomenzi.cSeries.Header1" UniqueID="" Timestamp="" />
- *< OBJECTDATA: ObjPath="grdcomenzi.cSeries.Text1" UniqueID="" Timestamp="" />
- *< OBJECTDATA: ObjPath="grdcomenzi.cKmint.Header1" UniqueID="" Timestamp="" />
- *< OBJECTDATA: ObjPath="grdcomenzi.cKmint.Text1" UniqueID="" Timestamp="" />
- *< OBJECTDATA: ObjPath="grdcomenzi.cOreFunctionare.Header1" UniqueID="" Timestamp="" />
- *< OBJECTDATA: ObjPath="grdcomenzi.cOreFunctionare.Text1" UniqueID="" Timestamp="" />
- *< OBJECTDATA: ObjPath="grdcomenzi.cValcTVAFactura.Header1" UniqueID="" Timestamp="" />
- *< OBJECTDATA: ObjPath="grdcomenzi.cValcTVAFactura.Text1" UniqueID="" Timestamp="" />
- *< OBJECTDATA: ObjPath="grdcomenzi.cValManoperaFactura.Header1" UniqueID="" Timestamp="" />
- *< OBJECTDATA: ObjPath="grdcomenzi.cValManoperaFactura.Text1" UniqueID="" Timestamp="" />
- *< OBJECTDATA: ObjPath="grdcomenzi.cValMaterialeFactura.Header1" UniqueID="" Timestamp="" />
- *< OBJECTDATA: ObjPath="grdcomenzi.cValMaterialeFactura.Text1" UniqueID="" Timestamp="" />
- *< OBJECTDATA: ObjPath="grdcomenzi.cValMaterialeAch.Header1" UniqueID="" Timestamp="" />
- *< OBJECTDATA: ObjPath="grdcomenzi.cValMaterialeAch.Text1" UniqueID="" Timestamp="" />
- *< OBJECTDATA: ObjPath="grdcomenzi.cValMaterialeVz.Header1" UniqueID="" Timestamp="" />
- *< OBJECTDATA: ObjPath="grdcomenzi.cValMaterialeVz.Text1" UniqueID="" Timestamp="" />
- *< OBJECTDATA: ObjPath="grdcomenzi.cOreManopera.Header1" UniqueID="" Timestamp="" />
- *< OBJECTDATA: ObjPath="grdcomenzi.cOreManopera.Text1" UniqueID="" Timestamp="" />
- *< OBJECTDATA: ObjPath="grdcomenzi.cValManopera.Header1" UniqueID="" Timestamp="" />
- *< OBJECTDATA: ObjPath="grdcomenzi.cValManopera.Text1" UniqueID="" Timestamp="" />
- *< OBJECTDATA: ObjPath="Cmd_cauta1" UniqueID="" Timestamp="" />
- *< OBJECTDATA: ObjPath="Cmd_reset1" UniqueID="" Timestamp="" />
- *< OBJECTDATA: ObjPath="ck_series" UniqueID="" Timestamp="" />
- *< OBJECTDATA: ObjPath="Ck_referinta" UniqueID="" Timestamp="" />
- *< OBJECTDATA: ObjPath="Ck_nr_dosar" UniqueID="" Timestamp="" />
- *< OBJECTDATA: ObjPath="Ck_inspector" UniqueID="" Timestamp="" />
- *< OBJECTDATA: ObjPath="Ck_asigurator" UniqueID="" Timestamp="" />
- *< OBJECTDATA: ObjPath="Ck_nume" UniqueID="" Timestamp="" />
- *< OBJECTDATA: ObjPath="Ck_datai" UniqueID="" Timestamp="" />
- *< OBJECTDATA: ObjPath="Cmd_vizualizare" UniqueID="" Timestamp="" />
- *< OBJECTDATA: ObjPath="Ck_nrinmat" UniqueID="" Timestamp="" />
- *< OBJECTDATA: ObjPath="Ck_facturat" UniqueID="" Timestamp="" />
- *< OBJECTDATA: ObjPath="Ck_nrord" UniqueID="" Timestamp="" />
- *< OBJECTDATA: ObjPath="lbValidat" UniqueID="" Timestamp="" />
- *< OBJECTDATA: ObjPath="lbArhivat" UniqueID="" Timestamp="" />
- *< OBJECTDATA: ObjPath="Lb_simplu1" UniqueID="" Timestamp="" />
- *< OBJECTDATA: ObjPath="Cmd_sterge1" UniqueID="" Timestamp="" />
- *< OBJECTDATA: ObjPath="cbtip_deviz" UniqueID="" Timestamp="" />
- *< OBJECTDATA: ObjPath="Xresize1" UniqueID="" Timestamp="" />
- *< OBJECTDATA: ObjPath="But_excel1" UniqueID="" Timestamp="" />
- *< OBJECTDATA: ObjPath="But_listare1" UniqueID="" Timestamp="" />
- *< OBJECTDATA: ObjPath="Gridextra1" UniqueID="" Timestamp="" />
- *< OBJECTDATA: ObjPath="cbArhivat" UniqueID="" Timestamp="" />
- *< OBJECTDATA: ObjPath="cbValidat" UniqueID="" Timestamp="" />
-
- *
- BorderStyle = 3
- cgridsortlist = grdcomenzi
- DoCreate = .T.
- Height = 489
- lactiv1 = .T.
- lactiv2 = .T.
- Name = "frm_istoric_comenzi"
- Width = 793
- WindowState = 2
- _shape1.Height = 29
- _shape1.Left = 0
- _shape1.Name = "_shape1"
- _shape1.Tag = "RESIZABLE,NOVERTICAL_RESIZE"
- _shape1.Top = 0
- _shape1.Width = 792
- _shape1.ZOrderSet = 1
- _shape2.Height = 29
- _shape2.Left = 730
- _shape2.Name = "_shape2"
- _shape2.Tag = "MOVABLE,NOVERTICAL_MOVE"
- _shape2.Top = 0
- _shape2.Width = 65
- _shape2.ZOrderSet = 9
- Lb_titlu_alb_b121.Caption = "ISTORIC COMENZI"
- Lb_titlu_alb_b121.FontBold = .T.
- Lb_titlu_alb_b121.Name = "Lb_titlu_alb_b121"
- Lb_titlu_alb_b121.TabIndex = 15
- Lb_titlu_alb_b121.ZOrderSet = 2
- BUT_TERMIN1.Left = 762
- BUT_TERMIN1.Name = "BUT_TERMIN1"
- BUT_TERMIN1.TabIndex = 14
- BUT_TERMIN1.Tag = "MOVABLE,NOVERTICAL_MOVE"
- BUT_TERMIN1.Top = 1
- BUT_TERMIN1.ZOrderSet = 10
- Gridsort1.Name = "Gridsort1"
- *
-
- ADD OBJECT 'But_excel1' AS but_excel WITH ;
- Anchor = 9, ;
- Left = 703, ;
- Name = "But_excel1", ;
- TabIndex = 16, ;
- Top = 1, ;
- Visible = .T.
- *< END OBJECT: ClassLib="..\comun\clase\cmd_butoane.vcx" BaseClass="commandbutton" />
-
- ADD OBJECT 'But_listare1' AS but_listare WITH ;
- Anchor = 8, ;
- Left = 733, ;
- Name = "But_listare1", ;
- Top = 1, ;
- Visible = .T.
- *< END OBJECT: ClassLib="..\comun\clase\cmd_butoane.vcx" BaseClass="commandbutton" />
-
- ADD OBJECT 'cbArhivat' AS ctip_deviz WITH ;
- Anchor = 8, ;
- Left = 691, ;
- Name = "cbArhivat", ;
- TabIndex = 6, ;
- Top = 327, ;
- _combobox1.Name = "_combobox1"
- *< END OBJECT: ClassLib="oviz_devize.vcx" BaseClass="container" />
-
- ADD OBJECT 'cbtip_deviz' AS ctip_deviz WITH ;
- Left = 692, ;
- Name = "cbtip_deviz", ;
- TabIndex = 10, ;
- Tag = "MOVABLE,NOVERTICAL_MOVE", ;
- Top = 240, ;
- _combobox1.Name = "_combobox1"
- *< END OBJECT: ClassLib="oviz_devize.vcx" BaseClass="container" />
-
- ADD OBJECT 'cbValidat' AS ctip_deviz WITH ;
- Anchor = 8, ;
- Left = 692, ;
- Name = "cbValidat", ;
- TabIndex = 6, ;
- Top = 283, ;
- _combobox1.Name = "_combobox1"
- *< END OBJECT: ClassLib="oviz_devize.vcx" BaseClass="container" />
-
- ADD OBJECT 'Ck_asigurator' AS ck_filtru_text WITH ;
- Alignment = 0, ;
- Anchor = 8, ;
- camp_nume = a.asigurator, ;
- Caption = "Asigurator", ;
- FontName = "Arial Narrow", ;
- Left = 692, ;
- Name = "Ck_asigurator", ;
- TabIndex = 6, ;
- Top = 125, ;
- ZOrderSet = 6
- *< END OBJECT: ClassLib="..\comun\clase\caut_ora.vcx" BaseClass="checkbox" />
-
- ADD OBJECT 'Ck_datai' AS ck_filtru_numar WITH ;
- Alignment = 0, ;
- Anchor = 8, ;
- camp_nume = a.datai, ;
- Caption = "Data comenzii", ;
- FontName = "Arial Narrow", ;
- Left = 692, ;
- Name = "Ck_datai", ;
- TabIndex = 3, ;
- tip = D, ;
- Top = 69, ;
- ZOrderSet = 7
- *< END OBJECT: ClassLib="..\comun\clase\caut_ora.vcx" BaseClass="checkbox" />
-
- ADD OBJECT 'Ck_facturat' AS ck_simplu WITH ;
- Alignment = 0, ;
- Anchor = 8, ;
- Caption = "Facturate", ;
- FontName = "Arial Narrow", ;
- Left = 692, ;
- Name = "Ck_facturat", ;
- TabIndex = 5, ;
- Top = 111, ;
- ZOrderSet = 11
- *< END OBJECT: ClassLib="..\comun\clase\caut_ora.vcx" BaseClass="checkbox" />
-
- ADD OBJECT 'Ck_inspector' AS ck_filtru_text WITH ;
- Alignment = 0, ;
- Anchor = 8, ;
- camp_nume = a.inspector, ;
- Caption = "Inspector", ;
- FontName = "Arial Narrow", ;
- Left = 692, ;
- Name = "Ck_inspector", ;
- TabIndex = 7, ;
- Top = 139, ;
- ZOrderSet = 6
- *< END OBJECT: ClassLib="..\comun\clase\caut_ora.vcx" BaseClass="checkbox" />
-
- ADD OBJECT 'Ck_nr_dosar' AS ck_filtru_text WITH ;
- Alignment = 0, ;
- Anchor = 8, ;
- camp_nume = a.nr_dosar, ;
- Caption = "Nr.dosar", ;
- FontName = "Arial Narrow", ;
- Left = 692, ;
- Name = "Ck_nr_dosar", ;
- TabIndex = 8, ;
- Top = 154, ;
- ZOrderSet = 6
- *< END OBJECT: ClassLib="..\comun\clase\caut_ora.vcx" BaseClass="checkbox" />
-
- ADD OBJECT 'Ck_nrinmat' AS ck_filtru_text WITH ;
- Alignment = 0, ;
- Anchor = 8, ;
- camp_nume = a.nrinmat, ;
- Caption = "Nr. înmatriculare", ;
- FontName = "Arial Narrow", ;
- Left = 692, ;
- Name = "Ck_nrinmat", ;
- TabIndex = 4, ;
- Top = 83, ;
- ZOrderSet = 8
- *< END OBJECT: ClassLib="..\comun\clase\caut_ora.vcx" BaseClass="checkbox" />
-
- ADD OBJECT 'Ck_nrord' AS ck_filtru_text WITH ;
- Alignment = 0, ;
- Anchor = 8, ;
- camp_nume = a.nrord, ;
- Caption = "Nr. comanda", ;
- FontName = "Arial Narrow", ;
- Left = 692, ;
- Name = "Ck_nrord", ;
- TabIndex = 1, ;
- Top = 41, ;
- ZOrderSet = 12
- *< END OBJECT: ClassLib="..\comun\clase\caut_ora.vcx" BaseClass="checkbox" />
-
- ADD OBJECT 'Ck_nume' AS ck_filtru_text WITH ;
- Alignment = 0, ;
- Anchor = 8, ;
- camp_nume = a.nume, ;
- Caption = "Nume client", ;
- FontName = "Arial Narrow", ;
- Left = 692, ;
- Name = "Ck_nume", ;
- TabIndex = 2, ;
- Top = 55, ;
- ZOrderSet = 6
- *< END OBJECT: ClassLib="..\comun\clase\caut_ora.vcx" BaseClass="checkbox" />
-
- ADD OBJECT 'Ck_referinta' AS ck_filtru_text WITH ;
- Alignment = 0, ;
- Anchor = 8, ;
- camp_nume = a.part_ref, ;
- Caption = "Referinta", ;
- FontName = "Arial Narrow", ;
- Left = 692, ;
- Name = "Ck_referinta", ;
- TabIndex = 2, ;
- Top = 169, ;
- ZOrderSet = 6
- *< END OBJECT: ClassLib="..\comun\clase\caut_ora.vcx" BaseClass="checkbox" />
-
- ADD OBJECT 'ck_series' AS ck_filtru_text WITH ;
- Alignment = 0, ;
- Anchor = 8, ;
- camp_nume = a.series, ;
- Caption = "Serie sasiu", ;
- FontName = "Arial Narrow", ;
- Left = 692, ;
- Name = "ck_series", ;
- TabIndex = 2, ;
- Top = 97, ;
- ZOrderSet = 6
- *< END OBJECT: ClassLib="..\comun\clase\caut_ora.vcx" BaseClass="checkbox" />
-
- ADD OBJECT 'Cmd_cauta1' AS cmd_cauta WITH ;
- Left = 696, ;
- Name = "Cmd_cauta1", ;
- TabIndex = 11, ;
- Tag = "MOVABLE,NOVERTICAL_MOVE", ;
- Top = 363, ;
- ZOrderSet = 4
- *< END OBJECT: ClassLib="..\comun\clase\cmd_butoane.vcx" BaseClass="commandbutton" />
-
- ADD OBJECT 'Cmd_reset1' AS cmd_reset WITH ;
- Left = 696, ;
- Name = "Cmd_reset1", ;
- TabIndex = 16, ;
- Tag = "MOVABLE,NOVERTICAL_MOVE", ;
- Top = 392, ;
- Width = 84, ;
- ZOrderSet = 5
- *< END OBJECT: ClassLib="..\comun\clase\cmd_butoane.vcx" BaseClass="commandbutton" />
-
- ADD OBJECT 'Cmd_sterge1' AS cmd_sterge WITH ;
- Left = 696, ;
- Name = "Cmd_sterge1", ;
- TabIndex = 17, ;
- Tag = "MOVABLE,NOVERTICAL_MOVE", ;
- Top = 424, ;
- Visible = .F., ;
- Width = 84
- *< END OBJECT: ClassLib="..\comun\clase\cmd_butoane.vcx" BaseClass="commandbutton" />
-
- ADD OBJECT 'Cmd_vizualizare' AS cmd_executa WITH ;
- Caption = "Vi\
-
- ADD OBJECT 'grdcomenzi' AS _grdrow WITH ;
- ColumnCount = 25, ;
- DeleteMark = .F., ;
- FontSize = 10, ;
- Height = 444, ;
- Left = 17, ;
- Name = "grdcomenzi", ;
- Panel = 1, ;
- ReadOnly = .T., ;
- RecordSource = "crscomenzi", ;
- RowHeight = 19, ;
- TabIndex = 13, ;
- Tag = "RESIZABLE", ;
- Top = 36, ;
- Width = 663, ;
- ZOrderSet = 3, ;
- Column1.ControlSource = "nrord", ;
- Column1.FontName = "Arial", ;
- Column1.FontSize = 10, ;
- Column1.Name = "cNrord", ;
- Column1.ReadOnly = .T., ;
- Column1.Width = 90, ;
- Column2.ColumnOrder = 8, ;
- Column2.ControlSource = "IIF(TYPE('datai')=='D',datai,TTOD(datai))", ;
- Column2.FontName = "Arial", ;
- Column2.FontSize = 10, ;
- Column2.Name = "cDatai", ;
- Column2.ReadOnly = .T., ;
- Column2.Width = 87, ;
- Column3.ColumnOrder = 2, ;
- Column3.ControlSource = "nume", ;
- Column3.FontName = "Arial", ;
- Column3.FontSize = 10, ;
- Column3.Name = "cNume", ;
- Column3.ReadOnly = .T., ;
- Column3.Width = 160, ;
- Column4.ColumnOrder = 9, ;
- Column4.ControlSource = "IIF(validat=1,'Da','Nu')", ;
- Column4.FontName = "Arial", ;
- Column4.FontSize = 10, ;
- Column4.Name = "cValidat", ;
- Column4.ReadOnly = .T., ;
- Column4.Width = 44, ;
- Column5.ColumnOrder = 5, ;
- Column5.ControlSource = "asigurator", ;
- Column5.FontName = "Arial", ;
- Column5.FontSize = 10, ;
- Column5.Name = "cAsigurator", ;
- Column5.ReadOnly = .T., ;
- Column6.ColumnOrder = 10, ;
- Column6.ControlSource = "IIF(facturat=1,'Da','Nu')", ;
- Column6.FontName = "Arial", ;
- Column6.FontSize = 10, ;
- Column6.Name = "cFacturat", ;
- Column6.ReadOnly = .T., ;
- Column6.Width = 52, ;
- Column7.ColumnOrder = 3, ;
- Column7.ControlSource = "marca", ;
- Column7.FontName = "Arial", ;
- Column7.FontSize = 10, ;
- Column7.Name = "cMarca", ;
- Column7.ReadOnly = .T., ;
- Column7.Width = 85, ;
- Column8.ColumnOrder = 4, ;
- Column8.ControlSource = "masina", ;
- Column8.FontName = "Arial", ;
- Column8.FontSize = 10, ;
- Column8.Name = "cMasina", ;
- Column8.ReadOnly = .T., ;
- Column9.ColumnOrder = 13, ;
- Column9.ControlSource = "tip_comanda", ;
- Column9.FontName = "Arial", ;
- Column9.FontSize = 10, ;
- Column9.Name = "cTip_comanda", ;
- Column9.ReadOnly = .T., ;
- Column9.Width = 78, ;
- Column10.ColumnOrder = 11, ;
- Column10.ControlSource = "IIF(TYPE('datafact')=='D',datafact,TTOD(datafact))", ;
- Column10.FontName = "Arial", ;
- Column10.FontSize = 10, ;
- Column10.Name = "cDataFact", ;
- Column10.ReadOnly = .T., ;
- Column10.Width = 82, ;
- Column11.ColumnOrder = 12, ;
- Column11.ControlSource = "nrfact", ;
- Column11.FontName = "Arial", ;
- Column11.FontSize = 10, ;
- Column11.InputMask = (get_mask(14,0)), ;
- Column11.Name = "cNrFact", ;
- Column11.ReadOnly = .T., ;
- Column11.Width = 80, ;
- Column12.ColumnOrder = 6, ;
- Column12.ControlSource = "inspector", ;
- Column12.FontName = "Arial", ;
- Column12.FontSize = 10, ;
- Column12.Name = "cInspector", ;
- Column12.ReadOnly = .T., ;
- Column12.Width = 61, ;
- Column13.ColumnOrder = 7, ;
- Column13.ControlSource = "nr_dosar", ;
- Column13.FontName = "Arial", ;
- Column13.FontSize = 10, ;
- Column13.Name = "cNr_dosar", ;
- Column13.ReadOnly = .T., ;
- Column13.Width = 69, ;
- Column14.ControlSource = "IIF(inchis_fortat=1,'Da','Nu')", ;
- Column14.FontName = "Arial", ;
- Column14.FontSize = 10, ;
- Column14.Name = "cArhivat", ;
- Column14.ReadOnly = .T., ;
- Column14.Width = 42, ;
- Column15.ControlSource = "part_ref", ;
- Column15.FontName = "Arial", ;
- Column15.FontSize = 10, ;
- Column15.Name = "cPartRef", ;
- Column15.ReadOnly = .T., ;
- Column15.Width = 112, ;
- Column16.ControlSource = "series", ;
- Column16.FontSize = 10, ;
- Column16.Name = "cSeries", ;
- Column16.ReadOnly = .T., ;
- Column16.Width = 181, ;
- Column17.ControlSource = "kmint", ;
- Column17.FontSize = 10, ;
- Column17.Name = "cKmint", ;
- Column17.ReadOnly = .T., ;
- Column18.ControlSource = "ore_functionare", ;
- Column18.FontSize = 10, ;
- Column18.Name = "cOreFunctionare", ;
- Column18.ReadOnly = .T., ;
- Column19.ControlSource = "valctva_factura", ;
- Column19.FontSize = 10, ;
- Column19.Format = "R", ;
- Column19.InputMask = (get_mask(16,gnPc)), ;
- Column19.Name = "cValcTVAFactura", ;
- Column19.ReadOnly = .T., ;
- Column19.Width = 138, ;
- Column20.ControlSource = "val_manopera_factura", ;
- Column20.FontSize = 10, ;
- Column20.Format = "R", ;
- Column20.InputMask = (get_mask(16,gnPc)), ;
- Column20.Name = "cValManoperaFactura", ;
- Column20.ReadOnly = .T., ;
- Column20.Width = 152, ;
- Column21.ControlSource = "val_materiale_factura", ;
- Column21.FontSize = 10, ;
- Column21.Format = "R", ;
- Column21.InputMask = (get_mask(16,gnPc)), ;
- Column21.Name = "cValMaterialeFactura", ;
- Column21.ReadOnly = .T., ;
- Column21.Width = 148, ;
- Column22.ControlSource = "val_materiale_ach", ;
- Column22.FontSize = 10, ;
- Column22.Format = "R", ;
- Column22.InputMask = (get_mask(16,gnPc)), ;
- Column22.Name = "cValMaterialeAch", ;
- Column22.ReadOnly = .T., ;
- Column22.Width = 157, ;
- Column23.ControlSource = "val_materiale_vz", ;
- Column23.CurrentControl = "Text1", ;
- Column23.FontSize = 10, ;
- Column23.Format = "R", ;
- Column23.InputMask = (get_mask(16,gnPc)), ;
- Column23.Name = "cValMaterialeVz", ;
- Column23.ReadOnly = .T., ;
- Column23.Width = 153, ;
- Column24.ControlSource = "ore_manopera", ;
- Column24.FontSize = 10, ;
- Column24.Format = "R", ;
- Column24.InputMask = (get_mask(16,gnPc)), ;
- Column24.Name = "cOreManopera", ;
- Column24.ReadOnly = .T., ;
- Column24.Width = 86, ;
- Column25.ControlSource = "val_manopera", ;
- Column25.FontSize = 10, ;
- Column25.Format = "R", ;
- Column25.InputMask = (get_mask(16,gnPc)), ;
- Column25.Name = "cValManopera", ;
- Column25.ReadOnly = .T., ;
- Column25.Width = 109
- *< END OBJECT: ClassLib="..\comun\clase\_grd_base.vcx" BaseClass="grid" />
-
- ADD OBJECT 'grdcomenzi.cArhivat.Header1' AS header WITH ;
- Alignment = 2, ;
- Caption = "Arhivat", ;
- FontName = "Arial", ;
- FontSize = 10, ;
- Name = "Header1"
- *< END OBJECT: BaseClass="header" />
-
- ADD OBJECT 'grdcomenzi.cArhivat.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 'grdcomenzi.cAsigurator.Header1' AS header WITH ;
- Alignment = 2, ;
- Caption = "Asigurator", ;
- FontName = "Arial", ;
- FontSize = 10, ;
- Name = "Header1"
- *< END OBJECT: BaseClass="header" />
-
- ADD OBJECT 'grdcomenzi.cAsigurator.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 'grdcomenzi.cDataFact.Header1' AS header WITH ;
- Alignment = 2, ;
- Caption = "Data factura", ;
- FontName = "Arial", ;
- FontSize = 10, ;
- Name = "Header1"
- *< END OBJECT: BaseClass="header" />
-
- ADD OBJECT 'grdcomenzi.cDataFact.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 'grdcomenzi.cDatai.Header1' AS header WITH ;
- Alignment = 2, ;
- Caption = "Data comanda", ;
- FontName = "Arial", ;
- FontSize = 10, ;
- Name = "Header1"
- *< END OBJECT: BaseClass="header" />
-
- ADD OBJECT 'grdcomenzi.cDatai.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 'grdcomenzi.cFacturat.Header1' AS header WITH ;
- Alignment = 2, ;
- Caption = "Facturat", ;
- FontName = "Arial", ;
- FontSize = 10, ;
- Name = "Header1"
- *< END OBJECT: BaseClass="header" />
-
- ADD OBJECT 'grdcomenzi.cFacturat.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 'grdcomenzi.cInspector.Header1' AS header WITH ;
- Alignment = 2, ;
- Caption = "Inspector", ;
- FontName = "Arial", ;
- FontSize = 10, ;
- Name = "Header1"
- *< END OBJECT: BaseClass="header" />
-
- ADD OBJECT 'grdcomenzi.cInspector.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 'grdcomenzi.cKmint.Header1' AS header WITH ;
- Alignment = 2, ;
- Caption = "Km la bord", ;
- FontSize = 10, ;
- Name = "Header1"
- *< END OBJECT: BaseClass="header" />
-
- ADD OBJECT 'grdcomenzi.cKmint.Text1' AS textbox WITH ;
- BackColor = 255,255,255, ;
- BorderStyle = 0, ;
- FontSize = 10, ;
- ForeColor = 0,0,0, ;
- Margin = 0, ;
- Name = "Text1", ;
- ReadOnly = .T., ;
- SelectedBackColor = 100,185,255
- *< END OBJECT: BaseClass="textbox" />
-
- ADD OBJECT 'grdcomenzi.cMarca.Header1' AS header WITH ;
- Alignment = 2, ;
- Caption = "Marca masina", ;
- FontName = "Arial", ;
- FontSize = 10, ;
- Name = "Header1"
- *< END OBJECT: BaseClass="header" />
-
- ADD OBJECT 'grdcomenzi.cMarca.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 'grdcomenzi.cMasina.Header1' AS header WITH ;
- Alignment = 2, ;
- Caption = "Tip masina", ;
- FontName = "Arial", ;
- FontSize = 10, ;
- Name = "Header1"
- *< END OBJECT: BaseClass="header" />
-
- ADD OBJECT 'grdcomenzi.cMasina.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 'grdcomenzi.cNr_dosar.Header1' AS header WITH ;
- Alignment = 2, ;
- Caption = "Nr. dosar", ;
- FontName = "Arial", ;
- FontSize = 10, ;
- Name = "Header1"
- *< END OBJECT: BaseClass="header" />
-
- ADD OBJECT 'grdcomenzi.cNr_dosar.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 'grdcomenzi.cNrFact.Header1' AS header WITH ;
- Alignment = 2, ;
- Caption = "Nr. factura", ;
- FontName = "Arial", ;
- FontSize = 10, ;
- Name = "Header1"
- *< END OBJECT: BaseClass="header" />
-
- ADD OBJECT 'grdcomenzi.cNrFact.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 'grdcomenzi.cNrord.Header1' AS header WITH ;
- Alignment = 2, ;
- Caption = "Nr.comanda", ;
- FontName = "Arial", ;
- FontSize = 10, ;
- Name = "Header1"
- *< END OBJECT: BaseClass="header" />
-
- ADD OBJECT 'grdcomenzi.cNrord.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 'grdcomenzi.cNume.Header1' AS header WITH ;
- Alignment = 2, ;
- Caption = "Nume client", ;
- FontName = "Arial", ;
- FontSize = 10, ;
- Name = "Header1"
- *< END OBJECT: BaseClass="header" />
-
- ADD OBJECT 'grdcomenzi.cNume.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 'grdcomenzi.cOreFunctionare.Header1' AS header WITH ;
- Alignment = 2, ;
- Caption = "Ore motor", ;
- FontSize = 10, ;
- Name = "Header1"
- *< END OBJECT: BaseClass="header" />
-
- ADD OBJECT 'grdcomenzi.cOreFunctionare.Text1' AS textbox WITH ;
- BackColor = 255,255,255, ;
- BorderStyle = 0, ;
- FontSize = 10, ;
- ForeColor = 0,0,0, ;
- Margin = 0, ;
- Name = "Text1", ;
- ReadOnly = .T., ;
- SelectedBackColor = 100,185,255
- *< END OBJECT: BaseClass="textbox" />
-
- ADD OBJECT 'grdcomenzi.cOreManopera.Header1' AS header WITH ;
- Alignment = 2, ;
- Caption = "Ore manopera", ;
- FontSize = 10, ;
- Name = "Header1"
- *< END OBJECT: BaseClass="header" />
-
- ADD OBJECT 'grdcomenzi.cOreManopera.Text1' AS textbox WITH ;
- BackColor = 255,255,255, ;
- BorderStyle = 0, ;
- FontSize = 10, ;
- ForeColor = 0,0,0, ;
- Margin = 0, ;
- Name = "Text1", ;
- ReadOnly = .T., ;
- SelectedBackColor = 100,185,255
- *< END OBJECT: BaseClass="textbox" />
-
- ADD OBJECT 'grdcomenzi.cPartRef.Header1' AS header WITH ;
- Alignment = 2, ;
- Caption = "Referinta", ;
- FontName = "Arial", ;
- FontSize = 10, ;
- Name = "Header1"
- *< END OBJECT: BaseClass="header" />
-
- ADD OBJECT 'grdcomenzi.cPartRef.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 'grdcomenzi.cSeries.Header1' AS header WITH ;
- Alignment = 2, ;
- Caption = "Serie sasiu", ;
- FontSize = 10, ;
- Name = "Header1"
- *< END OBJECT: BaseClass="header" />
-
- ADD OBJECT 'grdcomenzi.cSeries.Text1' AS textbox WITH ;
- BackColor = 255,255,255, ;
- BorderStyle = 0, ;
- FontSize = 10, ;
- ForeColor = 0,0,0, ;
- Margin = 0, ;
- Name = "Text1", ;
- ReadOnly = .T., ;
- SelectedBackColor = 100,185,255
- *< END OBJECT: BaseClass="textbox" />
-
- ADD OBJECT 'grdcomenzi.cTip_comanda.Header1' AS header WITH ;
- Alignment = 2, ;
- Caption = "Tip comanda", ;
- FontName = "Arial", ;
- FontSize = 10, ;
- Name = "Header1"
- *< END OBJECT: BaseClass="header" />
-
- ADD OBJECT 'grdcomenzi.cTip_comanda.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 'grdcomenzi.cValcTVAFactura.Header1' AS header WITH ;
- Alignment = 2, ;
- Caption = "Valoare factura cu TVA", ;
- FontSize = 10, ;
- Name = "Header1"
- *< END OBJECT: BaseClass="header" />
-
- ADD OBJECT 'grdcomenzi.cValcTVAFactura.Text1' AS textbox WITH ;
- BackColor = 255,255,255, ;
- BorderStyle = 0, ;
- FontSize = 10, ;
- ForeColor = 0,0,0, ;
- Margin = 0, ;
- Name = "Text1", ;
- ReadOnly = .T., ;
- SelectedBackColor = 100,185,255
- *< END OBJECT: BaseClass="textbox" />
-
- ADD OBJECT 'grdcomenzi.cValidat.Header1' AS header WITH ;
- Alignment = 2, ;
- Caption = "Validat", ;
- FontName = "Arial", ;
- FontSize = 10, ;
- Name = "Header1"
- *< END OBJECT: BaseClass="header" />
-
- ADD OBJECT 'grdcomenzi.cValidat.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 'grdcomenzi.cValManopera.Header1' AS header WITH ;
- Alignment = 2, ;
- Caption = "Valoare manopera", ;
- FontSize = 10, ;
- Name = "Header1"
- *< END OBJECT: BaseClass="header" />
-
- ADD OBJECT 'grdcomenzi.cValManopera.Text1' AS textbox WITH ;
- BackColor = 255,255,255, ;
- BorderStyle = 0, ;
- FontSize = 10, ;
- ForeColor = 0,0,0, ;
- Margin = 0, ;
- Name = "Text1", ;
- ReadOnly = .T., ;
- SelectedBackColor = 100,185,255
- *< END OBJECT: BaseClass="textbox" />
-
- ADD OBJECT 'grdcomenzi.cValManoperaFactura.Header1' AS header WITH ;
- Alignment = 2, ;
- Caption = "Valoare manopera factura", ;
- FontSize = 10, ;
- Name = "Header1"
- *< END OBJECT: BaseClass="header" />
-
- ADD OBJECT 'grdcomenzi.cValManoperaFactura.Text1' AS textbox WITH ;
- BackColor = 255,255,255, ;
- BorderStyle = 0, ;
- FontSize = 10, ;
- ForeColor = 0,0,0, ;
- Margin = 0, ;
- Name = "Text1", ;
- ReadOnly = .T., ;
- SelectedBackColor = 100,185,255
- *< END OBJECT: BaseClass="textbox" />
-
- ADD OBJECT 'grdcomenzi.cValMaterialeAch.Header1' AS header WITH ;
- Alignment = 2, ;
- Caption = "Valoare materiale achizitie", ;
- FontSize = 10, ;
- Name = "Header1"
- *< END OBJECT: BaseClass="header" />
-
- ADD OBJECT 'grdcomenzi.cValMaterialeAch.Text1' AS textbox WITH ;
- BackColor = 255,255,255, ;
- BorderStyle = 0, ;
- FontSize = 10, ;
- ForeColor = 0,0,0, ;
- Margin = 0, ;
- Name = "Text1", ;
- ReadOnly = .T., ;
- SelectedBackColor = 100,185,255
- *< END OBJECT: BaseClass="textbox" />
-
- ADD OBJECT 'grdcomenzi.cValMaterialeFactura.Header1' AS header WITH ;
- Alignment = 2, ;
- Caption = "Valoare materiale factura", ;
- FontSize = 10, ;
- Name = "Header1"
- *< END OBJECT: BaseClass="header" />
-
- ADD OBJECT 'grdcomenzi.cValMaterialeFactura.Text1' AS textbox WITH ;
- BackColor = 255,255,255, ;
- BorderStyle = 0, ;
- FontSize = 10, ;
- ForeColor = 0,0,0, ;
- Margin = 0, ;
- Name = "Text1", ;
- ReadOnly = .T., ;
- SelectedBackColor = 100,185,255
- *< END OBJECT: BaseClass="textbox" />
-
- ADD OBJECT 'grdcomenzi.cValMaterialeVz.Header1' AS header WITH ;
- Alignment = 2, ;
- Caption = "Valoare materiale vanzare", ;
- FontSize = 10, ;
- Name = "Header1"
- *< END OBJECT: BaseClass="header" />
-
- ADD OBJECT 'grdcomenzi.cValMaterialeVz.Text1' AS textbox WITH ;
- BackColor = 255,255,255, ;
- BorderStyle = 0, ;
- FontSize = 10, ;
- ForeColor = 0,0,0, ;
- Margin = 0, ;
- Name = "Text1", ;
- ReadOnly = .T., ;
- SelectedBackColor = 100,185,255
- *< END OBJECT: BaseClass="textbox" />
-
- ADD OBJECT 'Gridextra1' AS gridextra WITH ;
- gridexpression = Thisform.grdComenzi, ;
- Left = 624, ;
- Name = "Gridextra1", ;
- productname = ROA, ;
- Top = 384
- *< END OBJECT: ClassLib="..\comun\utile\gridextras\gridextras.vcx" BaseClass="custom" />
-
- ADD OBJECT 'Lb_simplu1' AS lb_simplu WITH ;
- BackColor = 255,255,255, ;
- BackStyle = 0, ;
- Caption = "Tip comanda", ;
- FontName = "Arial Narrow", ;
- Left = 692, ;
- Name = "Lb_simplu1", ;
- TabIndex = 9, ;
- Tag = "MOVABLE,NOVERTICAL_MOVE", ;
- Top = 222, ;
- ZOrderSet = 14
- *< END OBJECT: ClassLib="..\comun\clase\lb.vcx" BaseClass="label" />
-
- ADD OBJECT 'lbArhivat' AS lb_simplu WITH ;
- Anchor = 8, ;
- BackColor = 255,255,255, ;
- BackStyle = 0, ;
- Caption = "Arhivate", ;
- FontName = "Arial Narrow", ;
- Left = 692, ;
- Name = "lbArhivat", ;
- TabIndex = 5, ;
- Top = 311, ;
- ZOrderSet = 15
- *< END OBJECT: ClassLib="..\comun\clase\lb.vcx" BaseClass="label" />
-
- ADD OBJECT 'lbValidat' AS lb_simplu WITH ;
- Anchor = 8, ;
- BackColor = 255,255,255, ;
- BackStyle = 0, ;
- Caption = "Validate", ;
- FontName = "Arial Narrow", ;
- Left = 692, ;
- Name = "lbValidat", ;
- TabIndex = 5, ;
- Top = 267, ;
- ZOrderSet = 15
- *< END OBJECT: ClassLib="..\comun\clase\lb.vcx" BaseClass="label" />
-
- ADD OBJECT 'Xresize1' AS xresize WITH ;
- Left = 780, ;
- Name = "Xresize1", ;
- Top = 480
- *< END OBJECT: ClassLib="..\comun\clase\xresize.vcx" BaseClass="custom" />
-
- PROCEDURE actualizeaza_grid1
- Parameters tcFiltru
- Local lcFiltru
- If Empty(tcFiltru)
- lcFiltru = pocomenzi.ca_baza1.cfiltru
- Else
- lcFiltru = tcFiltru
- Endif
-
- Thisform.LockScreen = .T.
- Thisform.MousePointer = 11
-
- save_grid(Thisform.grdcomenzi)
- pocomenzi.ca_baza1.cfiltru = lcFiltru
- pocomenzi.ca_baza1.afisare()
- restore_grid(Thisform.grdcomenzi)
-
- If Reccount('crscomenzi')>0
- Thisform.grdcomenzi.SetFocus()
- Endif
-
- Thisform.MousePointer = 0
- Thisform.LockScreen = .F.
-
- ENDPROC
-
- PROCEDURE do_cauta
- Local lcFiltru
- Local lnOptiune, lnOptiuneArhivat
- lcFiltru = [2=2]
-
- lnOptiune = Iif(Thisform.cbValidat._combobox1.Value = '', 1, Iif(Thisform.cbValidat._combobox1.Value = 'Validate', 2, 3))
- lnOptiuneArhivat = Iif(Thisform.cbArhivat._combobox1.Value = '', 1, Iif(Thisform.cbArhivat._combobox1.Value = 'Active', 2, 3))
-
- If Thisform.ck_datai.Value = 1
- lcFiltru = lcFiltru + Thisform.ck_datai.filtru
- Endif
-
- If Thisform.ck_nrinmat.Value = 1
- lcFiltru = lcFiltru + Thisform.ck_nrinmat.filtru
- Endif
-
- If Thisform.ck_nrord.Value = 1
- lcFiltru = lcFiltru + Thisform.ck_nrord.filtru
- Endif
-
- If Thisform.ck_nume.Value = 1
- lcFiltru = lcFiltru + Thisform.ck_nume.filtru
- Endif
-
- If Thisform.ck_asigurator.Value = 1
- lcFiltru = lcFiltru + Thisform.ck_asigurator.filtru
- ENDIF
-
- If Thisform.ck_inspector.Value = 1
- lcFiltru = lcFiltru + Thisform.ck_inspector.filtru
- ENDIF
-
- If Thisform.ck_nr_dosar.Value = 1
- lcFiltru = lcFiltru + Thisform.ck_nr_dosar.filtru
- Endif
-
- If Thisform.ck_facturat.Value = 1
- lcFiltru = lcFiltru + [ and a.facturat=1 ]
- Endif
-
- If Thisform.ck_series.Value = 1
- lcFiltru = lcFiltru + Thisform.ck_series.filtru
- ENDIF
-
- If Thisform.cbtip_deviz._combobox1.Value!= ""
- lcFiltru = lcFiltru + [ and a.id_tip = ] + Alltrim(Str(lista_tipuri.id_tip))
- Endif
-
- Do Case
- Case lnOptiune = 2
- lcFiltru = lcFiltru + [ and a.validat = 1]
- Case lnOptiune = 3
- lcFiltru = lcFiltru + [ and a.validat = 0]
- Endcase
-
- Do Case
- Case lnOptiuneArhivat = 2 && Active (nearhivate)
- lcFiltru = lcFiltru + [ and a.inchis_fortat = 0]
- Case lnOptiuneArhivat = 3 && arhivate
- lcFiltru = lcFiltru + [ and a.inchis_fortat = 1]
- ENDCASE
-
- If Thisform.ck_referinta.Value = 1
- lcFiltru = lcFiltru + Thisform.ck_referinta.filtru
- ENDIF
-
-
- Thisform.actualizeaza_grid1(lcFiltru)
-
- If Reccount('crscomenzi') = 0
- amessagebox('Cautarea nu a intors rezultate!', 0 + 48, 'Info cautare')
- Thisform.ck_nrord.SetFocus()
- Endif
- ENDPROC
-
- PROCEDURE do_excel
- If Reccount('crscomenzi')=0
- amessagebox("Nu exista date pentru export!",0+48,"Atentie")
- Return
- Endif
-
- DO ExportExcelXml WITH this.grdcomenzi IN excelxml.prg
- ENDPROC
-
- PROCEDURE do_executa
- If Reccount('crscomenzi')>0
- *!* modificare v 2.0.35
- Select crscomenzi
- Scatter Name ocomanda
- vizualizeaza_detalii_comanda(Thisform,ocomanda,.T.)
- *!* Private porul,pooper,podevest
- *!* Store '' To porul,pooper,podevest
- *!* Do ccsectii in update_devize.prg
- *!* Select crscomenzi
- *!* Scatter Name ocomanda
- *!* pcschema=['ID_ORDL n(10),CODOP c(10),TIMPN n(9,3),PRET n(20,4),VALIDAT n(1),DENOP c(100),SECTIE c(100),DATAI d,ID_OPER N(20)']
- *!* pcselect=['select id_ordl,codop,timpn,pret,validat,denop,sectie,datai,id_oper from ] + gcS + [.dev_voper where 1=2']
- *!* *!* modificare 09.06
- *!* *!* pcorder=[validat desc,dataora,datai,denop,sectie]
- *!* pcorder=[datai,id_oper]
- *!* *!* ^
- *!* *!* modificare 27.01
- *!* *!* pcschema=['ID_ORDL n(10),CODOP c(10),TIMPN n(9,3),PRET n(20,4),VALIDAT n(1),DENOP c(100),SECTIE c(30),DATAORA D']
- *!* *!* pcselect=['select id_ordl,codop,timpn,pret,validat,denop,sectie,dataora from ] + gcS + [.dev_voper where 1=2']
- *!* *!* pcorder=[dataora,sectie,denop]
- *!* pcfiltru=[1=2]
- *!* llAfiseaza=.F.
- *!* gencursor('pooper','oper',pcselect,pcfiltru,pcschema,pcorder,llAfiseaza)
- *!* pooper.ca_baza1.afisare()
- *!* pooper.ca_baza1.cfiltru = [id_ordl = ]+Alltrim(Str(ocomanda.id_ordl))+[ and ] + ;
- *!* [extract(month from datai)+extract (year from datai)*12<=?gnLuna+?gnAn*12]
- *!* *!* modificare 27.01
- *!* *!* [extract(month from dataora)+extract (year from dataora)*12<=?gnLuna+?gnAn*12]
- *!* pcschema=['DENUMIRE v(100),COD v(10),UM v(10),CANTITATE n(20,4),PRETFTVA n(20,4),PRETCTVA n(20,4),COTA_TVA n(10),VALOARE n(20,4),ID_DEV_ESTIMARE_REP n(20),ID_LUCRARE n(10),NRORD v(50),ID_NORME n(5),ID_ARTICOL n(20),PRET_CU_TVA n(1),VALFTVA n(20,4),VALTVA n(20,4)']
- *!* pcselect=['select denumire,cod,um,cantitate,pretftva,pretctva,cota_tva,valoare,id_dev_estimare_rep,id_lucrare,nrord,id_norme,id_articol,pret_cu_tva,valftva,valtva from ] + gcS + [.dev_vestimari_rep where 1=2']
- *!* pcorder=[id_dev_estimare_rep]
- *!* pcfiltru=[1=2]
- *!* llAfiseaza=.F.
- *!* gencursor('podevest','v_devizest',pcselect,pcfiltru,pcschema,pcorder)
- *!* podevest.ca_baza1.afisare()
- *!* podevest.ca_baza1.cfiltru = [id_lucrare = ] + ALLTRIM(STR(ocomanda.id_lucrare))
- *!* *!* modificare v 2.0.22 : am adaugat tva
- *!* pcschema=['CODMAT c(50),DENUMIRE c(100),PRETV n(20,4),CANTE n(18,3),DATAACT D,ID_RUL n(20),COTA_DIFERITA n(1),TVA n(20,4)']
- *!* pcselect=[select codmat,denumire,pretv,cante,dataact,id_rul,decode(proc_tvav,pack_contafin.getCotaTVAStandard(?gnLuna,?gnAn),0,1) as cota_diferita,] + ;
- *!* [pack_sesiune.calculeaza_pret_tva(pretv,1,pack_def.GetIdMonedaNationala(),pack_contafin.getCotaTVAStandard(?gnLuna,?gnAn),0) as tva ] + ;
- *!* [from ] + gcS + [.vrul where 1=2']
- *!* pcorder=[dataact,id_rul]
- *!* pcfiltru=[1=2]
- *!* llAfiseaza=.F.
- *!* gencursor('porul','rul',pcselect,pcfiltru,pcschema,pcorder)
- *!* porul.ca_baza1.afisare()
- *!* porul.ca_baza1.cfiltru = [id_lucrare = ]+Alltrim(Str(ocomanda.id_lucrare))+[ and ]+;
- *!* [luna+an*12<=?gnLuna+?gnAn*12]
- *!*
- *!*
- *!*
- *!* Thisform.AlwaysOnTop=.F.
- *!* ofrmvizualizare = Createobject('frm_vizcomanda',2,ocomanda.Validat) && 2 = vizualizare
- *!* ofrmvizualizare.Show(1)
- *!* Thisform.AlwaysOnTop=.T.
- *!* *!* modificare v 2.0.5
- *!* If Used('oper')
- *!* Use In oper
- *!* Endif
- *!* If Used('rul')
- *!* Use In rul
- *!* Endif
- *!* *!* modificare v 2.0.5 ^
- *!* modificare v 2.0.35 ^
- Else
- amessagebox("Nu exista inregistrari pentru care sa vizualizati manopera si materialele!",48,"Atentie")
- Endif
- ENDPROC
-
- PROCEDURE do_listare
- Local lnIdOrdl, lnOptiune, lnRecno
- PRIVATE ocomanda
- lnOptiune = xmenu('Listare deviz;Listare raport comanda')
- If Empty(m.lnOptiune)
- Return
- Endif
-
- If m.lnOptiune = 1
- If Reccount('crscomenzi') > 0
- Private porul, pooper, pcschema1, pcselect1, poFirma
- Store '' To porul, pooper, poFirma
-
- Select crscomenzi
- lnRecno = Recno()
- Use In (Select('crsdevize'))
- *!* Calculate Sum(ales) To lnAlese
- *!* If lnAlese = 0
- Select * From crscomenzi Where Recno() = lnRecno Into Cursor crsdevize
- *!* Else
- *!* Select * From crscomenzi With (Buffering = .T.) Where ales = 1 Into Cursor crsdevize
- *!* Endif
-
- Select crsdevize
- Scan
- Scatter Name ocomanda
- *!* If ocomanda.Validat=1
- listare_comanda_deviz(Thisform, ocomanda)
- *!* Else
- *!* amessagebox("Nu puteti lista deviz pentru comanda " + Alltrim(ocomanda.nrord)+ ", deoarece nu este validata!",0+48,"Atentie")
- *!* Endif
- Endscan
- Use In (Select('crsdevize'))
- *!* Use In (Select('crsFirma')) && modificare v 2.0.35
- Select crscomenzi
- Go lnRecno
- Thisform.grdcomenzi.SetFocus()
- Else
- amessagebox("Nu ati selectat nici o comanda!", 0 + 48, "Atentie")
- Thisform.grdcomenzi.SetFocus()
- Endif
- Else
- If Reccount('crscomenzi') > 0
- Thisform.AlwaysOnTop = .F.
- lnIdOrdl = crscomenzi.id_ordl
- Do listare_precomanda With m.lnIdOrdl
- Thisform.AlwaysOnTop = .T.
- Endif
- Endif
- ENDPROC
-
- PROCEDURE do_reset
- With Thisform
- For i=1 To .Objects.Count
- If Upper(.Objects(i).BaseClass)='CHECKBOX'
- .Objects(i).Value=0
- Endif
- Endfor
- Endwith
- Thisform.cbtip_deviz.do_reset()
- thisform.cbvalidat.do_reset()
- thisform.cbarhivat.do_reset()
- Thisform.ck_nrord.SetFocus()
- ENDPROC
-
- PROCEDURE do_sterge
- SELECT crsComenzi
- SCATTER NAME ocom
-
- lcSql = [update ] + gcS + [.dev_ordl set sters = 1, dataoras = sysdate , id_utils = ] + ALLTRIM(STR(gnIdUtil)) + [where id_ordl = ]+ALLTRIM(STR(ocom.id_ordl))
- lnSucces = goExecutor.oExecute(lcSql)
- If lnSucces < 0
- amessagebox(goExecutor.cEroare,0+16,"Eroare")
- Return
- ENDIF
-
- lcSql = [update ] + gcS + [.dev_oper set sters = 1, dataoras = sysdate , id_utils = ] + ALLTRIM(STR(gnIdUtil)) + [where id_ordl = ]+ALLTRIM(STR(ocom.id_ordl))
- lnSucces = goExecutor.oExecute(lcSql)
- If lnSucces < 0
- amessagebox(goExecutor.cEroare,0+16,"Eroare")
- Return
- ENDIF
-
- lcSql = [select * from ] + gcS + [.dev_oper where id_ordl = ]+ALLTRIM(STR(ocom.id_ordl))
- lcCursor = 'crsOper'
- lnSucces = goExecutor.oExecute(lcSql,lcCursor)
- If lnSucces < 0
- amessagebox(goExecutor.cEroare,0+16,"Eroare")
- Return
- ENDIF
-
- SELECT &lcCursor
-
- IF _tally <= 0
- RETURN
- ENDIF
-
- SCAN
- SCATTER NAME oop
- lcSql = [update ] + gcS + [.dev_oper_mecanici set sters = 1 where id_oper = ]+ALLTRIM(STR(oop.id_oper))
- lnSucces = goExecutor.oExecute(lcSql)
- If lnSucces < 0
- amessagebox(goExecutor.cEroare,0+16,"Eroare")
- Return
- ENDIF
- RELEASE oop
- ENDSCAN
- SELECT &lcCursor
- USE
- thisform.do_cauta
-
- ENDPROC
-
- PROCEDURE Init
- DODEFAULT()
- this.gridextra1.setup()
- ENDPROC
-
- PROCEDURE cbArhivat._combobox1.Destroy
- Use In (SELECT('lista_arhivat'))
- ENDPROC
-
- PROCEDURE cbArhivat._combobox1.Init
- Create Cursor lista_arhivat (denumire C(50),id N(5))
- Select lista_arhivat
- INSERT INTO lista_arhivat (denumire, id) VALUES ('', 0)
- INSERT INTO lista_arhivat (denumire, id) VALUES ('Active', 1)
- INSERT INTO lista_arhivat (denumire, id) VALUES ('Arhivate', 2)
-
-
- This.RowSourceType= 2
- This.RowSource="lista_arhivat"
- This.Value="Active"
- this.Parent.cdefault="Active"
- ENDPROC
-
- PROCEDURE cbValidat._combobox1.Destroy
- Use In (SELECT('lista_validat'))
- ENDPROC
-
- PROCEDURE cbValidat._combobox1.Init
- Create Cursor lista_validat(denumire C(50),id N(5))
- Select lista_validat
- INSERT INTO lista_validat(denumire, id) VALUES ('', 0)
- INSERT INTO lista_validat(denumire, id) VALUES ('Validate', 1)
- INSERT INTO lista_validat(denumire, id) VALUES ('Nevalidate', 2)
-
-
- This.RowSourceType= 2
- This.RowSource="lista_validat"
- This.Value=""
- this.Parent.cdefault=""
- ENDPROC
-
- PROCEDURE grdcomenzi.AfterRowColChange
- Lparameters nColIndex
- If This.RowColChange!=2
- DoDefault()
- Endif
-
- ENDPROC
-
-ENDDEFINE
-
DEFINE CLASS frm_modificare_mc AS _frmbase OF "..\comun\clase\_frm_base.vcx"
*< CLASSDATA: Baseclass="form" Timestamp="" Scale="Pixels" Uniqueid="" />
diff --git a/Programe/oproceduri_vizualizare.prg b/Programe/oproceduri_vizualizare.prg
index b41c663..47e93f8 100644
--- a/Programe/oproceduri_vizualizare.prg
+++ b/Programe/oproceduri_vizualizare.prg
@@ -442,41 +442,6 @@ Endif
Release pocomenzi,pomanopera
Endproc && normare salarii
*****************************************************************************************
-Procedure vizualizare_ist_comenzi
-Private pcselect,pcschema,pcfiltru,pcorder,pocomenzi,llAfiseaza
-Store '' To pocomenzi
-
-pcschema=['ID_ORDL n(10),ID_LUCRARE n(10),ID_MASINICLIENT n(8),ID_TIP n(5),DATAI d,'+]+;
- ['VALIDAT n(1),DATAORAVALID T,UTIL_VALID C(50),NRORD c(50),FACTURAT n(1),DATAFACT d,NRFACT N(14),'+]+;
- ['VALCTVA_FACTURA N(20,4),VAL_MANOPERA_FACTURA N(20,4),VAL_MATERIALE_FACTURA N(20,4),'+]+;
- ['VAL_MATERIALE_ACH N(20,4),VAL_MATERIALE_VZ N(20,4),ORE_MANOPERA N(20,4),VAL_MANOPERA N(20,4),'+]+;
- ['ID_PARTENER n(10),NRINMAT c(35),MASINA c(20),MARCA c(24),NUME c(50),'+]+;
- ['ASIGURATOR c(40),INSPECTOR c(40),NR_DOSAR c(40),TIP_COMANDA c(50),PROC_TVAV N(10,4), INCHIS_FORTAT N(1), DATAORAINCHIS T, UTIL_INCHIS C(30), ID_PART_REF N(20), PART_REF C(100),'+]+;
- ['SERIES V(100), KMINT I, ORE_FUNCTIONARE I']
-
-pcselect=[select a.id_ordl,a.id_lucrare,a.id_masiniclient,a.id_tip,a.datai,]+;
- [a.validat,a.dataoravalid,a.util_valid,a.nrord,a.facturat,a.datafact,a.nrfact,]+;
- [a.valctva_factura, a.val_manopera_factura, a.val_materiale_factura, a.val_materiale_ach, a.val_materiale_vz, a.ore_manopera, a.val_manopera,]+;
- [a.id_partener,a.nrinmat,a.masina,a.marca,a.nume,a.asigurator,a.inspector,a.nr_dosar,]+;
- [a.tip_comanda,a.proc_tvav, ] + ;
- [a.inchis_fortat, a.dataorainchis, a.util_inchis, a.id_part_ref, a.part_ref, ]+;
- [a.series, a.kmint, a.ore_functionare ] + ;
- [ from auto_istoric_comenzi a where 1=2]
-
-pcfiltru=[1=2]
-pcorder=[a.datai,a.nrord]
-llAfiseaza=.F.
-gencursor('pocomenzi','crscomenzi',pcselect,pcfiltru,pcschema,pcorder,llAfiseaza)
-pocomenzi.ca_baza1.afisare()
-
-ofrmistoric=Createobject('frm_istoric_comenzi')
-ofrmistoric.Show(1)
-If Used('crscomenzi')
- Use In crscomenzi
-Endif
-Release pocomenzi
-Endproc && vizualizare_ist_comenzi
-*****************************************************************************************
Procedure vizualizare_manopera
*!* If glLunaInchisa
*!* amessagebox("Nu puteti vizualiza manopera, deoarece luna este inchisa!",0+48,"Luna inchisa")
diff --git a/changelog_roaauto.txt b/changelog_roaauto.txt
index 0d73b3f..c3f2f3e 100644
--- a/changelog_roaauto.txt
+++ b/changelog_roaauto.txt
@@ -2,8 +2,13 @@
23/09/2026
ROAAUTO - 2.5.6
-:,modificare:
- Vizualizare comenzi si Istoric comenzi folosesc acelasi ecran (filtre noi: asigurator, inspector, nr. dosar, referinta; coloane noi: asigurator, marca, masina, inspector, nr. dosar, arhivat); in Vizualizare comenzi si Vizualizare facturi s-au adaugat coloanele ore/valoare manopera, valoare materiale (achizitie/vanzare) si total fara/cu TVA, cu totaluri in subsolul gridului.
+:modificare:
+ Vizualizare comenzi luna curenta/istoric:
+ - S-au adaugat filtre noi: asigurator, inspector, nr. dosar, referinta;
+ - S-au adaugat coloane noi: asigurator, marca, masina, inspector, nr. dosar, arhivat;
+
+ Vizualizare comenzi si Vizualizare facturi:
+ - S-au adaugat coloanele ore/valoare manopera, valoare materiale (achizitie/vanzare) si total fara/cu TVA, cu totaluri in subsolul gridului.
-->