diff --git a/Clase/ofundal_dev.vc2 b/Clase/ofundal_dev.vc2
index 84e7181..9e61ae7 100644
--- a/Clase/ofundal_dev.vc2
+++ b/Clase/ofundal_dev.vc2
@@ -678,11 +678,11 @@ DEFINE CLASS pg_meniu_princ AS pg_meniu OF "..\comun\clase\ofundal.vcx"
ENDPROC
PROCEDURE Page2.Cw4.do_actiune
- DO vizualizare_comenzi IN oproceduri_vizualizare.prg
+ DO vizualizare_comenzi IN oproceduri_vizualizare.prg WITH .F.
ENDPROC
PROCEDURE Page2.Cw5.do_actiune
- DO vizualizare_ist_comenzi IN oproceduri_vizualizare.prg
+ DO vizualizare_comenzi IN oproceduri_vizualizare.prg WITH .T.
ENDPROC
PROCEDURE Page2.Cw6.do_actiune
diff --git a/Clase/oviz_devize.vc2 b/Clase/oviz_devize.vc2
index c576a76..bcb1375 100644
--- a/Clase/oviz_devize.vc2
+++ b/Clase/oviz_devize.vc2
@@ -14531,6 +14531,34 @@ DEFINE CLASS frm_viz_comenzi AS _frmbase OF "..\comun\clase\_frm_base.vcx"
*< OBJECTDATA: ObjPath="grdcomenzi.cKmint.Text1" UniqueID="" Timestamp="" />
*< OBJECTDATA: ObjPath="grdcomenzi.cOreFunctionare.Header1" UniqueID="" Timestamp="" />
*< OBJECTDATA: ObjPath="grdcomenzi.cOreFunctionare.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="grdcomenzi.cValManoperaFactura.Header1" UniqueID="" Timestamp="" />
+ *< OBJECTDATA: ObjPath="grdcomenzi.cValManoperaFactura.Text1" UniqueID="" Timestamp="" />
+ *< OBJECTDATA: ObjPath="grdcomenzi.cValMaterialeVz.Header1" UniqueID="" Timestamp="" />
+ *< OBJECTDATA: ObjPath="grdcomenzi.cValMaterialeVz.Text1" UniqueID="" Timestamp="" />
+ *< OBJECTDATA: ObjPath="grdcomenzi.cValMaterialeAch.Header1" UniqueID="" Timestamp="" />
+ *< OBJECTDATA: ObjPath="grdcomenzi.cValMaterialeAch.Text1" UniqueID="" Timestamp="" />
+ *< OBJECTDATA: ObjPath="grdcomenzi.cValMaterialeFactura.Header1" UniqueID="" Timestamp="" />
+ *< OBJECTDATA: ObjPath="grdcomenzi.cValMaterialeFactura.Text1" UniqueID="" Timestamp="" />
+ *< OBJECTDATA: ObjPath="grdcomenzi.cValFactFtva.Header1" UniqueID="" Timestamp="" />
+ *< OBJECTDATA: ObjPath="grdcomenzi.cValFactFtva.Text1" UniqueID="" Timestamp="" />
+ *< OBJECTDATA: ObjPath="grdcomenzi.cValFactCtva.Header1" UniqueID="" Timestamp="" />
+ *< OBJECTDATA: ObjPath="grdcomenzi.cValFactCtva.Text1" UniqueID="" Timestamp="" />
+ *< OBJECTDATA: ObjPath="grdcomenzi.cAsigurator.Header1" UniqueID="" Timestamp="" />
+ *< OBJECTDATA: ObjPath="grdcomenzi.cAsigurator.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.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="Cmd_cauta1" UniqueID="" Timestamp="" />
*< OBJECTDATA: ObjPath="Cmd_reset1" UniqueID="" Timestamp="" />
*< OBJECTDATA: ObjPath="Ck_nume" UniqueID="" Timestamp="" />
@@ -14540,26 +14568,38 @@ DEFINE CLASS frm_viz_comenzi AS _frmbase OF "..\comun\clase\_frm_base.vcx"
*< OBJECTDATA: ObjPath="Cmd_vizualizare" UniqueID="" Timestamp="" />
*< OBJECTDATA: ObjPath="Ck_nrord" UniqueID="" Timestamp="" />
*< OBJECTDATA: ObjPath="Lb_simplu1" UniqueID="" Timestamp="" />
- *< OBJECTDATA: ObjPath="cbtip_deviz" UniqueID="" Timestamp="" />
*< OBJECTDATA: ObjPath="lbValidat" UniqueID="" Timestamp="" />
*< OBJECTDATA: ObjPath="lbArhivat" UniqueID="" Timestamp="" />
- *< OBJECTDATA: ObjPath="Clb_nr_inreg" UniqueID="" Timestamp="" />
- *< OBJECTDATA: ObjPath="Xresize1" UniqueID="" Timestamp="" />
+ *< OBJECTDATA: ObjPath="lbFacturat" UniqueID="" Timestamp="" />
+ *< OBJECTDATA: ObjPath="Ck_asigurator" UniqueID="" Timestamp="" />
+ *< OBJECTDATA: ObjPath="Ck_inspector" UniqueID="" Timestamp="" />
+ *< OBJECTDATA: ObjPath="Ck_nr_dosar" UniqueID="" Timestamp="" />
+ *< OBJECTDATA: ObjPath="Ck_referinta" UniqueID="" Timestamp="" />
+ *< OBJECTDATA: ObjPath="Cmd_sterge1" UniqueID="" Timestamp="" />
+ *< OBJECTDATA: ObjPath="_grdfooter1" UniqueID="" Timestamp="" />
+ *< OBJECTDATA: ObjPath="cbtip_deviz" UniqueID="" Timestamp="" />
*< OBJECTDATA: ObjPath="But_listare1" UniqueID="" Timestamp="" />
*< OBJECTDATA: ObjPath="Gridextra1" UniqueID="" Timestamp="" />
*< OBJECTDATA: ObjPath="But_excel1" UniqueID="" Timestamp="" />
*< OBJECTDATA: ObjPath="cbValidat" UniqueID="" Timestamp="" />
*< OBJECTDATA: ObjPath="cbArhivat" UniqueID="" Timestamp="" />
+ *< OBJECTDATA: ObjPath="cbFacturat" UniqueID="" Timestamp="" />
+
+ *
+ *p: listoric
+ *
*
cgridsortlist = grdcomenzi
DoCreate = .T.
- Height = 551
+ Height = 611
lactiv1 = .T.
lactiv2 = .T.
+ listoric = .F.
Name = "frm_viz_comenzi"
Width = 792
WindowState = 2
+ _shape1.Anchor = 10
_shape1.Height = 29
_shape1.Left = 0
_shape1.Name = "_shape1"
@@ -14589,6 +14629,19 @@ DEFINE CLASS frm_viz_comenzi AS _frmbase OF "..\comun\clase\_frm_base.vcx"
Gridsort1.Name = "Gridsort1"
*
+ ADD OBJECT '_grdfooter1' AS _grdfooter WITH ;
+ Anchor = 14, ;
+ ccolwithlabel = cNrord, ;
+ csourcegrid = grdcomenzi, ;
+ csumcolumns = cOreManopera,cValManopera,cValManoperaFactura,cValMaterialeVz,cValMaterialeAch,cValMaterialeFactura,cValFactFtva,cValFactCtva, ;
+ ctotallabelexpression = 'Total', ;
+ Height = 26, ;
+ Left = 17, ;
+ Name = "_grdfooter1", ;
+ Top = 572, ;
+ Width = 642
+ *< END OBJECT: ClassLib="..\comun\clase\_grd_base.vcx" BaseClass="grid" />
+
ADD OBJECT 'But_excel1' AS but_excel WITH ;
Anchor = 8, ;
Left = 699, ;
@@ -14607,37 +14660,79 @@ DEFINE CLASS frm_viz_comenzi AS _frmbase OF "..\comun\clase\_frm_base.vcx"
ADD OBJECT 'cbArhivat' AS ctip_deviz WITH ;
Anchor = 8, ;
- Left = 693, ;
+ Height = 27, ;
+ Left = 671, ;
Name = "cbArhivat", ;
TabIndex = 6, ;
- Top = 251, ;
- _combobox1.Name = "_combobox1"
+ Top = 358, ;
+ Width = 111, ;
+ _combobox1.FontName = "Arial", ;
+ _combobox1.Name = "_combobox1", ;
+ _combobox1.Width = 105
+ *< END OBJECT: ClassLib="oviz_devize.vcx" BaseClass="container" />
+
+ ADD OBJECT 'cbFacturat' AS ctip_deviz WITH ;
+ Anchor = 8, ;
+ Height = 27, ;
+ Left = 671, ;
+ Name = "cbFacturat", ;
+ TabIndex = 6, ;
+ Top = 312, ;
+ Width = 111, ;
+ _combobox1.FontName = "Arial", ;
+ _combobox1.Name = "_combobox1", ;
+ _combobox1.Width = 105
*< END OBJECT: ClassLib="oviz_devize.vcx" BaseClass="container" />
ADD OBJECT 'cbtip_deviz' AS ctip_deviz WITH ;
- Left = 693, ;
+ Anchor = 8, ;
+ Height = 27, ;
+ Left = 671, ;
Name = "cbtip_deviz", ;
TabIndex = 6, ;
Tag = "MOVABLE,NOVERTICAL_MOVE", ;
- Top = 162, ;
- _combobox1.Name = "_combobox1"
+ Top = 222, ;
+ Width = 111, ;
+ _combobox1.FontName = "Arial", ;
+ _combobox1.Height = 24, ;
+ _combobox1.Left = 1, ;
+ _combobox1.Name = "_combobox1", ;
+ _combobox1.Top = 2, ;
+ _combobox1.Width = 105
*< END OBJECT: ClassLib="oviz_devize.vcx" BaseClass="container" />
ADD OBJECT 'cbValidat' AS ctip_deviz WITH ;
Anchor = 8, ;
- Left = 693, ;
+ Height = 27, ;
+ Left = 671, ;
Name = "cbValidat", ;
TabIndex = 6, ;
- Top = 206, ;
- _combobox1.Name = "_combobox1"
+ Top = 266, ;
+ Width = 111, ;
+ _combobox1.FontName = "Arial", ;
+ _combobox1.Name = "_combobox1", ;
+ _combobox1.Width = 105
*< 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", ;
+ Left = 671, ;
+ Name = "Ck_asigurator", ;
+ TabIndex = 13, ;
+ Tag = "MOVABLE,NOVERTICAL_MOVE", ;
+ Top = 111, ;
+ ZOrderSet = 16
+ *< 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 = 693, ;
+ Left = 671, ;
Name = "Ck_datai", ;
TabIndex = 3, ;
Tag = "MOVABLE,NOVERTICAL_MOVE", ;
@@ -14646,12 +14741,38 @@ DEFINE CLASS frm_viz_comenzi AS _frmbase OF "..\comun\clase\_frm_base.vcx"
ZOrderSet = 6
*< 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", ;
+ Left = 671, ;
+ Name = "Ck_inspector", ;
+ TabIndex = 14, ;
+ Tag = "MOVABLE,NOVERTICAL_MOVE", ;
+ Top = 126, ;
+ ZOrderSet = 17
+ *< 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", ;
+ Left = 671, ;
+ Name = "Ck_nr_dosar", ;
+ TabIndex = 15, ;
+ Tag = "MOVABLE,NOVERTICAL_MOVE", ;
+ Top = 141, ;
+ ZOrderSet = 18
+ *< 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. inmatriculare", ;
- FontName = "Arial Narrow", ;
- Left = 693, ;
+ Left = 671, ;
Name = "Ck_nrinmat", ;
TabIndex = 4, ;
Tag = "MOVABLE,NOVERTICAL_MOVE", ;
@@ -14661,10 +14782,10 @@ DEFINE CLASS frm_viz_comenzi AS _frmbase OF "..\comun\clase\_frm_base.vcx"
ADD OBJECT 'Ck_nrord' AS ck_filtru_text WITH ;
Alignment = 0, ;
+ Anchor = 8, ;
camp_nume = a.nrord, ;
Caption = "Nr. comanda", ;
- FontName = "Arial Narrow", ;
- Left = 693, ;
+ Left = 671, ;
Name = "Ck_nrord", ;
TabIndex = 1, ;
Tag = "MOVABLE,NOVERTICAL_MOVE", ;
@@ -14674,10 +14795,10 @@ DEFINE CLASS frm_viz_comenzi AS _frmbase OF "..\comun\clase\_frm_base.vcx"
ADD OBJECT 'Ck_nume' AS ck_filtru_text WITH ;
Alignment = 0, ;
+ Anchor = 8, ;
camp_nume = a.nume, ;
Caption = "Nume client", ;
- FontName = "Arial Narrow", ;
- Left = 693, ;
+ Left = 671, ;
Name = "Ck_nume", ;
TabIndex = 2, ;
Tag = "MOVABLE,NOVERTICAL_MOVE", ;
@@ -14685,12 +14806,25 @@ DEFINE CLASS frm_viz_comenzi AS _frmbase OF "..\comun\clase\_frm_base.vcx"
ZOrderSet = 5
*< 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", ;
+ Left = 671, ;
+ Name = "Ck_referinta", ;
+ TabIndex = 16, ;
+ Tag = "MOVABLE,NOVERTICAL_MOVE", ;
+ Top = 156, ;
+ ZOrderSet = 19
+ *< 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 = 693, ;
+ Left = 671, ;
Name = "ck_series", ;
TabIndex = 4, ;
Tag = "MOVABLE,NOVERTICAL_MOVE", ;
@@ -14698,55 +14832,61 @@ DEFINE CLASS frm_viz_comenzi AS _frmbase OF "..\comun\clase\_frm_base.vcx"
ZOrderSet = 7
*< END OBJECT: ClassLib="..\comun\clase\caut_ora.vcx" BaseClass="checkbox" />
- ADD OBJECT 'Clb_nr_inreg' AS clb_tx_simplu WITH ;
- Left = 492, ;
- Name = "Clb_nr_inreg", ;
- Tag = "MOVABLE", ;
- Top = 516, ;
- Text_simplu1.Name = "Text_simplu1", ;
- Text_simplu1.ReadOnly = .T., ;
- Lb_simplu1.Caption = "Nr. nregistrari", ;
- Lb_simplu1.Name = "Lb_simplu1"
- *< END OBJECT: ClassLib="..\comun\clase\lb_tx.vcx" BaseClass="container" />
-
ADD OBJECT 'Cmd_cauta1' AS cmd_cauta WITH ;
- Left = 696, ;
+ Anchor = 8, ;
+ Left = 671, ;
Name = "Cmd_cauta1", ;
TabIndex = 7, ;
Tag = "MOVABLE,NOVERTICAL_MOVE", ;
- Top = 325, ;
+ Top = 409, ;
+ Width = 111, ;
ZOrderSet = 3
*< END OBJECT: ClassLib="..\comun\clase\cmd_butoane.vcx" BaseClass="commandbutton" />
ADD OBJECT 'Cmd_reset1' AS cmd_reset WITH ;
+ Anchor = 8, ;
Height = 27, ;
- Left = 696, ;
+ Left = 671, ;
Name = "Cmd_reset1", ;
TabIndex = 12, ;
Tag = "MOVABLE,NOVERTICAL_MOVE", ;
- Top = 361, ;
- Width = 84, ;
+ Top = 445, ;
+ Width = 111, ;
ZOrderSet = 4
*< END OBJECT: ClassLib="..\comun\clase\cmd_butoane.vcx" BaseClass="commandbutton" />
+ ADD OBJECT 'Cmd_sterge1' AS cmd_sterge WITH ;
+ Anchor = 8, ;
+ Left = 671, ;
+ Name = "Cmd_sterge1", ;
+ TabIndex = 17, ;
+ Tag = "MOVABLE,NOVERTICAL_MOVE", ;
+ Top = 472, ;
+ Visible = .F., ;
+ Width = 111, ;
+ ZOrderSet = 20
+ *< END OBJECT: ClassLib="..\comun\clase\cmd_butoane.vcx" BaseClass="commandbutton" />
+
ADD OBJECT 'Cmd_vizualizare' AS cmd_executa WITH ;
+ Anchor = 8, ;
Caption = "Vi\
ADD OBJECT 'grdcomenzi' AS _grdrow WITH ;
- ColumnCount = 13, ;
+ Anchor = 15, ;
+ ColumnCount = 27, ;
DeleteMark = .F., ;
FontSize = 10, ;
- Height = 468, ;
+ Height = 533, ;
Left = 17, ;
Name = "grdcomenzi", ;
Panel = 1, ;
@@ -14755,7 +14895,7 @@ DEFINE CLASS frm_viz_comenzi AS _frmbase OF "..\comun\clase\_frm_base.vcx"
TabIndex = 8, ;
Tag = "RESIZABLE", ;
Top = 36, ;
- Width = 667, ;
+ Width = 642, ;
ZOrderSet = 2, ;
Column1.ControlSource = "nrord", ;
Column1.FontSize = 10, ;
@@ -14821,9 +14961,139 @@ DEFINE CLASS frm_viz_comenzi AS _frmbase OF "..\comun\clase\_frm_base.vcx"
Column13.ControlSource = "ore_functionare", ;
Column13.FontSize = 10, ;
Column13.Name = "cOreFunctionare", ;
- Column13.ReadOnly = .T.
+ Column13.ReadOnly = .T., ;
+ Column14.ControlSource = "ore_manopera", ;
+ Column14.FontSize = 10, ;
+ Column14.Format = "R", ;
+ Column14.InputMask = (get_mask(16,gnPc)), ;
+ Column14.Name = "cOreManopera", ;
+ Column14.ReadOnly = .T., ;
+ Column14.Width = 86, ;
+ Column15.ControlSource = "val_manopera", ;
+ Column15.FontSize = 10, ;
+ Column15.Format = "R", ;
+ Column15.InputMask = (get_mask(16,gnPc)), ;
+ Column15.Name = "cValManopera", ;
+ Column15.ReadOnly = .T., ;
+ Column15.Width = 109, ;
+ Column16.ControlSource = "val_manopera_factura", ;
+ Column16.FontSize = 10, ;
+ Column16.Format = "R", ;
+ Column16.InputMask = (get_mask(16,gnPc)), ;
+ Column16.Name = "cValManoperaFactura", ;
+ Column16.ReadOnly = .T., ;
+ Column16.Width = 152, ;
+ Column17.ControlSource = "val_materiale_vz", ;
+ Column17.FontSize = 10, ;
+ Column17.Format = "R", ;
+ Column17.InputMask = (get_mask(16,gnPc)), ;
+ Column17.Name = "cValMaterialeVz", ;
+ Column17.ReadOnly = .T., ;
+ Column17.Width = 153, ;
+ Column18.ControlSource = "val_materiale_ach", ;
+ Column18.FontSize = 10, ;
+ Column18.Format = "R", ;
+ Column18.InputMask = (get_mask(16,gnPc)), ;
+ Column18.Name = "cValMaterialeAch", ;
+ Column18.ReadOnly = .T., ;
+ Column18.Width = 157, ;
+ Column19.ControlSource = "val_materiale_factura", ;
+ Column19.FontSize = 10, ;
+ Column19.Format = "R", ;
+ Column19.InputMask = (get_mask(16,gnPc)), ;
+ Column19.Name = "cValMaterialeFactura", ;
+ Column19.ReadOnly = .T., ;
+ Column19.Width = 148, ;
+ Column20.ControlSource = "valftva_factura", ;
+ Column20.FontSize = 10, ;
+ Column20.Format = "R", ;
+ Column20.InputMask = (get_mask(16,gnPc)), ;
+ Column20.Name = "cValFactFtva", ;
+ Column20.ReadOnly = .T., ;
+ Column20.Width = 148, ;
+ Column21.ControlSource = "valctva_factura", ;
+ Column21.FontSize = 10, ;
+ Column21.Format = "R", ;
+ Column21.InputMask = (get_mask(16,gnPc)), ;
+ Column21.Name = "cValFactCtva", ;
+ Column21.ReadOnly = .T., ;
+ Column21.Width = 148, ;
+ Column22.ControlSource = "asigurator", ;
+ Column22.FontName = "Arial", ;
+ Column22.FontSize = 10, ;
+ Column22.Name = "cAsigurator", ;
+ Column22.ReadOnly = .T., ;
+ Column23.ControlSource = "marca", ;
+ Column23.FontName = "Arial", ;
+ Column23.FontSize = 10, ;
+ Column23.Name = "cMarca", ;
+ Column23.ReadOnly = .T., ;
+ Column23.Width = 85, ;
+ Column24.ControlSource = "masina", ;
+ Column24.FontName = "Arial", ;
+ Column24.FontSize = 10, ;
+ Column24.Name = "cMasina", ;
+ Column24.ReadOnly = .T., ;
+ Column25.ControlSource = "inspector", ;
+ Column25.FontName = "Arial", ;
+ Column25.FontSize = 10, ;
+ Column25.Name = "cInspector", ;
+ Column25.ReadOnly = .T., ;
+ Column25.Width = 61, ;
+ Column26.ControlSource = "nr_dosar", ;
+ Column26.FontName = "Arial", ;
+ Column26.FontSize = 10, ;
+ Column26.Name = "cNr_dosar", ;
+ Column26.ReadOnly = .T., ;
+ Column26.Width = 69, ;
+ Column27.ControlSource = "IIF(inchis_fortat=1,'Da','Nu')", ;
+ Column27.FontName = "Arial", ;
+ Column27.FontSize = 10, ;
+ Column27.Name = "cArhivat", ;
+ Column27.ReadOnly = .T., ;
+ Column27.Width = 42
*< 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", ;
@@ -14900,6 +15170,26 @@ DEFINE CLASS frm_viz_comenzi AS _frmbase OF "..\comun\clase\_frm_base.vcx"
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", ;
@@ -14916,6 +15206,66 @@ DEFINE CLASS frm_viz_comenzi AS _frmbase OF "..\comun\clase\_frm_base.vcx"
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", ;
@@ -14989,6 +15339,26 @@ DEFINE CLASS frm_viz_comenzi AS _frmbase OF "..\comun\clase\_frm_base.vcx"
SelectedBackColor = 100,185,255
*< END OBJECT: BaseClass="textbox" />
+ ADD OBJECT 'grdcomenzi.cOreManopera.Header1' AS header WITH ;
+ Alignment = 2, ;
+ Caption = "Ore manopera", ;
+ FontName = "Arial", ;
+ FontSize = 10, ;
+ Name = "Header1"
+ *< END OBJECT: BaseClass="header" />
+
+ ADD OBJECT 'grdcomenzi.cOreManopera.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.cPartRef.Header1' AS header WITH ;
Alignment = 2, ;
Caption = "Referinta", ;
@@ -15043,6 +15413,46 @@ DEFINE CLASS frm_viz_comenzi AS _frmbase OF "..\comun\clase\_frm_base.vcx"
SelectedBackColor = 100,185,255
*< END OBJECT: BaseClass="textbox" />
+ ADD OBJECT 'grdcomenzi.cValFactCtva.Header1' AS header WITH ;
+ Alignment = 2, ;
+ Caption = "Valoare factura cu TVA", ;
+ FontName = "Arial", ;
+ FontSize = 10, ;
+ Name = "Header1"
+ *< END OBJECT: BaseClass="header" />
+
+ ADD OBJECT 'grdcomenzi.cValFactCtva.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.cValFactFtva.Header1' AS header WITH ;
+ Alignment = 2, ;
+ Caption = "Valoare factura fara TVA", ;
+ FontName = "Arial", ;
+ FontSize = 10, ;
+ Name = "Header1"
+ *< END OBJECT: BaseClass="header" />
+
+ ADD OBJECT 'grdcomenzi.cValFactFtva.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.cValidat.Header1' AS header WITH ;
Alignment = 2, ;
Caption = "Validat", ;
@@ -15062,23 +15472,124 @@ DEFINE CLASS frm_viz_comenzi AS _frmbase OF "..\comun\clase\_frm_base.vcx"
SelectedBackColor = 100,185,255
*< END OBJECT: BaseClass="textbox" />
+ ADD OBJECT 'grdcomenzi.cValManopera.Header1' AS header WITH ;
+ Alignment = 2, ;
+ Caption = "Valoare manopera", ;
+ FontName = "Arial", ;
+ FontSize = 10, ;
+ Name = "Header1"
+ *< END OBJECT: BaseClass="header" />
+
+ ADD OBJECT 'grdcomenzi.cValManopera.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.cValManoperaFactura.Header1' AS header WITH ;
+ Alignment = 2, ;
+ Caption = "Valoare manopera factura", ;
+ FontName = "Arial", ;
+ FontSize = 10, ;
+ Name = "Header1"
+ *< END OBJECT: BaseClass="header" />
+
+ ADD OBJECT 'grdcomenzi.cValManoperaFactura.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.cValMaterialeAch.Header1' AS header WITH ;
+ Alignment = 2, ;
+ Caption = "Valoare materiale achizitie", ;
+ FontName = "Arial", ;
+ FontSize = 10, ;
+ Name = "Header1"
+ *< END OBJECT: BaseClass="header" />
+
+ ADD OBJECT 'grdcomenzi.cValMaterialeAch.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.cValMaterialeFactura.Header1' AS header WITH ;
+ Alignment = 2, ;
+ Caption = "Valoare materiale factura", ;
+ FontName = "Arial", ;
+ FontSize = 10, ;
+ Name = "Header1"
+ *< END OBJECT: BaseClass="header" />
+
+ ADD OBJECT 'grdcomenzi.cValMaterialeFactura.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.cValMaterialeVz.Header1' AS header WITH ;
+ Alignment = 2, ;
+ Caption = "Valoare materiale vanzare", ;
+ FontName = "Arial", ;
+ FontSize = 10, ;
+ Name = "Header1"
+ *< END OBJECT: BaseClass="header" />
+
+ ADD OBJECT 'grdcomenzi.cValMaterialeVz.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 'Gridextra1' AS gridextra WITH ;
gridexpression = Thisform.grdComenzi, ;
- Left = 700, ;
+ Left = 681, ;
Name = "Gridextra1", ;
Top = 445
*< END OBJECT: ClassLib="..\comun\utile\gridextras\gridextras.vcx" BaseClass="custom" />
ADD OBJECT 'Lb_simplu1' AS lb_simplu WITH ;
+ Anchor = 8, ;
BackColor = 255,255,255, ;
BackStyle = 0, ;
Caption = "Tip comanda", ;
- FontName = "Arial Narrow", ;
- Left = 693, ;
+ FontBold = .T., ;
+ Left = 671, ;
Name = "Lb_simplu1", ;
TabIndex = 5, ;
Tag = "MOVABLE,NOVERTICAL_MOVE", ;
- Top = 144, ;
+ Top = 204, ;
ZOrderSet = 13
*< END OBJECT: ClassLib="..\comun\clase\lb.vcx" BaseClass="label" />
@@ -15087,11 +15598,24 @@ DEFINE CLASS frm_viz_comenzi AS _frmbase OF "..\comun\clase\_frm_base.vcx"
BackColor = 255,255,255, ;
BackStyle = 0, ;
Caption = "Arhivate", ;
- FontName = "Arial Narrow", ;
- Left = 693, ;
+ FontBold = .T., ;
+ Left = 671, ;
Name = "lbArhivat", ;
TabIndex = 5, ;
- Top = 235, ;
+ Top = 342, ;
+ ZOrderSet = 15
+ *< END OBJECT: ClassLib="..\comun\clase\lb.vcx" BaseClass="label" />
+
+ ADD OBJECT 'lbFacturat' AS lb_simplu WITH ;
+ Anchor = 8, ;
+ BackColor = 255,255,255, ;
+ BackStyle = 0, ;
+ Caption = "Facturate", ;
+ FontBold = .T., ;
+ Left = 671, ;
+ Name = "lbFacturat", ;
+ TabIndex = 5, ;
+ Top = 296, ;
ZOrderSet = 15
*< END OBJECT: ClassLib="..\comun\clase\lb.vcx" BaseClass="label" />
@@ -15100,19 +15624,13 @@ DEFINE CLASS frm_viz_comenzi AS _frmbase OF "..\comun\clase\_frm_base.vcx"
BackColor = 255,255,255, ;
BackStyle = 0, ;
Caption = "Validate", ;
- FontName = "Arial Narrow", ;
- Left = 693, ;
+ FontBold = .T., ;
+ Left = 671, ;
Name = "lbValidat", ;
TabIndex = 5, ;
- Top = 190, ;
+ Top = 250, ;
ZOrderSet = 15
*< END OBJECT: ClassLib="..\comun\clase\lb.vcx" BaseClass="label" />
-
- ADD OBJECT 'Xresize1' AS xresize WITH ;
- Left = 348, ;
- Name = "Xresize1", ;
- Top = 528
- *< END OBJECT: ClassLib="..\comun\clase\xresize.vcx" BaseClass="custom" />
PROCEDURE actualizeaza_grid1
Parameters tcFiltru
@@ -15129,17 +15647,16 @@ DEFINE CLASS frm_viz_comenzi AS _frmbase OF "..\comun\clase\_frm_base.vcx"
pocomenzi.ca_baza1.cfiltru = lcFiltru
pocomenzi.ca_baza1.afisare()
restore_grid(Thisform.grdcomenzi)
+ Thisform._grdfooter1.calctotal()
Thisform.MousePointer = 0
Thisform.LockScreen = .F.
If Reccount('crscomenzi')>0
- thisform.clb_nr_inreg.text_simplu1.Value=RECCOUNT('crscomenzi')
Select crscomenzi
Go Top
Thisform.cmd_vizualizare.Enabled=.T.
Thisform.grdcomenzi.SetFocus()
Else
- thisform.clb_nr_inreg.text_simplu1.Value=0
Thisform.cmd_vizualizare.Enabled=.F.
Endif
@@ -15155,8 +15672,9 @@ DEFINE CLASS frm_viz_comenzi AS _frmbase OF "..\comun\clase\_frm_base.vcx"
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))
+ lnOptiuneFacturat = Iif(Thisform.cbFacturat._combobox1.Value = '', 1, Iif(Thisform.cbFacturat._combobox1.Value = 'Facturate', 2, 3))
- lcFiltru = gcCondLuna
+ lcFiltru = Iif(Thisform.lIstoric, [2=2], gcCondLuna)
If Thisform.ck_datai.Value=1
lcFiltru = lcFiltru + Thisform.ck_datai.filtru
@@ -15174,6 +15692,18 @@ DEFINE CLASS frm_viz_comenzi AS _frmbase OF "..\comun\clase\_frm_base.vcx"
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_series.Value=1
lcFiltru = lcFiltru + Thisform.ck_series.filtru
ENDIF
@@ -15196,6 +15726,17 @@ DEFINE CLASS frm_viz_comenzi AS _frmbase OF "..\comun\clase\_frm_base.vcx"
lcFiltru = lcFiltru + [ and a.inchis_fortat = 1]
ENDCASE
+ Do Case
+ Case lnOptiuneFacturat = 2
+ lcFiltru = lcFiltru + [ and a.facturat = 1]
+ Case lnOptiuneFacturat = 3
+ lcFiltru = lcFiltru + [ and a.facturat = 0]
+ Endcase
+
+ If Thisform.ck_referinta.Value = 1
+ lcFiltru = lcFiltru + Thisform.ck_referinta.filtru
+ ENDIF
+
Thisform.actualizeaza_grid1(lcFiltru)
If Reccount('crscomenzi')=0
@@ -15431,14 +15972,73 @@ DEFINE CLASS frm_viz_comenzi AS _frmbase OF "..\comun\clase\_frm_base.vcx"
Thisform.cbtip_deviz.do_reset()
thisform.cbvalidat.do_reset()
thisform.cbarhivat.do_reset()
+ thisform.cbfacturat.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
+ LPARAMETERS tlIstoric
DODEFAULT()
- thisform.clb_nr_inreg.text_simplu1.Value=RECCOUNT('crscomenzi')
+ This.lIstoric = (Vartype(m.tlIstoric) = 'L' And m.tlIstoric)
+ This.Lb_titlu_alb_b121.Caption = Iif(This.lIstoric, "ISTORIC COMENZI", "VIZUALIZARE COMENZI")
+ ENDPROC
+
+ PROCEDURE Show
+ LPARAMETERS nStyle
+ DODEFAULT(nStyle)
+
this.gridextra1.setup()
+ THIS._grdfooter1.attachtogrid(This.grdcomenzi)
+ This._grdfooter1.calcTotal
ENDPROC
PROCEDURE cbArhivat._combobox1.Destroy
@@ -15459,6 +16059,24 @@ DEFINE CLASS frm_viz_comenzi AS _frmbase OF "..\comun\clase\_frm_base.vcx"
this.Parent.cdefault="Active"
ENDPROC
+ PROCEDURE cbFacturat._combobox1.Destroy
+ Use In (SELECT('lista_facturat'))
+ ENDPROC
+
+ PROCEDURE cbFacturat._combobox1.Init
+ Create Cursor lista_facturat(denumire C(50),id N(5))
+ Select lista_facturat
+ INSERT INTO lista_facturat(denumire, id) VALUES ('', 0)
+ INSERT INTO lista_facturat(denumire, id) VALUES ('Facturate', 1)
+ INSERT INTO lista_facturat(denumire, id) VALUES ('Nefacturate', 2)
+
+
+ This.RowSourceType= 2
+ This.RowSource="lista_facturat"
+ This.Value=""
+ this.Parent.cdefault=""
+ ENDPROC
+
PROCEDURE cbValidat._combobox1.Destroy
Use In (SELECT('lista_validat'))
ENDPROC
@@ -15477,6 +16095,24 @@ DEFINE CLASS frm_viz_comenzi AS _frmbase OF "..\comun\clase\_frm_base.vcx"
this.Parent.cdefault=""
ENDPROC
+ PROCEDURE grdcomenzi.AfterRowColChange
+ Lparameters nColIndex
+ If This.RowColChange!=2
+ DoDefault()
+ Endif
+
+ ENDPROC
+
+ PROCEDURE Gridextra1.applyfilter
+ DODEFAULT()
+ Thisform._grdfooter1.calcTotal()
+ ENDPROC
+
+ PROCEDURE Gridextra1.clearfilter
+ DODEFAULT()
+ Thisform._grdfooter1.calcTotal()
+ ENDPROC
+
ENDDEFINE
DEFINE CLASS frm_viz_comenzi_regie AS _frmbase OF "..\comun\clase\_frm_base.vcx"
@@ -16788,21 +17424,35 @@ DEFINE CLASS frm_viz_facturi AS _frmbase OF "..\comun\clase\_frm_base.vcx"
*< OBJECTDATA: ObjPath="grdfacturi.cNr_dosar.Text1" UniqueID="" Timestamp="" />
*< OBJECTDATA: ObjPath="grdfacturi.cPartRef.Header1" UniqueID="" Timestamp="" />
*< OBJECTDATA: ObjPath="grdfacturi.cPartRef.Text1" UniqueID="" Timestamp="" />
+ *< OBJECTDATA: ObjPath="grdfacturi.cOreManopera.Header1" UniqueID="" Timestamp="" />
+ *< OBJECTDATA: ObjPath="grdfacturi.cOreManopera.Text1" UniqueID="" Timestamp="" />
+ *< OBJECTDATA: ObjPath="grdfacturi.cValManopera.Header1" UniqueID="" Timestamp="" />
+ *< OBJECTDATA: ObjPath="grdfacturi.cValManopera.Text1" UniqueID="" Timestamp="" />
+ *< OBJECTDATA: ObjPath="grdfacturi.cValMaterialeAch.Header1" UniqueID="" Timestamp="" />
+ *< OBJECTDATA: ObjPath="grdfacturi.cValMaterialeAch.Text1" UniqueID="" Timestamp="" />
+ *< OBJECTDATA: ObjPath="grdfacturi.cValMaterialeVz.Header1" UniqueID="" Timestamp="" />
+ *< OBJECTDATA: ObjPath="grdfacturi.cValMaterialeVz.Text1" UniqueID="" Timestamp="" />
+ *< OBJECTDATA: ObjPath="grdfacturi.cValftva.Header1" UniqueID="" Timestamp="" />
+ *< OBJECTDATA: ObjPath="grdfacturi.cValftva.Text1" UniqueID="" Timestamp="" />
*< OBJECTDATA: ObjPath="Cmd_cauta1" UniqueID="" Timestamp="" />
*< OBJECTDATA: ObjPath="Cmd_reset1" UniqueID="" Timestamp="" />
+ *< OBJECTDATA: ObjPath="Ck_inspector" UniqueID="" Timestamp="" />
+ *< OBJECTDATA: ObjPath="Ck_datafact" UniqueID="" Timestamp="" />
+ *< OBJECTDATA: ObjPath="Ck_asigurator" UniqueID="" Timestamp="" />
*< OBJECTDATA: ObjPath="Ck_nume" UniqueID="" Timestamp="" />
- *< OBJECTDATA: ObjPath="Ck_nr_dosar" UniqueID="" Timestamp="" />
*< OBJECTDATA: ObjPath="Ck_datai" UniqueID="" Timestamp="" />
*< OBJECTDATA: ObjPath="Ck_nrinmat" UniqueID="" Timestamp="" />
- *< OBJECTDATA: ObjPath="Ck_asigurator" UniqueID="" Timestamp="" />
*< OBJECTDATA: ObjPath="Ck_nrord" UniqueID="" Timestamp="" />
*< OBJECTDATA: ObjPath="Ck_nrfact" UniqueID="" Timestamp="" />
- *< OBJECTDATA: ObjPath="Ck_inspector" UniqueID="" Timestamp="" />
*< OBJECTDATA: ObjPath="Clb_materiale" UniqueID="" Timestamp="" />
*< OBJECTDATA: ObjPath="Clb_valctva" UniqueID="" Timestamp="" />
+ *< OBJECTDATA: ObjPath="Clb_valftva" UniqueID="" Timestamp="" />
*< OBJECTDATA: ObjPath="Clb_manopera" UniqueID="" Timestamp="" />
- *< OBJECTDATA: ObjPath="Ck_datafact" UniqueID="" Timestamp="" />
- *< OBJECTDATA: ObjPath="Xresize1" UniqueID="" Timestamp="" />
+ *< OBJECTDATA: ObjPath="Ck_nr_dosar" UniqueID="" Timestamp="" />
+ *< OBJECTDATA: ObjPath="Clb_ore_manopera" UniqueID="" Timestamp="" />
+ *< OBJECTDATA: ObjPath="Clb_val_manopera" UniqueID="" Timestamp="" />
+ *< OBJECTDATA: ObjPath="Clb_val_mat_ach" UniqueID="" Timestamp="" />
+ *< OBJECTDATA: ObjPath="Clb_val_mat_vz" UniqueID="" Timestamp="" />
*< OBJECTDATA: ObjPath="But_excel1" UniqueID="" Timestamp="" />
*< OBJECTDATA: ObjPath="But_listare1" UniqueID="" Timestamp="" />
*< OBJECTDATA: ObjPath="Gridextra1" UniqueID="" Timestamp="" />
@@ -16817,31 +17467,33 @@ DEFINE CLASS frm_viz_facturi AS _frmbase OF "..\comun\clase\_frm_base.vcx"
Height = 497
lactiv1 = .T.
Name = "frm_viz_facturi"
- Width = 793
+ Width = 850
WindowState = 2
_memberdata =
+ _shape1.Anchor = 10
_shape1.Height = 29
_shape1.Left = 0
_shape1.Name = "_shape1"
_shape1.Tag = "RESIZABLE,NOVERTICAL_RESIZE"
_shape1.Top = 0
- _shape1.Width = 792
+ _shape1.Width = 852
_shape1.ZOrderSet = 0
_shape2.Height = 29
- _shape2.Left = 731
+ _shape2.Left = 763
_shape2.Name = "_shape2"
_shape2.Tag = "MOVABLE,NOVERTICAL_MOVE"
_shape2.Top = -1
- _shape2.Width = 62
+ _shape2.Width = 88
_shape2.ZOrderSet = 8
Lb_titlu_alb_b121.Caption = "VIZUALIZARE FACTURI EMISE N LUNA "
Lb_titlu_alb_b121.FontBold = .T.
Lb_titlu_alb_b121.Name = "Lb_titlu_alb_b121"
Lb_titlu_alb_b121.TabIndex = 12
Lb_titlu_alb_b121.ZOrderSet = 1
- BUT_TERMIN1.Left = 762
+ BUT_TERMIN1.Anchor = 9
+ BUT_TERMIN1.Left = 820
BUT_TERMIN1.Name = "BUT_TERMIN1"
BUT_TERMIN1.TabIndex = 11
BUT_TERMIN1.Tag = "MOVABLE,NOVERTICAL_MOVE"
@@ -16852,7 +17504,7 @@ DEFINE CLASS frm_viz_facturi AS _frmbase OF "..\comun\clase\_frm_base.vcx"
ADD OBJECT 'But_excel1' AS but_excel WITH ;
Anchor = 9, ;
- Left = 703, ;
+ Left = 761, ;
Name = "But_excel1", ;
TabIndex = 17, ;
Top = 0, ;
@@ -16861,7 +17513,7 @@ DEFINE CLASS frm_viz_facturi AS _frmbase OF "..\comun\clase\_frm_base.vcx"
ADD OBJECT 'But_listare1' AS but_listare WITH ;
Anchor = 9, ;
- Left = 733, ;
+ Left = 791, ;
Name = "But_listare1", ;
TabIndex = 12, ;
Tag = "MOVABLE,NOVERTICAL_MOVE", ;
@@ -16874,7 +17526,7 @@ DEFINE CLASS frm_viz_facturi AS _frmbase OF "..\comun\clase\_frm_base.vcx"
Anchor = 8, ;
camp_nume = a.asigurator, ;
Caption = "Asigurator", ;
- Left = 678, ;
+ Left = 725, ;
Name = "Ck_asigurator", ;
TabIndex = 6, ;
Top = 140, ;
@@ -16886,7 +17538,7 @@ DEFINE CLASS frm_viz_facturi AS _frmbase OF "..\comun\clase\_frm_base.vcx"
Anchor = 8, ;
camp_nume = a.dataact, ;
Caption = "Data factura", ;
- Left = 678, ;
+ Left = 725, ;
Name = "Ck_datafact", ;
TabIndex = 3, ;
tip = D, ;
@@ -16899,7 +17551,7 @@ DEFINE CLASS frm_viz_facturi AS _frmbase OF "..\comun\clase\_frm_base.vcx"
Anchor = 8, ;
camp_nume = a.datai, ;
Caption = "Data comanda", ;
- Left = 678, ;
+ Left = 725, ;
Name = "Ck_datai", ;
TabIndex = 3, ;
tip = D, ;
@@ -16912,7 +17564,7 @@ DEFINE CLASS frm_viz_facturi AS _frmbase OF "..\comun\clase\_frm_base.vcx"
Anchor = 8, ;
camp_nume = a.inspector, ;
Caption = "Inspector", ;
- Left = 678, ;
+ Left = 725, ;
Name = "Ck_inspector", ;
TabIndex = 7, ;
Top = 157, ;
@@ -16924,7 +17576,7 @@ DEFINE CLASS frm_viz_facturi AS _frmbase OF "..\comun\clase\_frm_base.vcx"
Anchor = 8, ;
camp_nume = a.nr_dosar, ;
Caption = "Nr.dosar", ;
- Left = 678, ;
+ Left = 725, ;
Name = "Ck_nr_dosar", ;
TabIndex = 8, ;
Top = 174, ;
@@ -16936,7 +17588,7 @@ DEFINE CLASS frm_viz_facturi AS _frmbase OF "..\comun\clase\_frm_base.vcx"
Anchor = 8, ;
camp_nume = a.nract, ;
Caption = "Nr. factura", ;
- Left = 678, ;
+ Left = 725, ;
Name = "Ck_nrfact", ;
TabIndex = 5, ;
Top = 55, ;
@@ -16948,7 +17600,7 @@ DEFINE CLASS frm_viz_facturi AS _frmbase OF "..\comun\clase\_frm_base.vcx"
Anchor = 8, ;
camp_nume = a.nrinmat, ;
Caption = "Nr. nmatriculare", ;
- Left = 678, ;
+ Left = 725, ;
Name = "Ck_nrinmat", ;
TabIndex = 4, ;
Top = 122, ;
@@ -16960,7 +17612,7 @@ DEFINE CLASS frm_viz_facturi AS _frmbase OF "..\comun\clase\_frm_base.vcx"
Anchor = 8, ;
camp_nume = a.nrord, ;
Caption = "Nr. comanda", ;
- Left = 678, ;
+ Left = 725, ;
Name = "Ck_nrord", ;
TabIndex = 1, ;
Top = 87, ;
@@ -16972,7 +17624,7 @@ DEFINE CLASS frm_viz_facturi AS _frmbase OF "..\comun\clase\_frm_base.vcx"
Anchor = 8, ;
camp_nume = a.nume, ;
Caption = "Nume client", ;
- Left = 678, ;
+ Left = 725, ;
Name = "Ck_nume", ;
TabIndex = 2, ;
Top = 70, ;
@@ -16980,68 +17632,193 @@ DEFINE CLASS frm_viz_facturi AS _frmbase OF "..\comun\clase\_frm_base.vcx"
*< END OBJECT: ClassLib="..\comun\clase\caut_ora.vcx" BaseClass="checkbox" />
ADD OBJECT 'Clb_manopera' AS clb_tx_simplu WITH ;
- Left = 7, ;
+ Anchor = 4, ;
+ Height = 29, ;
+ Left = 399, ;
Name = "Clb_manopera", ;
TabIndex = 16, ;
TabStop = .F., ;
Tag = "MOVABLE,NOHORIZONTAL_MOVE", ;
Top = 431, ;
+ Width = 187, ;
ZOrderSet = 14, ;
Text_simplu1.Alignment = 3, ;
Text_simplu1.Format = "R", ;
Text_simplu1.InputMask = (get_mask(12,gnPc)), ;
+ Text_simplu1.Left = 80, ;
Text_simplu1.Name = "Text_simplu1", ;
Text_simplu1.ReadOnly = .T., ;
Text_simplu1.Value = 0, ;
- Lb_simplu1.Caption = "Total manopera", ;
+ Text_simplu1.Width = 102, ;
+ Lb_simplu1.Caption = "Manop. fact.", ;
Lb_simplu1.Name = "Lb_simplu1"
*< END OBJECT: ClassLib="..\comun\clase\lb_tx.vcx" BaseClass="container" />
ADD OBJECT 'Clb_materiale' AS clb_tx_simplu WITH ;
- Left = 7, ;
+ Anchor = 4, ;
+ Height = 29, ;
+ Left = 399, ;
Name = "Clb_materiale", ;
TabIndex = 14, ;
TabStop = .F., ;
Tag = "MOVABLE,NOHORIZONTAL_MOVE", ;
- Top = 459, ;
+ Top = 460, ;
+ Width = 187, ;
ZOrderSet = 12, ;
Text_simplu1.Alignment = 3, ;
Text_simplu1.Format = "R", ;
Text_simplu1.InputMask = (get_mask(12,gnPc)), ;
+ Text_simplu1.Left = 80, ;
Text_simplu1.Name = "Text_simplu1", ;
Text_simplu1.ReadOnly = .T., ;
Text_simplu1.Value = 0, ;
- Lb_simplu1.Caption = "Total materiale", ;
+ Text_simplu1.Width = 102, ;
+ Lb_simplu1.Caption = "Mat. fact.", ;
+ Lb_simplu1.Name = "Lb_simplu1"
+ *< END OBJECT: ClassLib="..\comun\clase\lb_tx.vcx" BaseClass="container" />
+
+ ADD OBJECT 'Clb_ore_manopera' AS clb_tx_simplu WITH ;
+ Anchor = 4, ;
+ Height = 29, ;
+ Left = 7, ;
+ Name = "Clb_ore_manopera", ;
+ TabIndex = 18, ;
+ TabStop = .F., ;
+ Tag = "MOVABLE,NOHORIZONTAL_MOVE", ;
+ Top = 431, ;
+ Width = 187, ;
+ Text_simplu1.Alignment = 3, ;
+ Text_simplu1.Format = "R", ;
+ Text_simplu1.InputMask = (get_mask(12,gnPc)), ;
+ Text_simplu1.Left = 80, ;
+ Text_simplu1.Name = "Text_simplu1", ;
+ Text_simplu1.ReadOnly = .T., ;
+ Text_simplu1.Value = 0, ;
+ Text_simplu1.Width = 102, ;
+ Lb_simplu1.Caption = "Ore manop.", ;
+ Lb_simplu1.Name = "Lb_simplu1"
+ *< END OBJECT: ClassLib="..\comun\clase\lb_tx.vcx" BaseClass="container" />
+
+ ADD OBJECT 'Clb_val_manopera' AS clb_tx_simplu WITH ;
+ Anchor = 4, ;
+ Height = 29, ;
+ Left = 205, ;
+ Name = "Clb_val_manopera", ;
+ TabIndex = 19, ;
+ TabStop = .F., ;
+ Tag = "MOVABLE,NOHORIZONTAL_MOVE", ;
+ Top = 431, ;
+ Width = 187, ;
+ Text_simplu1.Alignment = 3, ;
+ Text_simplu1.Format = "R", ;
+ Text_simplu1.InputMask = (get_mask(12,gnPc)), ;
+ Text_simplu1.Left = 80, ;
+ Text_simplu1.Name = "Text_simplu1", ;
+ Text_simplu1.ReadOnly = .T., ;
+ Text_simplu1.Value = 0, ;
+ Text_simplu1.Width = 102, ;
+ Lb_simplu1.Caption = "Val. manop.", ;
+ Lb_simplu1.Name = "Lb_simplu1"
+ *< END OBJECT: ClassLib="..\comun\clase\lb_tx.vcx" BaseClass="container" />
+
+ ADD OBJECT 'Clb_val_mat_ach' AS clb_tx_simplu WITH ;
+ Anchor = 4, ;
+ Height = 29, ;
+ Left = 7, ;
+ Name = "Clb_val_mat_ach", ;
+ TabIndex = 20, ;
+ TabStop = .F., ;
+ Tag = "MOVABLE,NOHORIZONTAL_MOVE", ;
+ Top = 460, ;
+ Width = 187, ;
+ Text_simplu1.Alignment = 3, ;
+ Text_simplu1.Format = "R", ;
+ Text_simplu1.InputMask = (get_mask(12,gnPc)), ;
+ Text_simplu1.Left = 80, ;
+ Text_simplu1.Name = "Text_simplu1", ;
+ Text_simplu1.ReadOnly = .T., ;
+ Text_simplu1.Value = 0, ;
+ Text_simplu1.Width = 102, ;
+ Lb_simplu1.Caption = "Mat. ach.", ;
+ Lb_simplu1.Name = "Lb_simplu1"
+ *< END OBJECT: ClassLib="..\comun\clase\lb_tx.vcx" BaseClass="container" />
+
+ ADD OBJECT 'Clb_val_mat_vz' AS clb_tx_simplu WITH ;
+ Anchor = 4, ;
+ Height = 29, ;
+ Left = 205, ;
+ Name = "Clb_val_mat_vz", ;
+ TabIndex = 21, ;
+ TabStop = .F., ;
+ Tag = "MOVABLE,NOHORIZONTAL_MOVE", ;
+ Top = 460, ;
+ Width = 187, ;
+ Text_simplu1.Alignment = 3, ;
+ Text_simplu1.Format = "R", ;
+ Text_simplu1.InputMask = (get_mask(12,gnPc)), ;
+ Text_simplu1.Left = 80, ;
+ Text_simplu1.Name = "Text_simplu1", ;
+ Text_simplu1.ReadOnly = .T., ;
+ Text_simplu1.Value = 0, ;
+ Text_simplu1.Width = 102, ;
+ Lb_simplu1.Caption = "Mat. vanz.", ;
Lb_simplu1.Name = "Lb_simplu1"
*< END OBJECT: ClassLib="..\comun\clase\lb_tx.vcx" BaseClass="container" />
ADD OBJECT 'Clb_valctva' AS clb_tx_simplu WITH ;
- Height = 58, ;
- Left = 479, ;
+ Anchor = 4, ;
+ Height = 29, ;
+ Left = 591, ;
Name = "Clb_valctva", ;
TabIndex = 15, ;
TabStop = .F., ;
Tag = "MOVABLE", ;
- Top = 431, ;
- Width = 194, ;
+ Top = 460, ;
+ Width = 205, ;
ZOrderSet = 13, ;
Text_simplu1.Alignment = 3, ;
Text_simplu1.Format = "R", ;
Text_simplu1.InputMask = (get_mask(12,gnPc)), ;
- Text_simplu1.Left = 5, ;
+ Text_simplu1.Left = 90, ;
Text_simplu1.Name = "Text_simplu1", ;
Text_simplu1.ReadOnly = .T., ;
- Text_simplu1.Top = 31, ;
Text_simplu1.Value = 0, ;
- Lb_simplu1.Caption = "Total valoare facturi (cu TVA)", ;
- Lb_simplu1.Left = 18, ;
- Lb_simplu1.Name = "Lb_simplu1", ;
- Lb_simplu1.Top = 7
+ Text_simplu1.Width = 110, ;
+ Lb_simplu1.Caption = "Total cu TVA", ;
+ Lb_simplu1.Left = 6, ;
+ Lb_simplu1.Name = "Lb_simplu1"
+ *< END OBJECT: ClassLib="..\comun\clase\lb_tx.vcx" BaseClass="container" />
+
+ ADD OBJECT 'Clb_valftva' AS clb_tx_simplu WITH ;
+ Anchor = 4, ;
+ Height = 29, ;
+ Left = 591, ;
+ Name = "Clb_valftva", ;
+ TabIndex = 22, ;
+ TabStop = .F., ;
+ Tag = "MOVABLE", ;
+ Top = 431, ;
+ Width = 205, ;
+ ZOrderSet = 15, ;
+ Text_simplu1.Alignment = 3, ;
+ Text_simplu1.Format = "R", ;
+ Text_simplu1.Height = 23, ;
+ Text_simplu1.InputMask = (get_mask(12,gnPc)), ;
+ Text_simplu1.Left = 90, ;
+ Text_simplu1.Name = "Text_simplu1", ;
+ Text_simplu1.ReadOnly = .T., ;
+ Text_simplu1.Top = 3, ;
+ Text_simplu1.Value = 0, ;
+ Text_simplu1.Width = 110, ;
+ Lb_simplu1.Caption = "Total fara TVA", ;
+ Lb_simplu1.Left = 6, ;
+ Lb_simplu1.Name = "Lb_simplu1"
*< END OBJECT: ClassLib="..\comun\clase\lb_tx.vcx" BaseClass="container" />
ADD OBJECT 'Cmd_cauta1' AS cmd_cauta WITH ;
+ Anchor = 8, ;
Height = 27, ;
- Left = 678, ;
+ Left = 725, ;
Name = "Cmd_cauta1", ;
TabIndex = 9, ;
Tag = "MOVABLE,NOVERTICAL_MOVE", ;
@@ -17051,8 +17828,9 @@ DEFINE CLASS frm_viz_facturi AS _frmbase OF "..\comun\clase\_frm_base.vcx"
*< END OBJECT: ClassLib="..\comun\clase\cmd_butoane.vcx" BaseClass="commandbutton" />
ADD OBJECT 'Cmd_reset1' AS cmd_reset WITH ;
+ Anchor = 8, ;
Height = 27, ;
- Left = 678, ;
+ Left = 725, ;
Name = "Cmd_reset1", ;
TabIndex = 13, ;
Tag = "MOVABLE,NOVERTICAL_MOVE", ;
@@ -17062,7 +17840,8 @@ DEFINE CLASS frm_viz_facturi AS _frmbase OF "..\comun\clase\_frm_base.vcx"
*< END OBJECT: ClassLib="..\comun\clase\cmd_butoane.vcx" BaseClass="commandbutton" />
ADD OBJECT 'grdfacturi' AS _grdrow WITH ;
- ColumnCount = 12, ;
+ Anchor = 15, ;
+ ColumnCount = 17, ;
DeleteMark = .F., ;
FontSize = 10, ;
Height = 384, ;
@@ -17074,7 +17853,7 @@ DEFINE CLASS frm_viz_facturi AS _frmbase OF "..\comun\clase\_frm_base.vcx"
TabIndex = 10, ;
Tag = "RESIZABLE", ;
Top = 36, ;
- Width = 665, ;
+ Width = 706, ;
ZOrderSet = 2, ;
Column1.ColumnOrder = 4, ;
Column1.ControlSource = "nrord", ;
@@ -17151,7 +17930,47 @@ DEFINE CLASS frm_viz_facturi AS _frmbase OF "..\comun\clase\_frm_base.vcx"
Column12.FontName = "Arial", ;
Column12.FontSize = 10, ;
Column12.Name = "cPartRef", ;
- Column12.Width = 95
+ Column12.Width = 95, ;
+ Column13.ControlSource = "ore_manopera", ;
+ Column13.FontName = "Arial", ;
+ Column13.FontSize = 10, ;
+ Column13.Format = "R", ;
+ Column13.InputMask = (get_mask(12,gnPc)), ;
+ Column13.Name = "cOreManopera", ;
+ Column13.ReadOnly = .T., ;
+ Column13.Width = 86, ;
+ Column14.ControlSource = "val_manopera", ;
+ Column14.FontName = "Arial", ;
+ Column14.FontSize = 10, ;
+ Column14.Format = "R", ;
+ Column14.InputMask = (get_mask(12,gnPc)), ;
+ Column14.Name = "cValManopera", ;
+ Column14.ReadOnly = .T., ;
+ Column14.Width = 109, ;
+ Column15.ControlSource = "val_materiale_ach", ;
+ Column15.FontName = "Arial", ;
+ Column15.FontSize = 10, ;
+ Column15.Format = "R", ;
+ Column15.InputMask = (get_mask(12,gnPc)), ;
+ Column15.Name = "cValMaterialeAch", ;
+ Column15.ReadOnly = .T., ;
+ Column15.Width = 157, ;
+ Column16.ControlSource = "val_materiale_vz", ;
+ Column16.FontName = "Arial", ;
+ Column16.FontSize = 10, ;
+ Column16.Format = "R", ;
+ Column16.InputMask = (get_mask(12,gnPc)), ;
+ Column16.Name = "cValMaterialeVz", ;
+ Column16.ReadOnly = .T., ;
+ Column16.Width = 153, ;
+ Column17.ControlSource = "valftva", ;
+ Column17.FontName = "Arial", ;
+ Column17.FontSize = 10, ;
+ Column17.Format = "R", ;
+ Column17.InputMask = (get_mask(12,gnPc)), ;
+ Column17.Name = "cValftva", ;
+ Column17.ReadOnly = .T., ;
+ Column17.Width = 95
*< END OBJECT: ClassLib="..\comun\clase\_grd_base.vcx" BaseClass="grid" />
ADD OBJECT 'grdfacturi.cAsigurator.Header1' AS header WITH ;
@@ -17344,6 +18163,26 @@ DEFINE CLASS frm_viz_facturi AS _frmbase OF "..\comun\clase\_frm_base.vcx"
SelectedBackColor = 100,185,255
*< END OBJECT: BaseClass="textbox" />
+ ADD OBJECT 'grdfacturi.cOreManopera.Header1' AS header WITH ;
+ Alignment = 2, ;
+ Caption = "Ore manopera", ;
+ FontName = "Arial", ;
+ FontSize = 10, ;
+ Name = "Header1"
+ *< END OBJECT: BaseClass="header" />
+
+ ADD OBJECT 'grdfacturi.cOreManopera.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 'grdfacturi.cPartRef.Header1' AS header WITH ;
Alignment = 2, ;
Caption = "Referinta", ;
@@ -17382,18 +18221,92 @@ DEFINE CLASS frm_viz_facturi AS _frmbase OF "..\comun\clase\_frm_base.vcx"
SelectedBackColor = 100,185,255
*< END OBJECT: BaseClass="textbox" />
+ ADD OBJECT 'grdfacturi.cValftva.Header1' AS header WITH ;
+ Alignment = 2, ;
+ Caption = "Valoare fara TVA", ;
+ FontName = "Arial", ;
+ FontSize = 10, ;
+ Name = "Header1"
+ *< END OBJECT: BaseClass="header" />
+
+ ADD OBJECT 'grdfacturi.cValftva.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 'grdfacturi.cValManopera.Header1' AS header WITH ;
+ Alignment = 2, ;
+ Caption = "Valoare manopera", ;
+ FontName = "Arial", ;
+ FontSize = 10, ;
+ Name = "Header1"
+ *< END OBJECT: BaseClass="header" />
+
+ ADD OBJECT 'grdfacturi.cValManopera.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 'grdfacturi.cValMaterialeAch.Header1' AS header WITH ;
+ Alignment = 2, ;
+ Caption = "Valoare materiale achizitie", ;
+ FontName = "Arial", ;
+ FontSize = 10, ;
+ Name = "Header1"
+ *< END OBJECT: BaseClass="header" />
+
+ ADD OBJECT 'grdfacturi.cValMaterialeAch.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 'grdfacturi.cValMaterialeVz.Header1' AS header WITH ;
+ Alignment = 2, ;
+ Caption = "Valoare materiale vanzare", ;
+ FontName = "Arial", ;
+ FontSize = 10, ;
+ Name = "Header1"
+ *< END OBJECT: BaseClass="header" />
+
+ ADD OBJECT 'grdfacturi.cValMaterialeVz.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 'Gridextra1' AS gridextra WITH ;
gridexpression = Thisform.grdFacturi, ;
Left = 684, ;
Name = "Gridextra1", ;
Top = 396
*< END OBJECT: ClassLib="..\comun\utile\gridextras\gridextras.vcx" BaseClass="custom" />
-
- ADD OBJECT 'Xresize1' AS xresize WITH ;
- Left = 778, ;
- Name = "Xresize1", ;
- Top = 480
- *< END OBJECT: ClassLib="..\comun\clase\xresize.vcx" BaseClass="custom" />
PROCEDURE actualizeaza_grid1
Parameters tcFiltru
@@ -17612,16 +18525,24 @@ DEFINE CLASS frm_viz_facturi AS _frmbase OF "..\comun\clase\_frm_base.vcx"
If Used('crstotal')
Use In crstotal
Endif
- Select Sum(valctva) As svalctva From crsfacturi ;
+ Select Sum(valctva) As svalctva, Sum(valftva) As svalftva From crsfacturi ;
into Cursor crstotal
Select crstotal
Thisform.clb_valctva.text_simplu1.Value=svalctva
+ Thisform.clb_valftva.text_simplu1.Value=svalftva
Use In crstotal
- Select Sum(manopera) As smanopera,Sum(materiale) As smateriale From crsfacturi WHERE nrcrt=1;
+ Select Sum(manopera) As smanopera,Sum(materiale) As smateriale,;
+ Sum(Nvl(ore_manopera,0)) As soremanopera,Sum(Nvl(val_manopera,0)) As svalmanopera,;
+ Sum(Nvl(val_materiale_ach,0)) As svalmatach,Sum(Nvl(val_materiale_vz,0)) As svalmatvz ;
+ From crsfacturi WHERE nrcrt=1;
into Cursor crstotal
Thisform.clb_manopera.text_simplu1.Value=smanopera
Thisform.clb_materiale.text_simplu1.Value=smateriale
+ Thisform.clb_ore_manopera.text_simplu1.Value=soremanopera
+ Thisform.clb_val_manopera.text_simplu1.Value=svalmanopera
+ Thisform.clb_val_mat_ach.text_simplu1.Value=svalmatach
+ Thisform.clb_val_mat_vz.text_simplu1.Value=svalmatvz
Use In crstotal
Thisform.grdfacturi.SetFocus()
@@ -17629,6 +18550,11 @@ DEFINE CLASS frm_viz_facturi AS _frmbase OF "..\comun\clase\_frm_base.vcx"
Thisform.clb_manopera.text_simplu1.Value=0.000
Thisform.clb_materiale.text_simplu1.Value=0.000
Thisform.clb_valctva.text_simplu1.Value=0.000
+ Thisform.clb_valftva.text_simplu1.Value=0.000
+ Thisform.clb_ore_manopera.text_simplu1.Value=0.000
+ Thisform.clb_val_manopera.text_simplu1.Value=0.000
+ Thisform.clb_val_mat_ach.text_simplu1.Value=0.000
+ Thisform.clb_val_mat_vz.text_simplu1.Value=0.000
Endif
ENDPROC
diff --git a/Programe/oproceduri_vizualizare.prg b/Programe/oproceduri_vizualizare.prg
index 879e702..b41c663 100644
--- a/Programe/oproceduri_vizualizare.prg
+++ b/Programe/oproceduri_vizualizare.prg
@@ -232,7 +232,8 @@ Procedure vizualizare_facturi
Private pcselect,pcschema,pcfiltru,pcorder,pofacturi,llAfiseaza
Store '' To pofacturi
pcschema=['NRCRT n(5),ID_LUCRARE N(20),NRORD C(50),DATAI d,NUME c(50),TELEFON C(50),MANOPERA n(20,4),MATERIALE n(20,4),MANOPERA_DEVIZ n(20,4), MATERIALE_DEVIZ n(20,4),'+]+;
- ['ASIGURATOR c(24),INSPECTOR c(24),NR_DOSAR c(40),NRINMAT c(35),NRACT n(14),DATAACT d,VALCTVA n(19,2), ID_PART_REF N(20), PART_REF C(100)']
+ ['ASIGURATOR c(24),INSPECTOR c(24),NR_DOSAR c(40),NRINMAT c(35),NRACT n(14),DATAACT d,VALCTVA n(19,2), ID_PART_REF N(20), PART_REF C(100),'+]+;
+ ['ORE_MANOPERA n(20,4),VAL_MANOPERA n(20,4),VAL_MATERIALE_ACH n(20,4),VAL_MATERIALE_VZ n(20,4),VALFTVA n(19,2)']
pcorder=[a.dataact,a.nract,a.datai,a.nrord]
*!* modificare 27.01
*!* pcselect=['select row_number() over (partition by a.nrord order by ] + pcorder + [) as nrcrt,'+]+;
@@ -241,7 +242,8 @@ pcorder=[a.dataact,a.nract,a.datai,a.nrord]
*!* ['from ] + gcS + [.dev_validare_comenzi a '+]+;
*!* ['where 1=2']
pcselect=['select a.nrcrt,a.id_lucrare,a.nrord,a.datai,a.nume,a.telefon,a.manopera,a.materiale,a.manopera_deviz, a.materiale_deviz, a.asigurator,a.inspector,'+]+;
- ['a.nr_dosar,a.nrinmat,a.nract,a.dataact,a.valctva, a.id_part_ref, a.part_ref '+]+;
+ ['a.nr_dosar,a.nrinmat,a.nract,a.dataact,a.valctva, a.id_part_ref, a.part_ref, '+]+;
+ ['a.ore_manopera, a.val_manopera, a.val_materiale_ach, a.val_materiale_vz, a.manopera + a.materiale as valftva '+]+;
['from auto_facturi_emise a'+]+;
['where 1=2']
@@ -647,17 +649,22 @@ Release pocomenzi
Endproc && validare_comenzi
*****************************************************************************************
Procedure vizualizare_comenzi
+Lparameters tlIstoric
Private pcselect,pcschema,pcfiltru,pcorder,pocomenzi,llAfiseaza
Store '' To pocomenzi
If Used('crscomenzi')
Use In crscomenzi
Endif
pcschema=['ID_ORDL n(10),ID_LUCRARE n(10),DATAI d,NUME c(50),NRORD c(50),NRINMAT c(35),VALIDAT n(1),ID_TIP N(5),TIP_COMANDA c(50),DATAORAVALID D,'+] +;
- ['FACTURAT n(1),DATAFACT d,NRFACT N(14),PROC_TVAV N(10,4), ID_PART_REF N(20), PART_REF C(100), SERIES V(100), KMINT I, ORE_FUNCTIONARE I']
+ ['FACTURAT n(1),DATAFACT d,NRFACT N(14),PROC_TVAV N(10,4), ID_PART_REF N(20), PART_REF C(100), SERIES V(100), KMINT I, ORE_FUNCTIONARE I,'+] +;
+ ['ORE_MANOPERA N(20,4),VAL_MANOPERA N(20,4),VAL_MANOPERA_FACTURA N(20,4),VAL_MATERIALE_VZ N(20,4),VAL_MATERIALE_ACH N(20,4),VAL_MATERIALE_FACTURA N(20,4),VALFTVA_FACTURA N(20,4),VALCTVA_FACTURA N(20,4),'+] +;
+ ['ASIGURATOR c(40),MARCA c(24),MASINA c(20),INSPECTOR c(40),NR_DOSAR c(40),INCHIS_FORTAT n(1)']
pcselect=['select a.id_ordl,a.id_lucrare,a.datai,a.nume,a.nrord,a.nrinmat,a.validat,a.id_tip,a.tip_comanda,a.dataoravalid,a.facturat,a.datafact,a.nrfact,a.proc_tvav, a.id_part_ref, a.part_ref, '+]+;
- [' a.series, a.kmint, a.ore_functionare '+] + ;
- [' from ] + gcS + [.auto_normare_comenzi a where 1=2']
+ [' a.series, a.kmint, a.ore_functionare, '+] + ;
+ [' a.ore_manopera, a.val_manopera, a.val_manopera_factura, a.val_materiale_vz, a.val_materiale_ach, a.val_materiale_factura, a.val_manopera_factura + a.val_materiale_factura as valftva_factura, a.valctva_factura, '+] + ;
+ [' a.asigurator, a.marca, a.masina, a.inspector, a.nr_dosar, a.inchis_fortat '+] + ;
+ [' from auto_istoric_comenzi a where 1=2']
*!* [' from ] + gcS + [.dev_vvalid_comenzi a where 1=2']
*!* pcfiltru=[luna=]+Alltrim(Str(gnLuna))+[ and an=]+Alltrim(Str(gnAn))
*!* pcfiltru=[(extract(month from datafact) =]+Alltrim(Str(gnLuna))+[ and extract(year from datafact) =]+Alltrim(Str(gnAn))+[) or (datafact is null )]
@@ -669,7 +676,7 @@ llAfiseaza=.F.
gencursor('pocomenzi','crscomenzi',pcselect,pcfiltru,pcschema,pcorder,llAfiseaza)
pocomenzi.ca_baza1.afisare()
-ofrmviz=Createobject('frm_viz_comenzi')
+ofrmviz=Createobject('frm_viz_comenzi', m.tlIstoric)
ofrmviz.Show(1)
If Used('crscomenzi')
Use In crscomenzi
diff --git a/changelog_roaauto.txt b/changelog_roaauto.txt
index 29f1d2c..0d73b3f 100644
--- a/changelog_roaauto.txt
+++ b/changelog_roaauto.txt
@@ -1,3 +1,11 @@
+
+