izmene po zahtevu Nenada Blesica

.gitignore

@@ -8,3 +8,4 @@
 *.ilc
 *.exe
 *.#00
+*.pch

DataModul/OD_DM.dfm

@@ -212,6 +212,9 @@ object DM_OD: TDM_OD
     object cdsSystemODDATUM_OD: TDateField
       FieldName = 'DATUM_OD'
     end
+    object cdsSystemODMAX_PROC: TIntegerField
+      FieldName = 'MAX_PROC'
+    end
   end
   object dsSystemOD: TDataSource
     DataSet = cdsSystemOD

DataModul/OD_DM.h

@@ -360,6 +360,7 @@ __published:	// IDE-managed Components
 	TStringField *cdspodsortaOZNAKA;
 	TIntegerField *cdsMaxBarKodMAX_BR;
 	TDateField *cdsSystemODDATUM_OD;
+	TIntegerField *cdsSystemODMAX_PROC;
 	void __fastcall DataModuleCreate(TObject *Sender);
 private:	// User declarations
 public:		// User declarations

DataModul/OD_DmPretraga.cpp

@@ -15,9 +15,4 @@ __fastcall TOD_DM_Pretraga::TOD_DM_Pretraga(TComponent* Owner)
 {
 }
 //---------------------------------------------------------------------------
-void __fastcall TOD_DM_Pretraga::DataModuleCreate(TObject *Sender)
-{
-
-}
-//---------------------------------------------------------------------------
 

DataModul/OD_DmPretraga.h

@@ -90,7 +90,6 @@ __published:	// IDE-managed Components
 	TStringField *cdsArtikliPretragaJEDMERE;
 	TSmallintField *cdsArtikliPretragaIDJM;
 	TDataSource *dsArtikliPretraga;
-	void __fastcall DataModuleCreate(TObject *Sender);
 private:	// User declarations
 public:		// User declarations
 	__fastcall TOD_DM_Pretraga(TComponent* Owner);

Izvestaji/OD_izv_MAG.cpp

+// ---------------------------------------------------------------------------
+
+#include <vcl.h>
+#pragma hdrstop
+#include "OD_DM.h"
+#include "OD_izv_MAG.h"
+// ---------------------------------------------------------------------------
+#pragma package(smart_init)
+#pragma link "cxContainer"
+#pragma link "cxControls"
+#pragma link "cxDBLookupComboBox"
+#pragma link "cxDBLookupEdit"
+#pragma link "cxDropDownEdit"
+#pragma link "cxEdit"
+#pragma link "cxGraphics"
+#pragma link "cxLabel"
+#pragma link "cxLookAndFeelPainters"
+#pragma link "cxLookAndFeels"
+#pragma link "cxLookupEdit"
+#pragma link "cxMaskEdit"
+#pragma link "cxTextEdit"
+#pragma link "dxSkinBlack"
+#pragma link "dxSkinBlue"
+#pragma link "dxSkinDevExpressDarkStyle"
+#pragma link "dxSkinDevExpressStyle"
+#pragma link "dxSkinFoggy"
+#pragma link "dxSkinOffice2010Black"
+#pragma link "dxSkinOffice2010Blue"
+#pragma link "dxSkinOffice2010Silver"
+#pragma link "dxSkinsCore"
+#pragma link "dxSkinSevenClassic"
+#pragma link "dxSkinVS2010"
+#pragma link "cxButtons"
+#pragma link "cxClasses"
+#pragma link "cxCustomData"
+#pragma link "cxData"
+#pragma link "cxDataStorage"
+#pragma link "cxDBData"
+#pragma link "cxFilter"
+#pragma link "cxGrid"
+#pragma link "cxGridCustomTableView"
+#pragma link "cxGridCustomView"
+#pragma link "cxGridDBTableView"
+#pragma link "cxGridLevel"
+#pragma link "cxGridTableView"
+#pragma link "cxNavigator"
+#pragma link "cxStyles"
+#pragma link "dxSkinscxPCPainter"
+#pragma link "frxClass"
+#pragma link "frxDBSet"
+#pragma resource "*.dfm"
+Tod_izv_blend_mg* od_izv_blend_mg;
+
+// ---------------------------------------------------------------------------
+__fastcall Tod_izv_blend_mg::Tod_izv_blend_mg(TComponent* Owner)
+	:TForm(Owner)
+{
+	cdsBlend->Active = false;
+	cdsBlend->Active = true;
+}
+
+// ---------------------------------------------------------------------------
+void __fastcall Tod_izv_blend_mg::cxButton4Click(TObject* Sender)
+{
+	cdsPregled->Active = false;
+	cdsPregled->Params->ParamByName("ID")->AsInteger = cxBlend->EditingValue;
+	cdsPregled->Active = true;
+}
+
+// ---------------------------------------------------------------------------
+void __fastcall Tod_izv_blend_mg::cxButton5Click(TObject* Sender)
+{
+	frxReport1->ShowReport(true);
+}
+
+// ---------------------------------------------------------------------------
+void __fastcall Tod_izv_blend_mg::FormClose(TObject* Sender, TCloseAction& Action)
+
+{
+	Action = caFree;
+}
+// ---------------------------------------------------------------------------

Izvestaji/OD_izv_MAG.h

+//---------------------------------------------------------------------------
+
+#ifndef OD_izv_MAGH
+#define OD_izv_MAGH
+//---------------------------------------------------------------------------
+#include <System.Classes.hpp>
+#include <Vcl.Controls.hpp>
+#include <Vcl.StdCtrls.hpp>
+#include <Vcl.Forms.hpp>
+#include "cxContainer.hpp"
+#include "cxControls.hpp"
+#include "cxDBLookupComboBox.hpp"
+#include "cxDBLookupEdit.hpp"
+#include "cxDropDownEdit.hpp"
+#include "cxEdit.hpp"
+#include "cxGraphics.hpp"
+#include "cxLabel.hpp"
+#include "cxLookAndFeelPainters.hpp"
+#include "cxLookAndFeels.hpp"
+#include "cxLookupEdit.hpp"
+#include "cxMaskEdit.hpp"
+#include "cxTextEdit.hpp"
+#include "dxSkinBlack.hpp"
+#include "dxSkinBlue.hpp"
+#include "dxSkinDevExpressDarkStyle.hpp"
+#include "dxSkinDevExpressStyle.hpp"
+#include "dxSkinFoggy.hpp"
+#include "dxSkinOffice2010Black.hpp"
+#include "dxSkinOffice2010Blue.hpp"
+#include "dxSkinOffice2010Silver.hpp"
+#include "dxSkinsCore.hpp"
+#include "dxSkinSevenClassic.hpp"
+#include "dxSkinVS2010.hpp"
+#include <Data.DB.hpp>
+#include <Data.FMTBcd.hpp>
+#include <Data.SqlExpr.hpp>
+#include <Datasnap.DBClient.hpp>
+#include <Datasnap.Provider.hpp>
+#include <Vcl.ExtCtrls.hpp>
+#include "cxButtons.hpp"
+#include <Vcl.Menus.hpp>
+#include "cxClasses.hpp"
+#include "cxCustomData.hpp"
+#include "cxData.hpp"
+#include "cxDataStorage.hpp"
+#include "cxDBData.hpp"
+#include "cxFilter.hpp"
+#include "cxGrid.hpp"
+#include "cxGridCustomTableView.hpp"
+#include "cxGridCustomView.hpp"
+#include "cxGridDBTableView.hpp"
+#include "cxGridLevel.hpp"
+#include "cxGridTableView.hpp"
+#include "cxNavigator.hpp"
+#include "cxStyles.hpp"
+#include "dxSkinscxPCPainter.hpp"
+#include "frxClass.hpp"
+#include "frxDBSet.hpp"
+//---------------------------------------------------------------------------
+class Tod_izv_blend_mg : public TForm
+{
+__published:	// IDE-managed Components
+	TSQLDataSet *dsetBlend;
+	TDataSetProvider *dspBlend;
+	TClientDataSet *cdsBlend;
+	TIntegerField *cdsBlendID;
+	TStringField *cdsBlendOPIS;
+	TStringField *cdsBlendBATCH_NO;
+	TStringField *cdsBlendORDER_NO;
+	TIntegerField *cdsBlendBERBA;
+	TDateField *cdsBlendVAZI_OD;
+	TIntegerField *cdsBlendBROJ_BLENDA;
+	TDateField *cdsBlendDATUM;
+	TStringField *cdsBlendSMENA;
+	TSmallintField *cdsBlendAKTIVAN;
+	TStringField *cdsBlendNAPOMENA;
+	TIntegerField *cdsBlendSIFRA_RADNIKA;
+	TFloatField *cdsBlendUKUPNO_BALA;
+	TIntegerField *cdsBlendIDBLENDA;
+	TIntegerField *cdsBlendBROJ_BL_KOOPERANTA;
+	TFloatField *cdsBlendBROJ_BALA_GRUPE;
+	TIntegerField *cdsBlendIDGRUPE;
+	TFloatField *cdsBlendBROJ_KOOPER_GRUPE;
+	TSmallintField *cdsBlendPROV_POREKLA;
+	TDataSource *dsBlend;
+	TPanel *Panel1;
+	TcxLabel *cxLabel2;
+	TcxLookupComboBox *cxBlend;
+	TcxButton *cxButton4;
+	TSQLDataSet *sqlPregled;
+	TDataSetProvider *dspPregled;
+	TClientDataSet *cdsPregled;
+	TDataSource *dsPregled;
+	TcxGrid *cxGrid1;
+	TcxGridDBTableView *cxGrid1DBTableView1;
+	TcxGridLevel *cxGrid1Level1;
+	TStringField *cdsPregledGRADE;
+	TFMTBCDField *cdsPregledMAGACIN_UKUPNO;
+	TStringField *cdsPregledOPIS;
+	TStringField *cdsPregledINT_KLASA;
+	TFMTBCDField *cdsPregledMAGACIN_KG;
+	TcxGridDBColumn *cxGrid1DBTableView1GRADE;
+	TcxGridDBColumn *cxGrid1DBTableView1MAGACIN_UKUPNO;
+	TcxGridDBColumn *cxGrid1DBTableView1INT_KLASA;
+	TcxGridDBColumn *cxGrid1DBTableView1MAGACIN_KG;
+	TfrxDBDataset *frxDBPregled;
+	TfrxReport *frxReport1;
+	TcxButton *cxButton5;
+	void __fastcall cxButton4Click(TObject *Sender);
+	void __fastcall cxButton5Click(TObject *Sender);
+	void __fastcall FormClose(TObject *Sender, TCloseAction &Action);
+private:	// User declarations
+public:		// User declarations
+	__fastcall Tod_izv_blend_mg(TComponent* Owner);
+};
+//---------------------------------------------------------------------------
+extern PACKAGE Tod_izv_blend_mg *od_izv_blend_mg;
+//---------------------------------------------------------------------------
+#endif

Izvestaji/OD_izv_obrada.cpp

+// ---------------------------------------------------------------------------
+
+#include <vcl.h>
+#pragma hdrstop
+
+#include "OD_izv_obrada.h"
+// ---------------------------------------------------------------------------
+#pragma package(smart_init)
+#pragma link "cxCalendar"
+#pragma link "cxContainer"
+#pragma link "cxControls"
+#pragma link "cxDateUtils"
+#pragma link "cxDropDownEdit"
+#pragma link "cxEdit"
+#pragma link "cxGraphics"
+#pragma link "cxLabel"
+#pragma link "cxLookAndFeelPainters"
+#pragma link "cxLookAndFeels"
+#pragma link "cxMaskEdit"
+#pragma link "cxTextEdit"
+#pragma link "dxCore"
+#pragma link "dxSkinBlack"
+#pragma link "dxSkinBlue"
+#pragma link "dxSkinDevExpressDarkStyle"
+#pragma link "dxSkinDevExpressStyle"
+#pragma link "dxSkinFoggy"
+#pragma link "dxSkinOffice2010Black"
+#pragma link "dxSkinOffice2010Blue"
+#pragma link "dxSkinOffice2010Silver"
+#pragma link "dxSkinsCore"
+#pragma link "dxSkinSevenClassic"
+#pragma link "dxSkinVS2010"
+#pragma link "cxButtons"
+#pragma link "frxClass"
+#pragma link "frxDBSet"
+#pragma link "cxClasses"
+#pragma link "cxCustomData"
+#pragma link "cxData"
+#pragma link "cxDataStorage"
+#pragma link "cxDBData"
+#pragma link "cxFilter"
+#pragma link "cxGrid"
+#pragma link "cxGridCustomTableView"
+#pragma link "cxGridCustomView"
+#pragma link "cxGridDBTableView"
+#pragma link "cxGridLevel"
+#pragma link "cxGridTableView"
+#pragma link "cxGroupBox"
+#pragma link "cxNavigator"
+#pragma link "cxScrollBox"
+#pragma link "cxStyles"
+#pragma link "dxSkinscxPCPainter"
+#pragma link "cxDBLookupComboBox"
+#pragma link "cxDBLookupEdit"
+#pragma link "cxLookupEdit"
+#pragma resource "*.dfm"
+Tod_izv_sa_obrd_duvana* od_izv_sa_obrd_duvana;
+
+// ---------------------------------------------------------------------------
+__fastcall Tod_izv_sa_obrd_duvana::Tod_izv_sa_obrd_duvana(TComponent* Owner)
+	:TForm(Owner)
+{
+	cds->Active = false;
+	cds->Active = true;
+}
+
+// ---------------------------------------------------------------------------
+void __fastcall Tod_izv_sa_obrd_duvana::cxButton4Click(TObject* Sender)
+{
+	cdsPregled->Active = false;
+	cdsPregled->Params->ParamByName("OD_DATUMA")->AsDate = od_datuma->Date;
+	cdsPregled->Params->ParamByName("DO_DATUMA")->AsDate = od_datuma->Date;
+	cdsPregled->Params->ParamByName("DEALER")->AsString = cxLookupComboBox1->EditText;
+	cdsPregled->Active = true;
+
+	cdsPrethodno->Active = false;
+	cdsPrethodno->Params->ParamByName("OD_DATUMA")->AsDate = StartOfTheYear(od_datuma->Date);
+	cdsPrethodno->Params->ParamByName("DO_DATUMA")->AsDate = od_datuma->Date - 1;
+	cdsPrethodno->Params->ParamByName("DEALER")->AsString = cxLookupComboBox1->EditText;
+	cdsPrethodno->Active = true;
+
+	cdsUkupno->Active = false;
+	cdsUkupno->Params->ParamByName("OD_DATUMA")->AsDate = StartOfTheYear(od_datuma->Date);
+	cdsUkupno->Params->ParamByName("DO_DATUMA")->AsDate = od_datuma->Date;
+	cdsUkupno->Params->ParamByName("DEALER")->AsString = cxLookupComboBox1->EditText;
+	cdsUkupno->Active = true;
+}
+// ---------------------------------------------------------------------------
+
+void __fastcall Tod_izv_sa_obrd_duvana::cxButton5Click(TObject* Sender)
+{
+	TfrxMemoView* fr1;
+	fr1 = (TfrxMemoView*)frxReport1->FindObject("Memo59");
+	if (fr1 != NULL)
+		fr1->Text = DateToStr(od_datuma->Date);
+
+	TfrxMemoView* fr2;
+	fr2 = (TfrxMemoView*)frxReport1->FindObject("Memo61");
+	if (fr2 != NULL)
+		fr2->Text = cxLookupComboBox1->EditText;
+
+	frxReport1->ShowReport(true);
+}
+// ---------------------------------------------------------------------------
+
+void __fastcall Tod_izv_sa_obrd_duvana::FormClose(TObject* Sender, TCloseAction& Action)
+
+{
+	Action = caFree;
+}
+// ---------------------------------------------------------------------------

Izvestaji/OD_izv_obrada.h

+//---------------------------------------------------------------------------
+
+#ifndef OD_izv_obradaH
+#define OD_izv_obradaH
+//---------------------------------------------------------------------------
+#include <System.Classes.hpp>
+#include <Vcl.Controls.hpp>
+#include <Vcl.StdCtrls.hpp>
+#include <Vcl.Forms.hpp>
+#include "cxCalendar.hpp"
+#include "cxContainer.hpp"
+#include "cxControls.hpp"
+#include "cxDateUtils.hpp"
+#include "cxDropDownEdit.hpp"
+#include "cxEdit.hpp"
+#include "cxGraphics.hpp"
+#include "cxLabel.hpp"
+#include "cxLookAndFeelPainters.hpp"
+#include "cxLookAndFeels.hpp"
+#include "cxMaskEdit.hpp"
+#include "cxTextEdit.hpp"
+#include "dxCore.hpp"
+#include "dxSkinBlack.hpp"
+#include "dxSkinBlue.hpp"
+#include "dxSkinDevExpressDarkStyle.hpp"
+#include "dxSkinDevExpressStyle.hpp"
+#include "dxSkinFoggy.hpp"
+#include "dxSkinOffice2010Black.hpp"
+#include "dxSkinOffice2010Blue.hpp"
+#include "dxSkinOffice2010Silver.hpp"
+#include "dxSkinsCore.hpp"
+#include "dxSkinSevenClassic.hpp"
+#include "dxSkinVS2010.hpp"
+#include <Vcl.ComCtrls.hpp>
+#include <Vcl.ExtCtrls.hpp>
+#include "cxButtons.hpp"
+#include <Vcl.Menus.hpp>
+#include "frxClass.hpp"
+#include "frxDBSet.hpp"
+#include <Data.DB.hpp>
+#include <Data.FMTBcd.hpp>
+#include <Data.SqlExpr.hpp>
+#include <Datasnap.DBClient.hpp>
+#include <Datasnap.Provider.hpp>
+#include "cxClasses.hpp"
+#include "cxCustomData.hpp"
+#include "cxData.hpp"
+#include "cxDataStorage.hpp"
+#include "cxDBData.hpp"
+#include "cxFilter.hpp"
+#include "cxGrid.hpp"
+#include "cxGridCustomTableView.hpp"
+#include "cxGridCustomView.hpp"
+#include "cxGridDBTableView.hpp"
+#include "cxGridLevel.hpp"
+#include "cxGridTableView.hpp"
+#include "cxGroupBox.hpp"
+#include "cxNavigator.hpp"
+#include "cxScrollBox.hpp"
+#include "cxStyles.hpp"
+#include "dxSkinscxPCPainter.hpp"
+#include "cxDBLookupComboBox.hpp"
+#include "cxDBLookupEdit.hpp"
+#include "cxLookupEdit.hpp"
+//---------------------------------------------------------------------------
+class Tod_izv_sa_obrd_duvana : public TForm
+{
+__published:	// IDE-managed Components
+	TPanel *Panel1;
+	TcxLabel *cxLabel13;
+	TcxDateEdit *od_datuma;
+	TcxButton *cxButton4;
+	TcxButton *cxButton5;
+	TSQLDataSet *sqlPregledDanas;
+	TDataSetProvider *dspPregledDanas;
+	TClientDataSet *cdsPregled;
+	TDataSource *dsPregledDanas;
+	TfrxDBDataset *frxDBPregledDanas;
+	TfrxReport *frxReport1;
+	TcxScrollBox *cxScrollBox1;
+	TcxGroupBox *cxGroupBox1;
+	TcxGroupBox *cxGroupBox2;
+	TcxGroupBox *cxGroupBox3;
+	TcxGridDBTableView *cxGrid1DBTableView1;
+	TcxGridLevel *cxGrid1Level1;
+	TcxGrid *cxGrid1;
+	TSQLDataSet *sqlPredhodno;
+	TDataSetProvider *dspPredhodno;
+	TClientDataSet *cdsPrethodno;
+	TDataSource *dsPredhodno;
+	TSQLDataSet *sqlUkupno;
+	TDataSetProvider *dspUkupno;
+	TClientDataSet *cdsUkupno;
+	TDataSource *dsUkupno;
+	TDateField *cdsPregledDATUM;
+	TStringField *cdsPregledGRADE;
+	TStringField *cdsPregledLIST;
+	TFloatField *cdsPregledNETO1;
+	TFloatField *cdsPregledNETO2;
+	TFloatField *cdsPregledNETO;
+	TIntegerField *cdsPregledBROJ_BALA1;
+	TIntegerField *cdsPregledBROJ_BALA2;
+	TIntegerField *cdsPregledLISTID;
+	TIntegerField *cdsPregledBROJ_BALA;
+	TDateField *cdsPrethodnoDATUM;
+	TStringField *cdsPrethodnoGRADE;
+	TStringField *cdsPrethodnoLIST;
+	TFloatField *cdsPrethodnoNETO1;
+	TFloatField *cdsPrethodnoNETO2;
+	TFloatField *cdsPrethodnoNETO;
+	TIntegerField *cdsPrethodnoBROJ_BALA1;
+	TIntegerField *cdsPrethodnoBROJ_BALA2;
+	TIntegerField *cdsPrethodnoLISTID;
+	TIntegerField *cdsPrethodnoBROJ_BALA;
+	TDateField *cdsUkupnoDATUM;
+	TStringField *cdsUkupnoGRADE;
+	TStringField *cdsUkupnoLIST;
+	TFloatField *cdsUkupnoNETO1;
+	TFloatField *cdsUkupnoNETO2;
+	TFloatField *cdsUkupnoNETO;
+	TIntegerField *cdsUkupnoBROJ_BALA1;
+	TIntegerField *cdsUkupnoBROJ_BALA2;
+	TIntegerField *cdsUkupnoLISTID;
+	TIntegerField *cdsUkupnoBROJ_BALA;
+	TcxGridDBColumn *cxGrid1DBTableView1GRADE;
+	TcxGridDBColumn *cxGrid1DBTableView1LIST;
+	TcxGridDBColumn *cxGrid1DBTableView1NETO1;
+	TcxGridDBColumn *cxGrid1DBTableView1NETO2;
+	TcxGridDBColumn *cxGrid1DBTableView1NETO;
+	TcxGridDBColumn *cxGrid1DBTableView1BROJ_BALA1;
+	TcxGridDBColumn *cxGrid1DBTableView1BROJ_BALA2;
+	TcxGridDBColumn *cxGrid1DBTableView1LISTID;
+	TcxGridDBColumn *cxGrid1DBTableView1BROJ_BALA;
+	TcxGrid *cxGrid2;
+	TcxGridDBTableView *cxGridDBTableView1;
+	TcxGridDBColumn *cxGridDBColumn1;
+	TcxGridDBColumn *cxGridDBColumn2;
+	TcxGridDBColumn *cxGridDBColumn3;
+	TcxGridDBColumn *cxGridDBColumn4;
+	TcxGridDBColumn *cxGridDBColumn5;
+	TcxGridDBColumn *cxGridDBColumn6;
+	TcxGridDBColumn *cxGridDBColumn7;
+	TcxGridDBColumn *cxGridDBColumn8;
+	TcxGridDBColumn *cxGridDBColumn9;
+	TcxGridLevel *cxGridLevel1;
+	TcxGrid *cxGrid3;
+	TcxGridDBTableView *cxGridDBTableView2;
+	TcxGridDBColumn *cxGridDBColumn10;
+	TcxGridDBColumn *cxGridDBColumn11;
+	TcxGridDBColumn *cxGridDBColumn12;
+	TcxGridDBColumn *cxGridDBColumn13;
+	TcxGridDBColumn *cxGridDBColumn14;
+	TcxGridDBColumn *cxGridDBColumn15;
+	TcxGridDBColumn *cxGridDBColumn16;
+	TcxGridDBColumn *cxGridDBColumn17;
+	TcxGridDBColumn *cxGridDBColumn18;
+	TcxGridLevel *cxGridLevel2;
+	TfrxDBDataset *frxDBPregledPredhodno;
+	TfrxDBDataset *frxDBPregledUkupno;
+	TSQLDataSet *dset;
+	TDataSetProvider *dsp;
+	TClientDataSet *cds;
+	TIntegerField *cdsID;
+	TStringField *cdsDEALER;
+	TStringField *cdsORIGIN;
+	TIntegerField *cdsBERBA;
+	TFloatField *cdsSTAND_NETO;
+	TFloatField *cdsSTAND_TARA;
+	TSQLTimeStampField *cdsIZMENA;
+	TIntegerField *cdsSIFRA_RADNIKA;
+	TSmallintField *cdsAKTIVAN;
+	TStringField *cdsBC_ORIGIN;
+	TStringField *cdsSUPPLIER;
+	TDataSource *ds;
+	TcxLabel *cxLabel1;
+	TcxLookupComboBox *cxLookupComboBox1;
+	void __fastcall cxButton4Click(TObject *Sender);
+	void __fastcall cxButton5Click(TObject *Sender);
+	void __fastcall FormClose(TObject *Sender, TCloseAction &Action);
+
+
+private:	// User declarations
+public:		// User declarations
+	__fastcall Tod_izv_sa_obrd_duvana(TComponent* Owner);
+};
+//---------------------------------------------------------------------------
+extern PACKAGE Tod_izv_sa_obrd_duvana *od_izv_sa_obrd_duvana;
+//---------------------------------------------------------------------------
+#endif

Izvestaji/OD_izv_ulaza_u_obradu.cpp

@@ -53,6 +53,8 @@
 #pragma link "dxSkinVS2010"
 #pragma link "cxCustomPivotGrid"
 #pragma link "cxDBPivotGrid"
+#pragma link "frxClass"
+#pragma link "frxDBSet"
 #pragma resource "*.dfm"
 TfmObradaPregledUlaza *fmObradaPregledUlaza;
 extern int MAGACIN_BUFFER;
@@ -166,3 +168,10 @@ void __fastcall TfmObradaPregledUlaza::cxButton6Click(TObject *Sender)
 
 
 
+
+void __fastcall TfmObradaPregledUlaza::cxButton8Click(TObject *Sender)
+{
+	 frxReport1->ShowReport(true);
+}
+//---------------------------------------------------------------------------
+

Izvestaji/OD_izv_ulaza_u_obradu.h

@@ -66,6 +66,8 @@
 #include <Vcl.ComCtrls.hpp>
 #include "cxCustomPivotGrid.hpp"
 #include "cxDBPivotGrid.hpp"
+#include "frxClass.hpp"
+#include "frxDBSet.hpp"
 //---------------------------------------------------------------------------
 class TfmObradaPregledUlaza : public TfmOsnovnaPrazna
 {
@@ -174,7 +176,6 @@ __published:	// IDE-managed Components
 	TStringField *cdsPregledBalaKOD;
 	TStringField *cdsPregledBalaBROJ_SERIJE;
 	TStringField *cdsPregledBalaPODSORTA;
-	TStringField *cdsPregledBalaPOREKLO;
 	TIntegerField *cdsPregledBalaBARKOD;
 	TFMTBCDField *cdsPregledBalaBROJ_BALA;
 	TFMTBCDField *cdsPregledBalaTEZINA;
@@ -285,6 +286,11 @@ __published:	// IDE-managed Components
 	TcxGridDBColumn *gtvStavkeBatchAVG_VLAGA;
 	TcxGridDBColumn *gtvStavkeBatchBRUTOMASA;
 	TcxGridDBColumn *gtvStavkeBatchBRUTO_AMBAL;
+	TStringField *cdsPregledBalaINT_MAGACIN;
+	TcxDBPivotGridField *ptObradaDuvanaField23;
+	TcxButton *cxButton8;
+	TfrxDBDataset *frxDBDataset1;
+	TfrxReport *frxReport1;
 	void __fastcall cxButton2Click(TObject *Sender);
 	void __fastcall Excel1Click(TObject *Sender);
 	void __fastcall cdsPregledPoBatchuCalcFields(TDataSet *DataSet);
@@ -294,6 +300,7 @@ __published:	// IDE-managed Components
 	void __fastcall cdsSAPReportCalcFields(TDataSet *DataSet);
 	void __fastcall Kopiraj1Click(TObject *Sender);
 	void __fastcall cxButton6Click(TObject *Sender);
+	void __fastcall cxButton8Click(TObject *Sender);
 private:	// User declarations
 public:		// User declarations
 	__fastcall TfmObradaPregledUlaza(TComponent* Owner);

Izvestaji/OD_reklasirane_bale.cpp

@@ -34,6 +34,22 @@
 #pragma link "cxPC"
 #pragma link "cxStyles"
 #pragma link "cxTextEdit"
+#pragma link "cxDateUtils"
+#pragma link "cxNavigator"
+#pragma link "cxPCdxBarPopupMenu"
+#pragma link "dxCore"
+#pragma link "dxSkinBlack"
+#pragma link "dxSkinBlue"
+#pragma link "dxSkinDevExpressDarkStyle"
+#pragma link "dxSkinDevExpressStyle"
+#pragma link "dxSkinFoggy"
+#pragma link "dxSkinOffice2010Black"
+#pragma link "dxSkinOffice2010Blue"
+#pragma link "dxSkinOffice2010Silver"
+#pragma link "dxSkinsCore"
+#pragma link "dxSkinscxPCPainter"
+#pragma link "dxSkinSevenClassic"
+#pragma link "dxSkinVS2010"
 #pragma resource "*.dfm"
 TfrmReklasiraneBale *frmReklasiraneBale;
 //---------------------------------------------------------------------------

Izvestaji/OD_reklasirane_bale.dfm

@@ -3,8 +3,9 @@ inherited frmReklasiraneBale: TfrmReklasiraneBale
   ClientHeight = 488
   ClientWidth = 922
   OnClose = FormClose
-  ExplicitWidth = 938
-  ExplicitHeight = 526
+  ExplicitTop = -103
+  ExplicitWidth = 930
+  ExplicitHeight = 515
   PixelsPerInch = 96
   TextHeight = 13
   object PC: TcxPageControl [0]
@@ -12,10 +13,11 @@ inherited frmReklasiraneBale: TfrmReklasiraneBale
     Top = 0
     Width = 922
     Height = 488
-    ActivePage = tsPregled
     Align = alClient
-    Style = 9
     TabOrder = 0
+    Properties.ActivePage = tsPregled
+    Properties.CustomButtons.Buttons = <>
+    Properties.Style = 9
     ClientRectBottom = 488
     ClientRectRight = 922
     ClientRectTop = 20
@@ -62,7 +64,9 @@ inherited frmReklasiraneBale: TfrmReklasiraneBale
           Width = 80
           Height = 37
           Caption = 'Pregled'
-          Glyph.Data = {
+          LookAndFeel.Kind = lfOffice11
+          LookAndFeel.NativeStyle = True
+          OptionsImage.Glyph.Data = {
             36030000424D3603000000000000360000002800000010000000100000000100
             18000000000000030000120B0000120B00000000000000000000FF00FF314B62
             AC7D7EFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00
@@ -89,8 +93,6 @@ inherited frmReklasiraneBale: TfrmReklasiraneBale
             FF00FFFF00FFFF00FFFF00FFFF00FF986865BA9587EAD7A4EAD59EE0C097A577
             6CA5776CFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF
             00FFFF00FFA77E70A98073A4786EFF00FFFF00FFFF00FFFF00FF}
-          LookAndFeel.Kind = lfOffice11
-          LookAndFeel.NativeStyle = True
           TabOrder = 4
           OnClick = btnPregledClick
         end
@@ -101,7 +103,8 @@ inherited frmReklasiraneBale: TfrmReklasiraneBale
           Height = 37
           Caption = #352'tampaj'
           Enabled = False
-          Glyph.Data = {
+          LookAndFeel.Kind = lfOffice11
+          OptionsImage.Glyph.Data = {
             36030000424D3603000000000000360000002800000010000000100000000100
             18000000000000030000120B0000120B00000000000000000000FF00FFFF00FF
             FF00FFFF00FF6C6A6A6C6A6AFF00FFFF00FF6C6A6A6C6A6AFF00FFFF00FFFF00
@@ -128,7 +131,6 @@ inherited frmReklasiraneBale: TfrmReklasiraneBale
             BD8281BD8281BD8281FBEFE2FBE3CFFBDDC2BD8281FF00FFFF00FFFF00FFFF00
             FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFBD8281BD8281BD
             8281FF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FF}
-          LookAndFeel.Kind = lfOffice11
           TabOrder = 5
         end
       end
@@ -141,7 +143,7 @@ inherited frmReklasiraneBale: TfrmReklasiraneBale
         PopupMenu = PopupMenu1
         TabOrder = 1
         object grdPregledDBTableView1: TcxGridDBTableView
-          NavigatorButtons.ConfirmDelete = False
+          Navigator.Buttons.CustomButtons = <>
           DataController.DataSource = dsReklasiraneBale
           DataController.Summary.DefaultGroupSummaryItems = <
             item
@@ -152,6 +154,14 @@ inherited frmReklasiraneBale: TfrmReklasiraneBale
             item
               Kind = skCount
               Column = grdPregledDBTableView1BARKOD
+            end
+            item
+              Kind = skSum
+              Column = grdPregledDBTableView1BRUTOMASA
+            end
+            item
+              Kind = skSum
+              Column = grdPregledDBTableView1NETOMASA
             end>
           DataController.Summary.SummaryGroups = <>
           OptionsCustomize.ColumnsQuickCustomization = True
@@ -203,6 +213,14 @@ inherited frmReklasiraneBale: TfrmReklasiraneBale
             HeaderAlignmentHorz = taCenter
             Width = 110
           end
+          object grdPregledDBTableView1BRUTOMASA: TcxGridDBColumn
+            Caption = 'Brutomasa'
+            DataBinding.FieldName = 'BRUTOMASA'
+          end
+          object grdPregledDBTableView1NETOMASA: TcxGridDBColumn
+            Caption = 'Netomasa'
+            DataBinding.FieldName = 'NETOMASA'
+          end
           object grdPregledDBTableView1VLAGA: TcxGridDBColumn
             Caption = 'Vlaga %'
             DataBinding.FieldName = 'VLAGA'
@@ -279,6 +297,16 @@ inherited frmReklasiraneBale: TfrmReklasiraneBale
     object cdsReklasiraneBaleVREME: TSQLTimeStampField
       FieldName = 'VREME'
     end
+    object cdsReklasiraneBaleBRUTOMASA: TFMTBCDField
+      FieldName = 'BRUTOMASA'
+      Precision = 18
+      Size = 2
+    end
+    object cdsReklasiraneBaleNETOMASA: TFMTBCDField
+      FieldName = 'NETOMASA'
+      Precision = 18
+      Size = 2
+    end
   end
   object dspReklasiraneBale: TDataSetProvider
     DataSet = sqlReklasiraneBale
@@ -291,27 +319,25 @@ inherited frmReklasiraneBale: TfrmReklasiraneBale
       'select r.barkod,'#13#10'       r.klasaid_old,'#13#10'       r.klasaid_new,'#13#10 +
       '       r.vreme,'#13#10'       m1.oznaka as klasa_old,'#13#10'       m2.oznak' +
       'a as klasa_new,'#13#10'       b.kooperantid,'#13#10'       b.vlaga,'#13#10'       ' +
-      'b.prasina,'#13#10'       k.komitent'#13#10'from tbala_reklas r inner join ts' +
-      'istemmagacin m1 on m1.magacinid=r.klasaid_old'#13#10'                 ' +
-      '   inner join tsistemmagacin m2 on m2.magacinid=r.klasaid_new'#13#10' ' +
-      '                   inner join tbala_mg b ON b.barkod=r.barkod an' +
-      'd b.obrisano=0'#13#10'                    inner join tblkomitenti k ON' +
-      ' k.sifra_komitenta=b.kooperantid '#13#10'where cast(r.vreme as date) b' +
-      'etween :od_datuma and :do_datuma '#13#10'order by k.komitent'
-    DbxCommandType = 'Dbx.SQL'
+      'b.prasina,'#13#10'       k.komitent,'#13#10'       b.brutomasa,'#13#10'       b.ne' +
+      'tomasa'#13#10'from tbala_reklas r inner join tsistemmagacin m1 on m1.m' +
+      'agacinid=r.klasaid_old'#13#10'                    inner join tsistemma' +
+      'gacin m2 on m2.magacinid=r.klasaid_new'#13#10'                    inne' +
+      'r join tbala_mg b ON b.barkod=r.barkod and b.obrisano=0'#13#10'       ' +
+      '             inner join tblkomitenti k ON k.sifra_komitenta=b.ko' +
+      'operantid '#13#10'where cast(r.vreme as date) between :od_datuma and :' +
+      'do_datuma '#13#10'order by k.komitent'
     MaxBlobSize = -1
     Params = <
       item
         DataType = ftDate
         Name = 'od_datuma'
         ParamType = ptInput
-        Value = 41275d
       end
       item
         DataType = ftDate
         Name = 'do_datuma'
         ParamType = ptInput
-        Value = 41275d
       end>
     SQLConnection = DM_OD.SC_OD
     Left = 25

Izvestaji/OD_reklasirane_bale.h

@@ -43,6 +43,23 @@
 #include <SqlExpr.hpp>
 #include <Dialogs.hpp>
 #include "cxGridExportLink.hpp"
+#include "cxDateUtils.hpp"
+#include "cxNavigator.hpp"
+#include "cxPCdxBarPopupMenu.hpp"
+#include "dxCore.hpp"
+#include "dxSkinBlack.hpp"
+#include "dxSkinBlue.hpp"
+#include "dxSkinDevExpressDarkStyle.hpp"
+#include "dxSkinDevExpressStyle.hpp"
+#include "dxSkinFoggy.hpp"
+#include "dxSkinOffice2010Black.hpp"
+#include "dxSkinOffice2010Blue.hpp"
+#include "dxSkinOffice2010Silver.hpp"
+#include "dxSkinsCore.hpp"
+#include "dxSkinscxPCPainter.hpp"
+#include "dxSkinSevenClassic.hpp"
+#include "dxSkinVS2010.hpp"
+#include <Vcl.ComCtrls.hpp>
 //---------------------------------------------------------------------------
 class TfrmReklasiraneBale : public TfmOsnovna_prazna
 {
@@ -87,6 +104,10 @@ __published:	// IDE-managed Components
 	TStringField *cdsReklasiraneBaleBARKOD;
 	TSQLTimeStampField *cdsReklasiraneBaleVREME;
 	TcxGridDBColumn *grdPregledDBTableView1VREME;
+	TFMTBCDField *cdsReklasiraneBaleBRUTOMASA;
+	TFMTBCDField *cdsReklasiraneBaleNETOMASA;
+	TcxGridDBColumn *grdPregledDBTableView1BRUTOMASA;
+	TcxGridDBColumn *grdPregledDBTableView1NETOMASA;
 	void __fastcall btnPregledClick(TObject *Sender);
 	void __fastcall Excel1Click(TObject *Sender);
 	void __fastcall FormClose(TObject *Sender, TCloseAction &Action);

Izvestaji/od_statisika_potrosnje.cpp

+// ---------------------------------------------------------------------------
+
+#include <vcl.h>
+#pragma hdrstop
+
+#include "od_statisika_potrosnje.h"
+// ---------------------------------------------------------------------------
+#pragma package(smart_init)
+#pragma link "cxButtons"
+#pragma link "cxClasses"
+#pragma link "cxContainer"
+#pragma link "cxControls"
+#pragma link "cxCustomData"
+#pragma link "cxData"
+#pragma link "cxDataStorage"
+#pragma link "cxDBData"
+#pragma link "cxDBLookupComboBox"
+#pragma link "cxDBLookupEdit"
+#pragma link "cxDropDownEdit"
+#pragma link "cxEdit"
+#pragma link "cxFilter"
+#pragma link "cxGraphics"
+#pragma link "cxGrid"
+#pragma link "cxGridCustomTableView"
+#pragma link "cxGridCustomView"
+#pragma link "cxGridDBTableView"
+#pragma link "cxGridLevel"
+#pragma link "cxGridTableView"
+#pragma link "cxLabel"
+#pragma link "cxLookAndFeelPainters"
+#pragma link "cxLookAndFeels"
+#pragma link "cxLookupEdit"
+#pragma link "cxMaskEdit"
+#pragma link "cxNavigator"
+#pragma link "cxStyles"
+#pragma link "cxTextEdit"
+#pragma link "dxSkinBlack"
+#pragma link "dxSkinBlue"
+#pragma link "dxSkinDevExpressDarkStyle"
+#pragma link "dxSkinDevExpressStyle"
+#pragma link "dxSkinFoggy"
+#pragma link "dxSkinOffice2010Black"
+#pragma link "dxSkinOffice2010Blue"
+#pragma link "dxSkinOffice2010Silver"
+#pragma link "dxSkinsCore"
+#pragma link "dxSkinscxPCPainter"
+#pragma link "dxSkinSevenClassic"
+#pragma link "dxSkinVS2010"
+#pragma link "frxClass"
+#pragma link "frxDBSet"
+#pragma resource "*.dfm"
+Tod_potrosanja_kg* od_potrosanja_kg;
+
+// ---------------------------------------------------------------------------
+__fastcall Tod_potrosanja_kg::Tod_potrosanja_kg(TComponent* Owner)
+	:TForm(Owner)
+{
+	cdsBlend->Active = false;
+	cdsBlend->Active = true;
+}
+
+// ---------------------------------------------------------------------------
+void __fastcall Tod_potrosanja_kg::cxButton4Click(TObject* Sender)
+{
+	cdsPregled->Active = false;
+	cdsPregled->Params->ParamByName("ID")->AsInteger = cxBlend->EditingValue;
+	cdsPregled->Active = true;
+}
+
+// ---------------------------------------------------------------------------
+void __fastcall Tod_potrosanja_kg::cxButton5Click(TObject* Sender)
+{
+	frxReport1->ShowReport(true);
+}
+// ---------------------------------------------------------------------------
+
+void __fastcall Tod_potrosanja_kg::FormClose(TObject* Sender, TCloseAction& Action)
+{
+	Action = caFree;
+}
+// ---------------------------------------------------------------------------

Izvestaji/od_statisika_potrosnje.h

+//---------------------------------------------------------------------------
+
+#ifndef od_statisika_potrosnjeH
+#define od_statisika_potrosnjeH
+//---------------------------------------------------------------------------
+#include <System.Classes.hpp>
+#include <Vcl.Controls.hpp>
+#include <Vcl.StdCtrls.hpp>
+#include <Vcl.Forms.hpp>
+#include "cxButtons.hpp"
+#include "cxClasses.hpp"
+#include "cxContainer.hpp"
+#include "cxControls.hpp"
+#include "cxCustomData.hpp"
+#include "cxData.hpp"
+#include "cxDataStorage.hpp"
+#include "cxDBData.hpp"
+#include "cxDBLookupComboBox.hpp"
+#include "cxDBLookupEdit.hpp"
+#include "cxDropDownEdit.hpp"
+#include "cxEdit.hpp"
+#include "cxFilter.hpp"
+#include "cxGraphics.hpp"
+#include "cxGrid.hpp"
+#include "cxGridCustomTableView.hpp"
+#include "cxGridCustomView.hpp"
+#include "cxGridDBTableView.hpp"
+#include "cxGridLevel.hpp"
+#include "cxGridTableView.hpp"
+#include "cxLabel.hpp"
+#include "cxLookAndFeelPainters.hpp"
+#include "cxLookAndFeels.hpp"
+#include "cxLookupEdit.hpp"
+#include "cxMaskEdit.hpp"
+#include "cxNavigator.hpp"
+#include "cxStyles.hpp"
+#include "cxTextEdit.hpp"
+#include "dxSkinBlack.hpp"
+#include "dxSkinBlue.hpp"
+#include "dxSkinDevExpressDarkStyle.hpp"
+#include "dxSkinDevExpressStyle.hpp"
+#include "dxSkinFoggy.hpp"
+#include "dxSkinOffice2010Black.hpp"
+#include "dxSkinOffice2010Blue.hpp"
+#include "dxSkinOffice2010Silver.hpp"
+#include "dxSkinsCore.hpp"
+#include "dxSkinscxPCPainter.hpp"
+#include "dxSkinSevenClassic.hpp"
+#include "dxSkinVS2010.hpp"
+#include "frxClass.hpp"
+#include "frxDBSet.hpp"
+#include <Data.DB.hpp>
+#include <Data.FMTBcd.hpp>
+#include <Data.SqlExpr.hpp>
+#include <Datasnap.DBClient.hpp>
+#include <Datasnap.Provider.hpp>
+#include <Vcl.ExtCtrls.hpp>
+#include <Vcl.Menus.hpp>
+//---------------------------------------------------------------------------
+class Tod_potrosanja_kg : public TForm
+{
+__published:	// IDE-managed Components
+	TSQLDataSet *dsetBlend;
+	TDataSetProvider *dspBlend;
+	TClientDataSet *cdsBlend;
+	TIntegerField *cdsBlendID;
+	TStringField *cdsBlendOPIS;
+	TStringField *cdsBlendBATCH_NO;
+	TStringField *cdsBlendORDER_NO;
+	TIntegerField *cdsBlendBERBA;
+	TDateField *cdsBlendVAZI_OD;
+	TIntegerField *cdsBlendBROJ_BLENDA;
+	TDateField *cdsBlendDATUM;
+	TStringField *cdsBlendSMENA;
+	TSmallintField *cdsBlendAKTIVAN;
+	TStringField *cdsBlendNAPOMENA;
+	TIntegerField *cdsBlendSIFRA_RADNIKA;
+	TFloatField *cdsBlendUKUPNO_BALA;
+	TIntegerField *cdsBlendIDBLENDA;
+	TIntegerField *cdsBlendBROJ_BL_KOOPERANTA;
+	TFloatField *cdsBlendBROJ_BALA_GRUPE;
+	TIntegerField *cdsBlendIDGRUPE;
+	TFloatField *cdsBlendBROJ_KOOPER_GRUPE;
+	TSmallintField *cdsBlendPROV_POREKLA;
+	TDataSource *dsBlend;
+	TPanel *Panel1;
+	TcxLabel *cxLabel2;
+	TcxLookupComboBox *cxBlend;
+	TcxButton *cxButton4;
+	TcxButton *cxButton5;
+	TSQLDataSet *sqlPregled;
+	TDataSetProvider *dspPregled;
+	TClientDataSet *cdsPregled;
+	TStringField *cdsPregledGRADE;
+	TFMTBCDField *cdsPregledMAGACIN_UKUPNO;
+	TStringField *cdsPregledOPIS;
+	TStringField *cdsPregledINT_KLASA;
+	TFMTBCDField *cdsPregledMAGACIN_KG;
+	TDataSource *dsPregled;
+	TcxGrid *cxGrid1;
+	TcxGridDBTableView *cxGrid1DBTableView1;
+	TcxGridDBColumn *cxGrid1DBTableView1GRADE;
+	TcxGridDBColumn *cxGrid1DBTableView1MAGACIN_UKUPNO;
+	TcxGridDBColumn *cxGrid1DBTableView1INT_KLASA;
+	TcxGridDBColumn *cxGrid1DBTableView1MAGACIN_KG;
+	TcxGridLevel *cxGrid1Level1;
+	TfrxDBDataset *frxDBPregled;
+	TfrxReport *frxReport1;
+	TFMTBCDField *cdsPregledIZLAZ_KG;
+	TFMTBCDField *cdsPregledULAZ_KG;
+	TcxGridDBColumn *cxGrid1DBTableView1OPIS;
+	TcxGridDBColumn *cxGrid1DBTableView1IZLAZ_KG;
+	TcxGridDBColumn *cxGrid1DBTableView1ULAZ_KG;
+	void __fastcall cxButton4Click(TObject *Sender);
+	void __fastcall cxButton5Click(TObject *Sender);
+	void __fastcall FormClose(TObject *Sender, TCloseAction &Action);
+private:	// User declarations
+public:		// User declarations
+	__fastcall Tod_potrosanja_kg(TComponent* Owner);
+};
+//---------------------------------------------------------------------------
+extern PACKAGE Tod_potrosanja_kg *od_potrosanja_kg;
+//---------------------------------------------------------------------------
+#endif