Index: trunk/RaportySQL/SzacowanieSprzedazy.rdl
===================================================================
--- trunk/RaportySQL/SzacowanieSprzedazy.rdl (revision 150)
+++ trunk/RaportySQL/SzacowanieSprzedazy.rdl (revision 155)
@@ -207,4 +207,8 @@
     <DataSet Name="Zamowienia">
       <Fields>
+        <Field Name="ReklmaID">
+          <DataField>ReklmaID</DataField>
+          <rd:TypeName>System.Int32</rd:TypeName>
+        </Field>
         <Field Name="KodKilenta">
           <DataField>KodKilenta</DataField>
@@ -227,18 +231,6 @@
           <rd:TypeName>System.String</rd:TypeName>
         </Field>
-        <Field Name="Rok">
-          <DataField>Rok</DataField>
-          <rd:TypeName>System.Int32</rd:TypeName>
-        </Field>
-        <Field Name="Miesiac">
-          <DataField>Miesiac</DataField>
-          <rd:TypeName>System.Int32</rd:TypeName>
-        </Field>
-        <Field Name="Data">
-          <DataField>Data</DataField>
-          <rd:TypeName>System.DateTime</rd:TypeName>
-        </Field>
-        <Field Name="Netto">
-          <DataField>Netto</DataField>
+        <Field Name="Suma">
+          <DataField>Suma</DataField>
           <rd:TypeName>System.Double</rd:TypeName>
         </Field>
@@ -246,32 +238,32 @@
       <Query>
         <DataSourceName>BAZA_REKLAM</DataSourceName>
-        <CommandText>select 
+        <CommandText>SELECT
+R.ReklamaID AS ReklmaID,
 K.kodKlienta as KodKilenta, 
 Z.nrZamowienia as NrZamowienia, 
 Z.kodAgenta as KodAgenta, 
 Z.rokZamowienia as RokZamowienia, 
-R.[ID Reklamy] as Reklama, 
-year([data zamówienia]) as Rok, 
-month([data zamówienia]) as Miesiac, 
-R.[data zamówienia] as Data, 
-R.Netto
-from Zamowienia as Z 
-inner join Reklama R on R.idZamowienia = Z.idZamowienia 
+R.[ID Reklamy] as Reklama,
+ROUND(COALESCE(SUM([cena jedn] - [rabat wartość]), 0), 2) AS Suma  
+FROM [ukaże się w nr] E 
+inner join Reklama R on E.ReklamaID=R.ReklamaID
+inner join NR N on E.[Nr Wydania]=N.NRW and R.[TYTUŁ] = N.TYT
+inner join Zamowienia Z ON R.idZamowienia = Z.idZamowienia
 inner join Klienci K on K.CustomerID = Z.idKlienta 
-where zafakturowano=0 
-and 
- Z.rokZamowienia = @rok
-
-and 
- month([data zamówienia])
- in (@ms) 
-
-order by [data zamówienia] desc</CommandText>
+WHERE E.zafakturowana=0
+and MONTH(N.Data_W) in (@ms) 
+and R.[symbol akwizytora] in (@agent) 
+and Z.rokZamowienia = @rok
+GROUP BY 
+R.ReklamaID, K.kodKlienta, Z.nrZamowienia, Z.kodAgenta, Z.rokZamowienia, R.[ID Reklamy]</CommandText>
         <QueryParameters>
+          <QueryParameter Name="@ms">
+            <Value>=Parameters!ms.Value</Value>
+          </QueryParameter>
+          <QueryParameter Name="@agent">
+            <Value>=Parameters!agent.Value</Value>
+          </QueryParameter>
           <QueryParameter Name="@rok">
             <Value>=Parameters!rok.Value</Value>
-          </QueryParameter>
-          <QueryParameter Name="@ms">
-            <Value>=Parameters!ms.Value</Value>
           </QueryParameter>
         </QueryParameters>
@@ -323,5 +315,5 @@
                             <PaddingBottom>2pt</PaddingBottom>
                           </Style>
-                          <ZIndex>13</ZIndex>
+                          <ZIndex>10</ZIndex>
                           <CanGrow>true</CanGrow>
                           <Value>=Fields!KodKilenta.Value + "/" + Cstr(Fields!nrZamowienia.Value) + "/" + Fields!kodAgenta.Value + "/" + CStr(Fields!RokZamowienia.Value)</Value>
@@ -340,22 +332,5 @@
                             <PaddingBottom>2pt</PaddingBottom>
                           </Style>
-                          <ZIndex>12</ZIndex>
-                          <CanGrow>true</CanGrow>
-                          <Value />
-                        </Textbox>
-                      </ReportItems>
-                    </TableCell>
-                    <TableCell>
-                      <ReportItems>
-                        <Textbox Name="textbox13">
-                          <rd:DefaultName>textbox13</rd:DefaultName>
-                          <Style>
-                            <FontWeight>700</FontWeight>
-                            <PaddingLeft>2pt</PaddingLeft>
-                            <PaddingRight>2pt</PaddingRight>
-                            <PaddingTop>2pt</PaddingTop>
-                            <PaddingBottom>2pt</PaddingBottom>
-                          </Style>
-                          <ZIndex>11</ZIndex>
+                          <ZIndex>9</ZIndex>
                           <CanGrow>true</CanGrow>
                           <Value />
@@ -375,7 +350,7 @@
                             <PaddingBottom>2pt</PaddingBottom>
                           </Style>
-                          <ZIndex>10</ZIndex>
+                          <ZIndex>8</ZIndex>
                           <CanGrow>true</CanGrow>
-                          <Value>=Sum(Fields!Netto.Value)</Value>
+                          <Value>=Sum(Fields!Suma.Value)</Value>
                         </Textbox>
                       </ReportItems>
@@ -388,5 +363,5 @@
           </TableGroup>
         </TableGroups>
-        <Width>25.81973cm</Width>
+        <Width>21.87982cm</Width>
         <Details>
           <TableRows>
@@ -395,16 +370,15 @@
                 <TableCell>
                   <ReportItems>
-                    <Textbox Name="symbol_1">
-                      <rd:DefaultName>symbol_1</rd:DefaultName>
-                      <Style>
-                        <TextAlign>Left</TextAlign>
-                        <PaddingLeft>2pt</PaddingLeft>
-                        <PaddingRight>2pt</PaddingRight>
-                        <PaddingTop>2pt</PaddingTop>
-                        <PaddingBottom>2pt</PaddingBottom>
-                      </Style>
-                      <ZIndex>4</ZIndex>
-                      <CanGrow>true</CanGrow>
-                      <Value>=Fields!KodKilenta.Value + "/" + Cstr(Fields!nrZamowienia.Value) + "/" + Fields!kodAgenta.Value + "/" + CStr(Fields!RokZamowienia.Value)</Value>
+                    <Textbox Name="textbox2">
+                      <rd:DefaultName>textbox2</rd:DefaultName>
+                      <Style>
+                        <PaddingLeft>2pt</PaddingLeft>
+                        <PaddingRight>2pt</PaddingRight>
+                        <PaddingTop>2pt</PaddingTop>
+                        <PaddingBottom>2pt</PaddingBottom>
+                      </Style>
+                      <ZIndex>3</ZIndex>
+                      <CanGrow>true</CanGrow>
+                      <Value />
                     </Textbox>
                   </ReportItems>
@@ -421,5 +395,5 @@
                         <PaddingBottom>2pt</PaddingBottom>
                       </Style>
-                      <ZIndex>3</ZIndex>
+                      <ZIndex>2</ZIndex>
                       <CanGrow>true</CanGrow>
                       <Value>=Fields!Reklama.Value</Value>
@@ -438,24 +412,7 @@
                         <PaddingBottom>2pt</PaddingBottom>
                       </Style>
-                      <ZIndex>2</ZIndex>
-                      <CanGrow>true</CanGrow>
-                      <Value>=Fields!Rok.Value</Value>
-                    </Textbox>
-                  </ReportItems>
-                </TableCell>
-                <TableCell>
-                  <ReportItems>
-                    <Textbox Name="Data">
-                      <rd:DefaultName>Data</rd:DefaultName>
-                      <Style>
-                        <TextAlign>Left</TextAlign>
-                        <PaddingLeft>2pt</PaddingLeft>
-                        <PaddingRight>2pt</PaddingRight>
-                        <PaddingTop>2pt</PaddingTop>
-                        <PaddingBottom>2pt</PaddingBottom>
-                      </Style>
                       <ZIndex>1</ZIndex>
                       <CanGrow>true</CanGrow>
-                      <Value>=Fields!Data.Value</Value>
+                      <Value>=Fields!RokZamowienia.Value</Value>
                     </Textbox>
                   </ReportItems>
@@ -473,5 +430,5 @@
                       </Style>
                       <CanGrow>true</CanGrow>
-                      <Value>=Fields!Netto.Value</Value>
+                      <Value>=Fields!Suma.Value</Value>
                     </Textbox>
                   </ReportItems>
@@ -501,5 +458,5 @@
                         <PaddingBottom>2pt</PaddingBottom>
                       </Style>
-                      <ZIndex>18</ZIndex>
+                      <ZIndex>14</ZIndex>
                       <CanGrow>true</CanGrow>
                       <Value>Zamowienie</Value>
@@ -518,5 +475,5 @@
                         <PaddingBottom>2pt</PaddingBottom>
                       </Style>
-                      <ZIndex>17</ZIndex>
+                      <ZIndex>13</ZIndex>
                       <CanGrow>true</CanGrow>
                       <Value>Reklama</Value>
@@ -535,24 +492,7 @@
                         <PaddingBottom>2pt</PaddingBottom>
                       </Style>
-                      <ZIndex>16</ZIndex>
+                      <ZIndex>12</ZIndex>
                       <CanGrow>true</CanGrow>
                       <Value>Rok</Value>
-                    </Textbox>
-                  </ReportItems>
-                </TableCell>
-                <TableCell>
-                  <ReportItems>
-                    <Textbox Name="textbox2">
-                      <rd:DefaultName>textbox2</rd:DefaultName>
-                      <Style>
-                        <TextAlign>Left</TextAlign>
-                        <PaddingLeft>2pt</PaddingLeft>
-                        <PaddingRight>2pt</PaddingRight>
-                        <PaddingTop>2pt</PaddingTop>
-                        <PaddingBottom>2pt</PaddingBottom>
-                      </Style>
-                      <ZIndex>15</ZIndex>
-                      <CanGrow>true</CanGrow>
-                      <Value>Data</Value>
                     </Textbox>
                   </ReportItems>
@@ -569,5 +509,5 @@
                         <PaddingBottom>2pt</PaddingBottom>
                       </Style>
-                      <ZIndex>14</ZIndex>
+                      <ZIndex>11</ZIndex>
                       <CanGrow>true</CanGrow>
                       <Value>Netto</Value>
@@ -593,7 +533,4 @@
             <Width>3.93991cm</Width>
           </TableColumn>
-          <TableColumn>
-            <Width>3.93991cm</Width>
-          </TableColumn>
         </TableColumns>
         <Height>3.91798cm</Height>
@@ -612,5 +549,5 @@
                         <PaddingBottom>2pt</PaddingBottom>
                       </Style>
-                      <ZIndex>9</ZIndex>
+                      <ZIndex>7</ZIndex>
                       <CanGrow>true</CanGrow>
                       <Value />
@@ -628,5 +565,5 @@
                         <PaddingBottom>2pt</PaddingBottom>
                       </Style>
-                      <ZIndex>8</ZIndex>
+                      <ZIndex>6</ZIndex>
                       <CanGrow>true</CanGrow>
                       <Value />
@@ -644,21 +581,5 @@
                         <PaddingBottom>2pt</PaddingBottom>
                       </Style>
-                      <ZIndex>7</ZIndex>
-                      <CanGrow>true</CanGrow>
-                      <Value />
-                    </Textbox>
-                  </ReportItems>
-                </TableCell>
-                <TableCell>
-                  <ReportItems>
-                    <Textbox Name="textbox8">
-                      <rd:DefaultName>textbox8</rd:DefaultName>
-                      <Style>
-                        <PaddingLeft>2pt</PaddingLeft>
-                        <PaddingRight>2pt</PaddingRight>
-                        <PaddingTop>2pt</PaddingTop>
-                        <PaddingBottom>2pt</PaddingBottom>
-                      </Style>
-                      <ZIndex>6</ZIndex>
+                      <ZIndex>5</ZIndex>
                       <CanGrow>true</CanGrow>
                       <Value />
@@ -676,5 +597,5 @@
                         <PaddingBottom>2pt</PaddingBottom>
                       </Style>
-                      <ZIndex>5</ZIndex>
+                      <ZIndex>4</ZIndex>
                       <CanGrow>true</CanGrow>
                       <Value />