Zbiór zmian 900 dla trunk

Data:

2009-11-26 10:12:15 (16 years ago)

Autor:

sylwek

Opis:

Re #228 Filtrowanie raportów prowizyjnych + poprawka przypisywania modułów do pojedynczych grzbietów

Lokalizacja:

trunk

Pliki:

• BazaReklam/Classes/DbUtils.cs (zmodyfikowane) (2 diffs)
• BazaReklam/ClientsForm.cs (zmodyfikowane) (1 diff)
• BazaReklam/OrderDetails.cs (zmodyfikowane) (1 diff)
• BazaReklam/ProvisionForm.Designer.cs (zmodyfikowane) (20 diffs)
• BazaReklam/ProvisionForm.cs (zmodyfikowane) (1 diff)
• BazaReklam/ProvisionForm.resx (zmodyfikowane) (3 diffs)
• BazaReklam/ReportsForm.cs (zmodyfikowane) (7 diffs)
• BazaReklam/ZamowieniaForm.Designer.cs (zmodyfikowane) (9 diffs)
• BazaReklam/ZamowieniaForm.resx (zmodyfikowane) (4 diffs)
• RaportySQL/BAZA_REKLAM.rds (zmodyfikowane) (1 diff)
• RaportySQL/OcenaAgenta.rdl (zmodyfikowane) (4 diffs)
• RaportySQL/OcenaAgenta.rdl.data (zmodyfikowane) (poprzedni)
• RaportySQL/RaportySQL.rptproj (zmodyfikowane) (1 diff)
• RaportySQL/RozliczenieWplywowWgDatyWplaty2009.rdl (zmodyfikowane) (1 diff)
• RaportySQL/RozliczenieWplywowWgDatyWplaty2009.rdl.data (zmodyfikowane) (poprzedni)
• RaportySQL/SprzedazReklam2009.rdl (zmodyfikowane) (4 diffs)
• RaportySQL/SprzedazReklam2009.rdl.data (zmodyfikowane) (poprzedni)
• RaportySQL/TESTOWA.rds (zmodyfikowane) (1 diff)

trunk/BazaReklam/Classes/DbUtils.cs

@@ -203 +203 @@
         public static int numerNowejReklamy(string symbolAgenta, string tagAgenta)
         {
-
-            SqlConnection conn = new SqlConnection(
-                ConnString.getConnString().Value);
+            SqlConnection conn = new SqlConnection(ConnString.getConnString().Value);
 
             SqlCommand command = new SqlCommand();
@@ -211 +209 @@
             //  command.CommandText = "select distinct [id reklamy] from reklama where [symbol akwizytora]=@symbolAgenta";
             //  command.Parameters.AddWithValue("@symbolAgenta", symbolAgenta);
+
             command.CommandText = "select distinct [id reklamy] from reklama where [id reklamy] like '%' + @tagAgenta + '%'";
             command.Parameters.AddWithValue("@tagAgenta", tagAgenta);

trunk/BazaReklam/ClientsForm.cs

@@ -122 +122 @@
 
             DBBindings.BindKontaktTyp(cbKontaktTyp);
-
         }
 

trunk/BazaReklam/OrderDetails.cs

@@ -212 +212 @@
                 {
                     SectionRepository sectionRepository = new SectionRepository(ConnString.getConnString().Value);
+                    grzbietComboBox.SelectedItem = sections[0];
                     List<Module> modules = sectionRepository.FindModulesBySection(SelectedSection);
                     

trunk/BazaReklam/ProvisionForm.Designer.cs

@@ -30 +30 @@
         {
             this.components = new System.ComponentModel.Container();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle26 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle14 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle15 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle16 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle17 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle18 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle19 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle20 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle21 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle22 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle23 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle24 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle25 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle13 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle5 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle6 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle7 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle8 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle9 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle10 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle11 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle12 = new System.Windows.Forms.DataGridViewCellStyle();
             System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(ProvisionForm));
             this.aGENCIBindingSource = new System.Windows.Forms.BindingSource(this.components);
@@ -227 +227 @@
             this.wREKLAMYDataGridViewTextBoxColumn});
             this.prowizjeDataGridView.DataSource = this.pLANBindingSource;
-            dataGridViewCellStyle26.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
-            dataGridViewCellStyle26.BackColor = System.Drawing.SystemColors.Window;
-            dataGridViewCellStyle26.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
-            dataGridViewCellStyle26.ForeColor = System.Drawing.SystemColors.ControlText;
-            dataGridViewCellStyle26.SelectionBackColor = System.Drawing.SystemColors.Highlight;
-            dataGridViewCellStyle26.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
-            dataGridViewCellStyle26.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
-            this.prowizjeDataGridView.DefaultCellStyle = dataGridViewCellStyle26;
+            dataGridViewCellStyle13.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
+            dataGridViewCellStyle13.BackColor = System.Drawing.SystemColors.Window;
+            dataGridViewCellStyle13.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+            dataGridViewCellStyle13.ForeColor = System.Drawing.SystemColors.ControlText;
+            dataGridViewCellStyle13.SelectionBackColor = System.Drawing.SystemColors.Highlight;
+            dataGridViewCellStyle13.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
+            dataGridViewCellStyle13.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
+            this.prowizjeDataGridView.DefaultCellStyle = dataGridViewCellStyle13;
             this.prowizjeDataGridView.Dock = System.Windows.Forms.DockStyle.Fill;
             this.prowizjeDataGridView.Location = new System.Drawing.Point(0, 31);
@@ -281 +281 @@
             // 
             this.bUDZETDataGridViewTextBoxColumn.DataPropertyName = "BUDZET";
-            dataGridViewCellStyle14.Format = "N0";
-            dataGridViewCellStyle14.NullValue = null;
-            this.bUDZETDataGridViewTextBoxColumn.DefaultCellStyle = dataGridViewCellStyle14;
+            dataGridViewCellStyle1.Format = "N0";
+            dataGridViewCellStyle1.NullValue = null;
+            this.bUDZETDataGridViewTextBoxColumn.DefaultCellStyle = dataGridViewCellStyle1;
             this.bUDZETDataGridViewTextBoxColumn.HeaderText = "Plan";
             this.bUDZETDataGridViewTextBoxColumn.Name = "bUDZETDataGridViewTextBoxColumn";
@@ -332 +332 @@
             // 
             this.oCENADataGridViewTextBoxColumn.DataPropertyName = "OCENA";
-            dataGridViewCellStyle15.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(192)))));
-            this.oCENADataGridViewTextBoxColumn.DefaultCellStyle = dataGridViewCellStyle15;
+            dataGridViewCellStyle2.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(192)))));
+            this.oCENADataGridViewTextBoxColumn.DefaultCellStyle = dataGridViewCellStyle2;
             this.oCENADataGridViewTextBoxColumn.HeaderText = "Ocena";
             this.oCENADataGridViewTextBoxColumn.Name = "oCENADataGridViewTextBoxColumn";
@@ -352 +352 @@
             // 
             this.PR_PROWIZJI.DataPropertyName = "PR_PROWIZJI";
-            dataGridViewCellStyle16.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(192)))));
-            dataGridViewCellStyle16.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
-            dataGridViewCellStyle16.Format = "P";
-            dataGridViewCellStyle16.NullValue = null;
-            this.PR_PROWIZJI.DefaultCellStyle = dataGridViewCellStyle16;
+            dataGridViewCellStyle3.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(192)))));
+            dataGridViewCellStyle3.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+            dataGridViewCellStyle3.Format = "P";
+            dataGridViewCellStyle3.NullValue = null;
+            this.PR_PROWIZJI.DefaultCellStyle = dataGridViewCellStyle3;
             this.PR_PROWIZJI.HeaderText = "Prowizja";
             this.PR_PROWIZJI.Name = "PR_PROWIZJI";
@@ -366 +366 @@
             this.wBUDZETDataGridViewTextBoxColumn.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None;
             this.wBUDZETDataGridViewTextBoxColumn.DataPropertyName = "W_BUDZET";
-            dataGridViewCellStyle17.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(192)))), ((int)(((byte)(255)))));
-            dataGridViewCellStyle17.Format = "N0";
-            this.wBUDZETDataGridViewTextBoxColumn.DefaultCellStyle = dataGridViewCellStyle17;
+            dataGridViewCellStyle4.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(192)))), ((int)(((byte)(255)))));
+            dataGridViewCellStyle4.Format = "N0";
+            this.wBUDZETDataGridViewTextBoxColumn.DefaultCellStyle = dataGridViewCellStyle4;
             this.wBUDZETDataGridViewTextBoxColumn.HeaderText = "Sprzeda¿";
             this.wBUDZETDataGridViewTextBoxColumn.Name = "wBUDZETDataGridViewTextBoxColumn";
@@ -377 +377 @@
             // 
             this.wSPOTKANIADataGridViewTextBoxColumn.DataPropertyName = "W_SPOTKANIA";
-            dataGridViewCellStyle18.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(192)))), ((int)(((byte)(255)))));
-            this.wSPOTKANIADataGridViewTextBoxColumn.DefaultCellStyle = dataGridViewCellStyle18;
+            dataGridViewCellStyle5.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(192)))), ((int)(((byte)(255)))));
+            this.wSPOTKANIADataGridViewTextBoxColumn.DefaultCellStyle = dataGridViewCellStyle5;
             this.wSPOTKANIADataGridViewTextBoxColumn.HeaderText = "Spotk.";
             this.wSPOTKANIADataGridViewTextBoxColumn.Name = "wSPOTKANIADataGridViewTextBoxColumn";
@@ -387 +387 @@
             // 
             this.wTELDataGridViewTextBoxColumn.DataPropertyName = "W_TEL";
-            dataGridViewCellStyle19.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(192)))), ((int)(((byte)(255)))));
-            this.wTELDataGridViewTextBoxColumn.DefaultCellStyle = dataGridViewCellStyle19;
+            dataGridViewCellStyle6.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(192)))), ((int)(((byte)(255)))));
+            this.wTELDataGridViewTextBoxColumn.DefaultCellStyle = dataGridViewCellStyle6;
             this.wTELDataGridViewTextBoxColumn.HeaderText = "Tel.";
             this.wTELDataGridViewTextBoxColumn.Name = "wTELDataGridViewTextBoxColumn";
@@ -397 +397 @@
             // 
             this.wEMAILDataGridViewTextBoxColumn.DataPropertyName = "W_EMAIL";
-            dataGridViewCellStyle20.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(192)))), ((int)(((byte)(255)))));
-            this.wEMAILDataGridViewTextBoxColumn.DefaultCellStyle = dataGridViewCellStyle20;
+            dataGridViewCellStyle7.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(192)))), ((int)(((byte)(255)))));
+            this.wEMAILDataGridViewTextBoxColumn.DefaultCellStyle = dataGridViewCellStyle7;
             this.wEMAILDataGridViewTextBoxColumn.HeaderText = "Email";
             this.wEMAILDataGridViewTextBoxColumn.Name = "wEMAILDataGridViewTextBoxColumn";
@@ -407 +407 @@
             // 
             this.wLISTDataGridViewTextBoxColumn.DataPropertyName = "W_LIST";
-            dataGridViewCellStyle21.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(192)))), ((int)(((byte)(255)))));
-            this.wLISTDataGridViewTextBoxColumn.DefaultCellStyle = dataGridViewCellStyle21;
+            dataGridViewCellStyle8.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(192)))), ((int)(((byte)(255)))));
+            this.wLISTDataGridViewTextBoxColumn.DefaultCellStyle = dataGridViewCellStyle8;
             this.wLISTDataGridViewTextBoxColumn.HeaderText = "List";
             this.wLISTDataGridViewTextBoxColumn.Name = "wLISTDataGridViewTextBoxColumn";
@@ -417 +417 @@
             // 
             this.wFAXDataGridViewTextBoxColumn.DataPropertyName = "W_FAX";
-            dataGridViewCellStyle22.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(192)))), ((int)(((byte)(255)))));
-            this.wFAXDataGridViewTextBoxColumn.DefaultCellStyle = dataGridViewCellStyle22;
+            dataGridViewCellStyle9.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(192)))), ((int)(((byte)(255)))));
+            this.wFAXDataGridViewTextBoxColumn.DefaultCellStyle = dataGridViewCellStyle9;
             this.wFAXDataGridViewTextBoxColumn.HeaderText = "Fax";
             this.wFAXDataGridViewTextBoxColumn.Name = "wFAXDataGridViewTextBoxColumn";
@@ -427 +427 @@
             // 
             this.wNKLIENCIDataGridViewTextBoxColumn.DataPropertyName = "W_N_KLIENCI";
-            dataGridViewCellStyle23.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(192)))), ((int)(((byte)(255)))));
-            this.wNKLIENCIDataGridViewTextBoxColumn.DefaultCellStyle = dataGridViewCellStyle23;
+            dataGridViewCellStyle10.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(192)))), ((int)(((byte)(255)))));
+            this.wNKLIENCIDataGridViewTextBoxColumn.DefaultCellStyle = dataGridViewCellStyle10;
             this.wNKLIENCIDataGridViewTextBoxColumn.HeaderText = "N. Klien.";
             this.wNKLIENCIDataGridViewTextBoxColumn.Name = "wNKLIENCIDataGridViewTextBoxColumn";
@@ -437 +437 @@
             // 
             this.wKLIENCIDataGridViewTextBoxColumn.DataPropertyName = "W_KLIENCI";
-            dataGridViewCellStyle24.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(192)))), ((int)(((byte)(255)))));
-            this.wKLIENCIDataGridViewTextBoxColumn.DefaultCellStyle = dataGridViewCellStyle24;
+            dataGridViewCellStyle11.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(192)))), ((int)(((byte)(255)))));
+            this.wKLIENCIDataGridViewTextBoxColumn.DefaultCellStyle = dataGridViewCellStyle11;
             this.wKLIENCIDataGridViewTextBoxColumn.HeaderText = "Klien.";
             this.wKLIENCIDataGridViewTextBoxColumn.Name = "wKLIENCIDataGridViewTextBoxColumn";
@@ -447 +447 @@
             // 
             this.wREKLAMYDataGridViewTextBoxColumn.DataPropertyName = "W_REKLAMY";
-            dataGridViewCellStyle25.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(192)))), ((int)(((byte)(255)))));
-            this.wREKLAMYDataGridViewTextBoxColumn.DefaultCellStyle = dataGridViewCellStyle25;
+            dataGridViewCellStyle12.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(192)))), ((int)(((byte)(255)))));
+            this.wREKLAMYDataGridViewTextBoxColumn.DefaultCellStyle = dataGridViewCellStyle12;
             this.wREKLAMYDataGridViewTextBoxColumn.HeaderText = "Rekl";
             this.wREKLAMYDataGridViewTextBoxColumn.Name = "wREKLAMYDataGridViewTextBoxColumn";
@@ -503 +503 @@
             // 
             this.bindingNavigatorCountItem.Name = "bindingNavigatorCountItem";
-            this.bindingNavigatorCountItem.Size = new System.Drawing.Size(36, 28);
+            this.bindingNavigatorCountItem.Size = new System.Drawing.Size(35, 28);
             this.bindingNavigatorCountItem.Text = "of {0}";
             this.bindingNavigatorCountItem.ToolTipText = "Total number of items";
@@ -660 +660 @@
             // 
             this.toolStripLabel1.Name = "toolStripLabel1";
-            this.toolStripLabel1.Size = new System.Drawing.Size(26, 28);
+            this.toolStripLabel1.Size = new System.Drawing.Size(27, 28);
             this.toolStripLabel1.Text = "rok:";
             // 
@@ -671 +671 @@
             // 
             this.toolStripLabel2.Name = "toolStripLabel2";
-            this.toolStripLabel2.Size = new System.Drawing.Size(24, 28);
+            this.toolStripLabel2.Size = new System.Drawing.Size(26, 28);
             this.toolStripLabel2.Text = "ms:";
             // 
@@ -682 +682 @@
             // 
             this.agencjaToolStripLabel.Name = "agencjaToolStripLabel";
-            this.agencjaToolStripLabel.Size = new System.Drawing.Size(49, 28);
+            this.agencjaToolStripLabel.Size = new System.Drawing.Size(51, 28);
             this.agencjaToolStripLabel.Text = "agencja:";
             // 
@@ -696 +696 @@
             this.szukajToolStripButton.ImageTransparentColor = System.Drawing.Color.Magenta;
             this.szukajToolStripButton.Name = "szukajToolStripButton";
-            this.szukajToolStripButton.Size = new System.Drawing.Size(48, 28);
+            this.szukajToolStripButton.Size = new System.Drawing.Size(51, 28);
             this.szukajToolStripButton.Text = "SZUKAJ";
             this.szukajToolStripButton.Click += new System.EventHandler(this.szukajToolStripButton_Click);
@@ -706 +706 @@
             this.btnBlockProvision.ImageTransparentColor = System.Drawing.Color.Transparent;
             this.btnBlockProvision.Name = "btnBlockProvision";
-            this.btnBlockProvision.Size = new System.Drawing.Size(126, 28);
+            this.btnBlockProvision.Size = new System.Drawing.Size(143, 28);
             this.btnBlockProvision.Text = "Prowizja blokuj/odblokuj";
             this.btnBlockProvision.TextImageRelation = System.Windows.Forms.TextImageRelation.TextBeforeImage;

trunk/BazaReklam/ProvisionForm.cs

@@ -95 +95 @@
             {
                 agencjaToolStripComboBox.Enabled = false;
-            }
-
+                pLANBindingSource.Filter = "Symbol = '" + User.Instance().Login + "'";
+            }
         }
 

trunk/BazaReklam/ProvisionForm.resx

@@ -124 +124 @@
     <value>445, 17</value>
   </metadata>
-  <metadata name="sLOWNIKDataSet.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>445, 17</value>
-  </metadata>
   <metadata name="pLANBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>297, 17</value>
-  </metadata>
-  <metadata name="rEKLAMADataSet.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>17, 17</value>
   </metadata>
   <metadata name="rEKLAMADataSet.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
@@ -320 +314 @@
     <value>
         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
-        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
+        YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAABv9JREFUSEt1lglQ
+        k3caxr+AdltnRbeObXeqU9fd1qnjTtc6bHc9lu1eMrsVC1VaWOtKi5yCSqEuSE0VOTxoOaRESCKHyBVC
+        uAI55JAAQsCCiVwCIWLUoJBwhDPy7PtlhbHT3W/mmX/mm/me3/993+//fOEwdF24cOk9q3VqndU6v3ph
+        gbOKYewdaHWwWjmrADjY2y93sLN7YSWtq+zsljvMz/9k1fT02AOTySS3WExylaqq4d49zQRZPSWB9fzB
+        lZDAM2ZkiNDU1Im+Pj36+4doNdL6GAMDZvptxp07T9De/gjNzQ/Q0DCE2lo9iorakZQkw4kT2aYjR1LE
+        Xl6x/jt3+m8k8xdInCUIn59tHB2dRWfnGDo6gO5uK/T6CQwOmtDTMwqNZgTff2+CWj2KlhYz6utHIJc/
+        hEQyiJycTqSltSImRoaQkCx4e18aJuPNpJeWAJcv840zMwsYG5vCyMgkGU+Cy81ZYM2amoahUt2nHeug
+        UHSjoqIdItFNZGdXIz29AsnJxYiPL0BsbD7Ons2Fr2+KiYyPkdYvAjgsgHoNi2UOZvMUhocnqCVPqRVq
+        Mr5Bu60j42oUFytRUCDD1auVEArLweOVEEBMAJENEBWVi8OHk1nAOdKvlgDxCXzj+BwRnj7FxNg0Hj9m
+        AQuoqVFDqaxHZWUdystrqOdK5OXJkJUlhUBQjtTUEpqBGBcvFlKL8qiCPPj42ADnnwFsc+BERfON+65N
+        gqcyYXZyBmOjE+jqWqCdN0EqrUNZWQ3t/jrtXo5rOVXIyqiAkF+GtFQJUhKLkHA+HxdjchF7Ogc+h5NY
+        wAXSm4uD5vCoAkXXDN6JG8SWqLuoUA/D0AdUy1RQSqshL1dCVqKAtKgSRblSpPHLEX1JipD4ShyKlWNv
+        lBJO3GpsOdmAi8JqC2dbYBqZv0NaZqsgmioYMVthfDQO58S7YDya8anQgN3RLfh1+E28HtKCFf5qMN63
+        wBxuBxOgBXP0DpjQbjAne8B8Rc981QtvyUMkXtHNMx5tFvLdR3rZBgg/yzf+q9CCitYnsI6YIZAN4a3T
+        XWSmxuojLdgYchNbw1V4/9QNfHi2BgfilPA/V4Wwc2U4FSfCuehc5AkrUdmgx4tejWA+aR0nXy7pFzZA
+        PFWQqTJjS9w9+GToqT3DGNDMoowGWpJThuLsUkhFchQIxchNL0JWSiGECflIPp+HU1EF8OeKUXLjLl7z
+        bwDzzzrqgEL3/JvECT/DN/b2miFrNODnX3ZiTUgH8hUjiPtOiaMX5AhOUuHbkn6EXe3EG6GNWHm8DUzI
+        bWoRVRnRC+71EThyqX2fVGPFpwR46dVsAoQtngVOWDjf6FM6A2m9Adq2Ibx7WoOXw6nHXtTvQ+34TKCH
+        85k2nBQ9QILCgG+q9EiVD+CKohfFdX04kUmz+EiO5R718ItInyPjdNJu0k9tLTpNgITKYTh+ex9n8gbQ
+        qx5EqsgA/2gpTsZJbBm1zlOCZXtKcCAwBsePh+Bo8DGb9vlGwe5DKRhXBXZ6JdPplkyRZxJpC8n+v0Mm
+        QItKj0tFfVh9ogt/jLkD1fWH4MXnI+X8NTQ3avEbTx6Y3UXY4CWDRmdGv3ESmqFJbPSpBrOnAtu/qMFe
+        9wMEqGIB35A2LZ2DsDC+USYbgFzajUxRF5b538Lb0b14JegmvUmtiCx+CN+gMLx3tBbM30T4KK4DgxSO
+        3imdYJyL8aqnArXNWnzseZAApYuAtxYBTFDQ5XsSSTfE4i5IxFqICjX4Q0wXNgTWYmuwAkJpDwKDjqFT
+        N441rhJw/lqAyPQO2P+lGHbOZUjNVeHJkzG47/cggPjHABeXY//w9U015eTcpvjV4GpWO0qpXV9HZCHy
+        yytQVLUhIOAIpa0F2fL74LyfB8YpB8yfCuAWIadwHMUoxYubmzsB0n8MYKe9devfDwQEJD0WCG6Bz28l
+        UA8N8wqCgwWUpK3w8wuktJ2xyTWyCcyubLxG1dzW3sXk5DTBJ+Hi4vY8YCmL2EHbscd68+Y/ex48mPiI
+        x2uhSO5GYCCfjNNQWqqmD4kvpqZmMD09h/6hcaykWSRm1NO9Wdv9iQkLPvjABSkpGY/Iiw27pbhmAYuQ
+        n23a9Pt9Hh7c+wJBO0VvGry8UiimG3Ho0OdkNI25uXlkZmYtcLkJC1qt1qrT6eYNBsOc0WicdXJyGiOj
+        QtIXpHWLxs+vbH6vXr/+7b2urse7nZ0Derdvd6v18wtVhoZG9Lu7fzyxf//+cVdX17Fdu3YNstqxY8eg
+        o6Pj4LZt23Rr167NpedjSL8lvfi/ALZzQaJ/FszvSMGkyGc7Ynf1NYn9mLAtYNdoUtQznaH136Q9pDX/
+        z3zxPgtZQXqdtOFZuWzJbDqyvWUHyK6/JLH/Ihb1Bv1mI9r2HWCv/wArwcam8/FBswAAAABJRU5ErkJg
+        gg==
 </value>
   </data>
@@ -356 +351 @@
     <value>
         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
-        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
+        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
 </value>
   </data>

trunk/BazaReklam/ReportsForm.cs

@@ -40 +40 @@
         private void ReportsForm_Load(object sender, EventArgs e)
         {
+            tabControl1.TabPages.RemoveAt(1);
+
             WindowState = FormWindowState.Maximized;
         }
@@ -46 +48 @@
         /// Wczytuje raporty do drzewka
         /// </summary>
-        private void wczytajRaporty() {
+        private void wczytajRaporty()
+        {
             TreeNode node = new TreeNode();
             node.Name = "/" + reportsCatalog + "/ListaReklamNaWydanieNr";
@@ -403 +406 @@
                     foreach (XmlNode report in reportGroup.ChildNodes)
                     {
-                        if(!HasUserReportRights(report)) continue;
+                        if (!HasUserReportRights(report)) continue;
                         if (string.IsNullOrEmpty(report.Attributes["path"].Value)) continue;
 
@@ -442 +445 @@
 
                     if (reportViewer1.ServerReport.ReportPath == "/" + reportsCatalog + "/ZestawienieMiesieczneFaktur" |
-                        reportViewer1.ServerReport.ReportPath == "/" + reportsCatalog + "/ZestawienieMiesieczneFaktur2009" |
+                       reportViewer1.ServerReport.ReportPath == "/" + reportsCatalog + "/ZestawienieMiesieczneFaktur2009" |
                        reportViewer1.ServerReport.ReportPath == "/" + reportsCatalog + "/ZestawienieKontaktow" |
                        reportViewer1.ServerReport.ReportPath == "/" + reportsCatalog + "/RozliczenieWplywowWgDatyWplaty2" |
@@ -448 +451 @@
                        reportViewer1.ServerReport.ReportPath == "/" + reportsCatalog + "/RozliczenieProwizjiZaReklame" |
                        reportViewer1.ServerReport.ReportPath == "/" + reportsCatalog + "/RozliczenieProwizjiZaReklame2009" |
-                       reportViewer1.ServerReport.ReportPath == "/" + reportsCatalog + "/SzacowanieSprzedazy"
-                       )
+                       reportViewer1.ServerReport.ReportPath == "/" + reportsCatalog + "/SzacowanieSprzedazy" |
+                       reportViewer1.ServerReport.ReportPath == "/" + reportsCatalog + "/OcenaAgenta" |
+                       reportViewer1.ServerReport.ReportPath == "/" + reportsCatalog + "/SprzedazReklam2009" )
                     {
                         if (!User.Instance().IsKierownik)
-                        { 
+                        {
                             if (User.Instance().IsSekretarka)
                             {
@@ -465 +469 @@
                                 paramList.Add(new ReportParameter("prawa_agent", User.Instance().Symbol_agenta, true));
                                 reportViewer1.ServerReport.SetParameters(paramList);
-
                             }
                         }
@@ -474 +477 @@
                        reportViewer1.ServerReport.ReportPath == "/" + reportsCatalog + "/WynikAgencji" |
                        reportViewer1.ServerReport.ReportPath == "/" + reportsCatalog + "/SprzedazReklam" |
+                       reportViewer1.ServerReport.ReportPath == "/" + reportsCatalog + "/RozliczenieProwizjiZaReklame" /* |
                        reportViewer1.ServerReport.ReportPath == "/" + reportsCatalog + "/SprzedazReklam2009" |
-                       reportViewer1.ServerReport.ReportPath == "/" + reportsCatalog + "/RozliczenieProwizjiZaReklame" |
                        reportViewer1.ServerReport.ReportPath == "/" + reportsCatalog + "/RozliczenieProwizjiZaReklame2009" |
-                       reportViewer1.ServerReport.ReportPath == "/" + reportsCatalog + "/OcenaAgenta")
+                       reportViewer1.ServerReport.ReportPath == "/" + reportsCatalog + "/OcenaAgenta"*/
+                                                                                                       )
                     {
                         if (!User.Instance().IsKierownik)

trunk/BazaReklam/ZamowieniaForm.Designer.cs

@@ -33 +33 @@
             System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle();
             System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle();
             System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle5 = new System.Windows.Forms.DataGridViewCellStyle();
             System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle6 = new System.Windows.Forms.DataGridViewCellStyle();
@@ -40 +39 @@
             System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(ZamowieniaForm));
             System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle9 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle();
             this.zamowieniaDataGridView = new System.Windows.Forms.DataGridView();
             this.dataGridViewCheckBoxColumn1 = new System.Windows.Forms.DataGridViewCheckBoxColumn();
@@ -49 +49 @@
             this.rEKLAMADataSet = new Baza_Reklam.REKLAMADataSet();
             this.rEKLAMADataGridView = new System.Windows.Forms.DataGridView();
-            this.TYP = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.ShortName = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.VAT = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.Brutto_Euro_Miano = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.ZATWIERDZONO_DO_DRUKU = new System.Windows.Forms.DataGridViewCheckBoxColumn();
             this.rEKLAMADataGridView1 = new System.Windows.Forms.DataGridView();
             this.Data1Emisji = new System.Windows.Forms.DataGridViewTextBoxColumn();
@@ -98 +93 @@
             this.toolTip = new System.Windows.Forms.ToolTip(this.components);
             this.KlientLabel = new System.Windows.Forms.Label();
+            this.TYP = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.ShortName = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.Cena = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.VAT = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.Brutto_Euro_Miano = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.ZATWIERDZONO_DO_DRUKU = new System.Windows.Forms.DataGridViewCheckBoxColumn();
             ((System.ComponentModel.ISupportInitialize)(this.zamowieniaDataGridView)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.zamowieniaBindingSource)).BeginInit();
@@ -213 +214 @@
             this.TYP,
             this.ShortName,
+            this.Cena,
             this.VAT,
             this.Brutto_Euro_Miano,
@@ -224 +226 @@
             this.rEKLAMADataGridView.Size = new System.Drawing.Size(379, 173);
             this.rEKLAMADataGridView.TabIndex = 1;
-            // 
-            // TYP
-            // 
-            this.TYP.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None;
-            this.TYP.DataPropertyName = "Type";
-            this.TYP.HeaderText = "Typ";
-            this.TYP.Name = "TYP";
-            this.TYP.ReadOnly = true;
-            this.TYP.Width = 50;
-            // 
-            // ShortName
-            // 
-            this.ShortName.DataPropertyName = "ShortName";
-            this.ShortName.HeaderText = "Symbol";
-            this.ShortName.Name = "ShortName";
-            this.ShortName.ReadOnly = true;
-            // 
-            // VAT
-            // 
-            this.VAT.DataPropertyName = "Vat";
-            dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            dataGridViewCellStyle4.Format = "P";
-            this.VAT.DefaultCellStyle = dataGridViewCellStyle4;
-            this.VAT.HeaderText = "Vat";
-            this.VAT.Name = "VAT";
-            this.VAT.ReadOnly = true;
-            // 
-            // Brutto_Euro_Miano
-            // 
-            this.Brutto_Euro_Miano.DataPropertyName = "Currency";
-            this.Brutto_Euro_Miano.HeaderText = "Waluta";
-            this.Brutto_Euro_Miano.Name = "Brutto_Euro_Miano";
-            this.Brutto_Euro_Miano.ReadOnly = true;
-            // 
-            // ZATWIERDZONO_DO_DRUKU
-            // 
-            this.ZATWIERDZONO_DO_DRUKU.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None;
-            this.ZATWIERDZONO_DO_DRUKU.DataPropertyName = "IsActivated";
-            this.ZATWIERDZONO_DO_DRUKU.HeaderText = "ZD";
-            this.ZATWIERDZONO_DO_DRUKU.Name = "ZATWIERDZONO_DO_DRUKU";
-            this.ZATWIERDZONO_DO_DRUKU.ReadOnly = true;
-            this.ZATWIERDZONO_DO_DRUKU.Width = 25;
             // 
             // rEKLAMADataGridView1
@@ -734 +694 @@
             this.KlientLabel.Location = new System.Drawing.Point(12, 9);
             this.KlientLabel.Name = "KlientLabel";
-            this.KlientLabel.Size = new System.Drawing.Size(28, 16);
+            this.KlientLabel.Size = new System.Drawing.Size(32, 16);
             this.KlientLabel.TabIndex = 15;
             this.KlientLabel.Text = "----";
+            // 
+            // TYP
+            // 
+            this.TYP.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None;
+            this.TYP.DataPropertyName = "Type";
+            this.TYP.HeaderText = "Typ";
+            this.TYP.Name = "TYP";
+            this.TYP.ReadOnly = true;
+            this.TYP.Width = 70;
+            // 
+            // ShortName
+            // 
+            this.ShortName.DataPropertyName = "ShortName";
+            this.ShortName.HeaderText = "Symbol";
+            this.ShortName.Name = "ShortName";
+            this.ShortName.ReadOnly = true;
+            // 
+            // Cena
+            // 
+            this.Cena.DataPropertyName = "Price";
+            this.Cena.HeaderText = "Cena";
+            this.Cena.Name = "Cena";
+            this.Cena.ReadOnly = true;
+            // 
+            // VAT
+            // 
+            this.VAT.DataPropertyName = "Vat";
+            dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            dataGridViewCellStyle4.Format = "P";
+            this.VAT.DefaultCellStyle = dataGridViewCellStyle4;
+            this.VAT.HeaderText = "Vat";
+            this.VAT.Name = "VAT";
+            this.VAT.ReadOnly = true;
+            // 
+            // Brutto_Euro_Miano
+            // 
+            this.Brutto_Euro_Miano.DataPropertyName = "Currency";
+            this.Brutto_Euro_Miano.HeaderText = "Waluta";
+            this.Brutto_Euro_Miano.Name = "Brutto_Euro_Miano";
+            this.Brutto_Euro_Miano.ReadOnly = true;
+            // 
+            // ZATWIERDZONO_DO_DRUKU
+            // 
+            this.ZATWIERDZONO_DO_DRUKU.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None;
+            this.ZATWIERDZONO_DO_DRUKU.DataPropertyName = "IsActivated";
+            this.ZATWIERDZONO_DO_DRUKU.HeaderText = "ZD";
+            this.ZATWIERDZONO_DO_DRUKU.Name = "ZATWIERDZONO_DO_DRUKU";
+            this.ZATWIERDZONO_DO_DRUKU.ReadOnly = true;
+            this.ZATWIERDZONO_DO_DRUKU.Width = 25;
             // 
             // ZamowieniaForm
@@ -820 +829 @@
         private System.Windows.Forms.DataGridViewTextBoxColumn kodAgenta;
         private System.Windows.Forms.Button proformaButton;
-        private System.Windows.Forms.DataGridViewTextBoxColumn TYP;
-        private System.Windows.Forms.DataGridViewTextBoxColumn ShortName;
-        private System.Windows.Forms.DataGridViewTextBoxColumn VAT;
-        private System.Windows.Forms.DataGridViewTextBoxColumn Brutto_Euro_Miano;
-        private System.Windows.Forms.DataGridViewCheckBoxColumn ZATWIERDZONO_DO_DRUKU;
         private System.Windows.Forms.DataGridViewTextBoxColumn Data1Emisji;
         private System.Windows.Forms.DataGridViewTextBoxColumn ShortName1;
@@ -831 +835 @@
         private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn44;
         private System.Windows.Forms.DataGridViewCheckBoxColumn ZATWIERDZONO_DO_DRUKU2;
+        private System.Windows.Forms.DataGridViewTextBoxColumn TYP;
+        private System.Windows.Forms.DataGridViewTextBoxColumn ShortName;
+        private System.Windows.Forms.DataGridViewTextBoxColumn Cena;
+        private System.Windows.Forms.DataGridViewTextBoxColumn VAT;
+        private System.Windows.Forms.DataGridViewTextBoxColumn Brutto_Euro_Miano;
+        private System.Windows.Forms.DataGridViewCheckBoxColumn ZATWIERDZONO_DO_DRUKU;
     }
 }

trunk/BazaReklam/ZamowieniaForm.resx

@@ -142 +142 @@
     <value>True</value>
   </metadata>
+  <metadata name="Cena.UserAddedColumn" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
   <metadata name="VAT.UserAddedColumn" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
@@ -256 +259 @@
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAALDgAA
-        Cw4BQL7hQQAABNdJREFUSEudVn1UzmcYvl7pw5ydCCt2tjjYnJ3tJMIi5ishjRxNPmqS1FpWoxVLijYf
+        YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAALDQAA
+        Cw0B7QfALAAABNdJREFUSEudVn1UzmcYvl7pw5ydCCt2tjjYnJ3tJMIi5ishjRxNPmqS1FpWoxVLijYf
         0fqYxEvpjb5UlBKi1FpC9q6GUWdknB2H2TibbTZ5r92P993ZH6lDv3Ou8/w+nue67ue+7+e+fxp0cl3f
         jl4DQ/BbsCPMRo3HXJk65jHRUlyHg2V6/CrPjwXsjKPDb3cKMbhxj/nD4xtRtCsIzVmhYNGnYNl6sDQO
@@ -478 +481 @@
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAALDgAA
-        Cw4BQL7hQQAABZRJREFUSEt1VglQlWUUPU8eIjsKqMBjUVACxRRTFMEFFFRcAHFJU4k0EVOHXBqpzK2a
+        YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAALDQAA
+        Cw0B7QfALAAABZRJREFUSEt1VglQlWUUPU8eIjsKqMBjUVACxRRTFMEFFFRcAHFJU4k0EVOHXBqpzK2a
         smyspiabtLKxGitzbMwts5xRR8kmKUU0y8ilaUEFx2cP/tP5HlBg+GbOvHn/u9+59zt3+z1wl88JIG0a
         UPYjcKIacMmsoS3TA0D4FGD/aCCIwC+VgFN21t14cQ6YfBI4czopxqpK6clXgQ0y7i543nloDxDwGXDy
@@ -509 +512 @@
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAALDgAA
-        Cw4BQL7hQQAABjFJREFUSEuVlgtMk1cYhn8UmBoWndPp1GTG+wQ3FoM3NrfEjYjzBroM5hQdV5WoeKGA
+        YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAALDQAA
+        Cw0B7QfALAAABjFJREFUSEuVlgtMk1cYhn8UmBoWndPp1GTG+wQ3FoM3NrfEjYjzBroM5hQdV5WoeKGA
         OEAE5CLQIhVBbiogN+VSgZYCBUQQ6wUmKKCAMC4FSgu2BRV4d84/sqigyU7y5Pz9m77vd77vnO9Ui3ln
         iMXiZQqFYtfEiRMX6+rqLtTW1p4/NDSk1mg0XWq1WtbX1yfr6enpIp9lAwMDMgCdKpWqQyqVNj958uQV

trunk/RaportySQL/BAZA_REKLAM.rds

@@ -5 +5 @@
   <ConnectionProperties>
     <Extension>SQL</Extension>
-    <ConnectString>Data Source=sql.ct.com.pl;Initial Catalog=BAZA_REKLAM</ConnectString>
+    <ConnectString>Data Source=sql.ct.com.pl;Initial Catalog=BAZA_REKLAM;User ID=sa;Password=9ar6u$ek</ConnectString>
   </ConnectionProperties>
 </RptDataSource>

trunk/RaportySQL/OcenaAgenta.rdl

@@ -13 +13 @@
       <Nullable>true</Nullable>
       <Prompt>prawa_agencje</Prompt>
+      <Hidden>true</Hidden>
+    </ReportParameter>
+    <ReportParameter Name="prawa_agent">
+      <DataType>String</DataType>
+      <Nullable>true</Nullable>
+      <Prompt>prawa_agent</Prompt>
       <Hidden>true</Hidden>
     </ReportParameter>
@@ -101 +107 @@
       <DataType>String</DataType>
       <Nullable>true</Nullable>
+      <DefaultValue>
+        <DataSetReference>
+          <DataSetName>ListaAgentow</DataSetName>
+          <ValueField>Symbol</ValueField>
+        </DataSetReference>
+      </DefaultValue>
       <Prompt>agent</Prompt>
       <ValidValues>
         <DataSetReference>
           <DataSetName>ListaAgentow</DataSetName>
-          <ValueField>ID_AGENTA</ValueField>
+          <ValueField>Symbol</ValueField>
           <LabelField>Symbol</LabelField>
         </DataSetReference>
@@ -224 +236 @@
 INNER JOIN AGENCI ON AGENCJE.Id_agencji = AGENCI.ID_AGENCJI 
 INNER JOIN [PLAN] ON AGENCI.Symbol = [PLAN].SYMBOL
-WHERE        ([PLAN].ROK = @rok) AND (AGENCJE.Id_agencji = @agencja) AND (@agent is null OR  AGENCI.ID_AGENTA = @agent)</CommandText>
+WHERE        ([PLAN].ROK = @rok) AND (AGENCJE.Id_agencji = @agencja) AND (@agent = 'Wszyscy' OR AGENCI.SYMBOL = @agent)</CommandText>
         <QueryParameters>
           <QueryParameter Name="@rok">
@@ -292 +304 @@
       <Query>
         <DataSourceName>BAZA_REKLAM</DataSourceName>
-        <CommandText>SELECT        A.ID_AGENTA, A.Symbol, A2.Symbol agencja
-FROM            AGENCI A left join Agencje A2
-on A.ID_AGENCJI = A2.ID_Agencji
- where aktywny=1 AND  (A2.ID_AGENCJI in (@agencja) OR A2.ID_AGENCJI is null)
+        <CommandText>SELECT A.ID_AGENTA, A.Symbol, A2.Symbol agencja
+FROM AGENCI A
+   left join Agencje A2 on A.ID_AGENCJI = A2.ID_Agencji
+ where aktywny=1 AND (A2.ID_AGENCJI in (@agencja) OR A2.ID_AGENCJI is null) AND (@prawa_agent is null OR A.Symbol=@prawa_agent)
 union
 select NULL,'Wszyscy','costam'
-order by A.Symbol</CommandText>
+where @prawa_agent is null
+order by A.Symbol;</CommandText>
         <QueryParameters>
           <QueryParameter Name="@agencja">
             <Value>=Parameters!agencja.Value</Value>
+          </QueryParameter>
+          <QueryParameter Name="@prawa_agent">
+            <Value>=Parameters!prawa_agent.Value</Value>
           </QueryParameter>
         </QueryParameters>

trunk/RaportySQL/RaportySQL.rptproj

@@ -1 +1 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-  <State>$base64$PFNvdXJjZUNvbnRyb2xJbmZvIHhtbG5zOnhzZD0iaHR0cDovL3d3dy53My5vcmcvMjAwMS9YTUxTY2hlbWEiIHhtbG5zOnhzaT0iaHR0cDovL3d3dy53My5vcmcvMjAwMS9YTUxTY2hlbWEtaW5zdGFuY2UiIHhtbG5zOmR3ZD0iaHR0cDovL3NjaGVtYXMubWljcm9zb2Z0LmNvbS9EYXRhV2FyZWhvdXNlL0Rlc2lnbmVyLzEuMCI+DQogIDxFbmFibGVkPmZhbHNlPC9FbmFibGVkPg0KICA8UHJvamVjdE5hbWU+PC9Qcm9qZWN0TmFtZT4NCiAgPEF1eFBhdGg+PC9BdXhQYXRoPg0KICA8TG9jYWxQYXRoPjwvTG9jYWxQYXRoPg0KICA8UHJvdmlkZXI+PC9Qcm92aWRlcj4NCjwvU291cmNlQ29udHJvbEluZm8+</State>
+  <State>$base64$PFNvdXJjZUNvbnRyb2xJbmZvIHhtbG5zOnhzZD0iaHR0cDovL3d3dy53My5vcmcvMjAwMS9YTUxTY2hlbWEiIHhtbG5zOnhzaT0iaHR0cDovL3d3dy53My5vcmcvMjAwMS9YTUxTY2hlbWEtaW5zdGFuY2UiIHhtbG5zOmRkbDI9Imh0dHA6Ly9zY2hlbWFzLm1pY3Jvc29mdC5jb20vYW5hbHlzaXNzZXJ2aWNlcy8yMDAzL2VuZ2luZS8yIiB4bWxuczpkZGwyXzI9Imh0dHA6Ly9zY2hlbWFzLm1pY3Jvc29mdC5jb20vYW5hbHlzaXNzZXJ2aWNlcy8yMDAzL2VuZ2luZS8yLzIiIHhtbG5zOmR3ZD0iaHR0cDovL3NjaGVtYXMubWljcm9zb2Z0LmNvbS9EYXRhV2FyZWhvdXNlL0Rlc2lnbmVyLzEuMCI+DQogIDxFbmFibGVkPmZhbHNlPC9FbmFibGVkPg0KICA8UHJvamVjdE5hbWU+PC9Qcm9qZWN0TmFtZT4NCiAgPEF1eFBhdGg+PC9BdXhQYXRoPg0KICA8TG9jYWxQYXRoPjwvTG9jYWxQYXRoPg0KICA8UHJvdmlkZXI+PC9Qcm92aWRlcj4NCjwvU291cmNlQ29udHJvbEluZm8+</State>
   <DataSources>
     <ProjectItem>

trunk/RaportySQL/RozliczenieWplywowWgDatyWplaty2009.rdl

@@ -326 +326 @@
       <Query>
         <DataSourceName>BAZA_REKLAM</DataSourceName>
-        <CommandText>SELECT     ID_FAKTURY, Symbol, NumerFaktury, NR_FK, kodKlienta, symbolPotwierdzenia, rodzajPotwierdzenia, Netto, Vat, Brutto, DATA_WYSTAWIENIA, 
-                      TERMIN_ZAPLATY, SPOSOB_ZAPLATY, Agencja, dataWplaty, roznica_nowa, suma_zaplat, zaplata_data, roznica_stara, procentProwizji, Tytul
-FROM         WplywyByTytul
-WHERE     (YEAR(dataWplaty) = @rok) AND (MONTH(dataWplaty) = @miesiac) AND (Tytul IN (@tytul)) AND (SystemKsiegowyId IN (@systemKsiegowy))
+        <CommandText>SELECT        ID_FAKTURY, Symbol, NumerFaktury, NR_FK, kodKlienta, symbolPotwierdzenia, rodzajPotwierdzenia, Netto, Vat, Brutto, DATA_WYSTAWIENIA, 
+                         TERMIN_ZAPLATY, SPOSOB_ZAPLATY, Agencja, dataWplaty, roznica_nowa, suma_zaplat, zaplata_data, roznica_stara, procentProwizji, Tytul
+FROM            WplywyByTytul
+WHERE        (YEAR(dataWplaty) = @rok) AND (MONTH(dataWplaty) = @miesiac) AND (Tytul IN (@tytul)) AND (SystemKsiegowyId IN (@systemKsiegowy))
 GROUP BY ID_FAKTURY, Symbol, NumerFaktury, NR_FK, kodKlienta, symbolPotwierdzenia, rodzajPotwierdzenia, Netto, Vat, Brutto, DATA_WYSTAWIENIA, 
-                      TERMIN_ZAPLATY, SPOSOB_ZAPLATY, Agencja, dataWplaty, roznica_nowa, suma_zaplat, zaplata_data, roznica_stara, procentProwizji, Tytul
+                         TERMIN_ZAPLATY, SPOSOB_ZAPLATY, Agencja, dataWplaty, roznica_nowa, suma_zaplat, zaplata_data, roznica_stara, procentProwizji, Tytul
 ORDER BY Symbol, NumerFaktury</CommandText>
         <QueryParameters>

trunk/RaportySQL/SprzedazReklam2009.rdl

@@ -13 +13 @@
       <Nullable>true</Nullable>
       <Prompt>prawa_agencje</Prompt>
+      <Hidden>true</Hidden>
+    </ReportParameter>
+    <ReportParameter Name="prawa_agent">
+      <DataType>String</DataType>
+      <Nullable>true</Nullable>
+      <Prompt>prawa_agent</Prompt>
       <Hidden>true</Hidden>
     </ReportParameter>
@@ -216 +222 @@
         AND (AGENCJE.Id_agencji&lt;&gt;4 OR Korekta.NUMER_ROZ ='KAT') AND (AGENCJE.Id_agencji &lt;&gt;6 OR Korekta.NUMER_ROZ ='POZ')
         AND Korekta.SystemKsiegowyId IN (@systemKsiegowy)
+                AND (@agent IS NULL OR AGENCI.SYMBOL=@agent)
         GROUP BY AGENCJE.Symbol, AGENCI.Nazwisko + ' ' + AGENCI.Imię, Korekta.ID_FAKTURY, Korekta.DATA_SPRZEDAZY, 
         YEAR(Korekta.DATA_SPRZEDAZY), Korekta.NUMER_ROZ, 
@@ -254 +261 @@
         WHERE 
         YEAR(FAKTURY.DATA_SPRZEDAZY)=@rok AND MONTH(FAKTURY.DATA_SPRZEDAZY)=@miesiac
-
         AND (AGENCJE.Id_agencji&lt;&gt;4 OR FAKTURY.NUMER_ROZ ='KAT') AND (AGENCJE.Id_agencji &lt;&gt;6 OR FAKTURY.NUMER_ROZ ='POZ')
         AND FAKTURY.KOREKTA=0 AND FAKTURY.SystemKsiegowyId IN (@systemKsiegowy)
+                AND (@agent IS NULL OR AGENCI.SYMBOL=@agent)
         GROUP BY AGENCJE.Symbol, AGENCI.Nazwisko + ' ' + AGENCI.Imię, FAKTURY.ID_FAKTURY, FAKTURY.DATA_SPRZEDAZY, 
         YEAR(FAKTURY.DATA_SPRZEDAZY), FAKTURY.NUMER_ROZ, FAKTURY.suma_zaplat, FAKTURY.Korekta
@@ -282 +289 @@
           <QueryParameter Name="@systemKsiegowy">
             <Value>=Parameters!systemKsiegowy.Value</Value>
+          </QueryParameter>
+          <QueryParameter Name="@agent">
+            <Value>=Parameters!prawa_agent.Value</Value>
           </QueryParameter>
         </QueryParameters>

trunk/RaportySQL/TESTOWA.rds

@@ -6 +6 @@
     <Extension>SQL</Extension>
     <ConnectString>Data Source=sql.ct.com.pl;Initial Catalog=BAZA_REKLAM_TEST</ConnectString>
-    <Prompt>Specify a user name and password for data source TESTOWA</Prompt>
   </ConnectionProperties>
 </RptDataSource>