Index: trunk/RaportySQL/SzacowanieSprzedazy.rdl
===================================================================
--- trunk/RaportySQL/SzacowanieSprzedazy.rdl (revision 130)
+++ trunk/RaportySQL/SzacowanieSprzedazy.rdl (revision 150)
@@ -22,5 +22,5 @@
     </ReportParameter>
     <ReportParameter Name="rok">
-      <DataType>Integer</DataType>
+      <DataType>String</DataType>
       <DefaultValue>
         <Values>
@@ -39,5 +39,5 @@
     </ReportParameter>
     <ReportParameter Name="ms">
-      <DataType>Integer</DataType>
+      <DataType>String</DataType>
       <DefaultValue>
         <Values>
@@ -207,10 +207,30 @@
     <DataSet Name="Zamowienia">
       <Fields>
-        <Field Name="symbol">
-          <DataField>Symbol</DataField>
+        <Field Name="KodKilenta">
+          <DataField>KodKilenta</DataField>
+          <rd:TypeName>System.String</rd:TypeName>
+        </Field>
+        <Field Name="nrZamowienia">
+          <DataField>NrZamowienia</DataField>
+          <rd:TypeName>System.Int32</rd:TypeName>
+        </Field>
+        <Field Name="kodAgenta">
+          <DataField>KodAgenta</DataField>
+          <rd:TypeName>System.String</rd:TypeName>
+        </Field>
+        <Field Name="RokZamowienia">
+          <DataField>RokZamowienia</DataField>
+          <rd:TypeName>System.Int32</rd:TypeName>
+        </Field>
+        <Field Name="Reklama">
+          <DataField>Reklama</DataField>
           <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>
@@ -227,13 +247,33 @@
         <DataSourceName>BAZA_REKLAM</DataSourceName>
         <CommandText>select 
-K.kodKlienta + '/' + convert(varchar, Z.nrZamowienia) + '/' + Z.kodAgenta + '/' + convert(varchar, Z.rokZamowienia)  as Symbol,
-Z.rokZamowienia as Rok,
-[data zamówienia] as Data,
-Netto
-from Zamowienia as Z
-inner join Reklama R on R.idZamowienia = Z.idZamowienia
-inner join Klienci K on K.CustomerID = Z.idKlienta
-where zafakturowano=0
+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 
+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>
+        <QueryParameters>
+          <QueryParameter Name="@rok">
+            <Value>=Parameters!rok.Value</Value>
+          </QueryParameter>
+          <QueryParameter Name="@ms">
+            <Value>=Parameters!ms.Value</Value>
+          </QueryParameter>
+        </QueryParameters>
         <rd:UseGenericDesigner>true</rd:UseGenericDesigner>
       </Query>
@@ -257,5 +297,96 @@
         <DataSetName>Zamowienia</DataSetName>
         <Top>1.75cm</Top>
-        <Width>18.81973cm</Width>
+        <TableGroups>
+          <TableGroup>
+            <Grouping Name="ZamowieniaGroup">
+              <GroupExpressions>
+                <GroupExpression>=Fields!KodKilenta.Value + "/" + Cstr(Fields!nrZamowienia.Value) + "/" + Fields!kodAgenta.Value + "/" + CStr(Fields!RokZamowienia.Value)</GroupExpression>
+              </GroupExpressions>
+            </Grouping>
+            <Header>
+              <TableRows>
+                <TableRow>
+                  <TableCells>
+                    <TableCell>
+                      <ColSpan>2</ColSpan>
+                      <ReportItems>
+                        <Textbox Name="textbox10">
+                          <rd:DefaultName>textbox10</rd:DefaultName>
+                          <ToggleImage>
+                            <InitialState>true</InitialState>
+                          </ToggleImage>
+                          <Style>
+                            <FontWeight>700</FontWeight>
+                            <PaddingLeft>2pt</PaddingLeft>
+                            <PaddingRight>2pt</PaddingRight>
+                            <PaddingTop>2pt</PaddingTop>
+                            <PaddingBottom>2pt</PaddingBottom>
+                          </Style>
+                          <ZIndex>13</ZIndex>
+                          <CanGrow>true</CanGrow>
+                          <Value>=Fields!KodKilenta.Value + "/" + Cstr(Fields!nrZamowienia.Value) + "/" + Fields!kodAgenta.Value + "/" + CStr(Fields!RokZamowienia.Value)</Value>
+                        </Textbox>
+                      </ReportItems>
+                    </TableCell>
+                    <TableCell>
+                      <ReportItems>
+                        <Textbox Name="textbox12">
+                          <rd:DefaultName>textbox12</rd:DefaultName>
+                          <Style>
+                            <FontWeight>700</FontWeight>
+                            <PaddingLeft>2pt</PaddingLeft>
+                            <PaddingRight>2pt</PaddingRight>
+                            <PaddingTop>2pt</PaddingTop>
+                            <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>
+                          <CanGrow>true</CanGrow>
+                          <Value />
+                        </Textbox>
+                      </ReportItems>
+                    </TableCell>
+                    <TableCell>
+                      <ReportItems>
+                        <Textbox Name="textbox14">
+                          <rd:DefaultName>textbox14</rd:DefaultName>
+                          <Style>
+                            <FontWeight>700</FontWeight>
+                            <TextAlign>Left</TextAlign>
+                            <PaddingLeft>2pt</PaddingLeft>
+                            <PaddingRight>2pt</PaddingRight>
+                            <PaddingTop>2pt</PaddingTop>
+                            <PaddingBottom>2pt</PaddingBottom>
+                          </Style>
+                          <ZIndex>10</ZIndex>
+                          <CanGrow>true</CanGrow>
+                          <Value>=Sum(Fields!Netto.Value)</Value>
+                        </Textbox>
+                      </ReportItems>
+                    </TableCell>
+                  </TableCells>
+                  <Height>0.63492cm</Height>
+                </TableRow>
+              </TableRows>
+            </Header>
+          </TableGroup>
+        </TableGroups>
+        <Width>25.81973cm</Width>
         <Details>
           <TableRows>
@@ -273,7 +404,24 @@
                         <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>
+                  </ReportItems>
+                </TableCell>
+                <TableCell>
+                  <ReportItems>
+                    <Textbox Name="textbox5">
+                      <rd:DefaultName>textbox5</rd:DefaultName>
+                      <Style>
+                        <TextAlign>Left</TextAlign>
+                        <PaddingLeft>2pt</PaddingLeft>
+                        <PaddingRight>2pt</PaddingRight>
+                        <PaddingTop>2pt</PaddingTop>
+                        <PaddingBottom>2pt</PaddingBottom>
+                      </Style>
                       <ZIndex>3</ZIndex>
                       <CanGrow>true</CanGrow>
-                      <Value>=Fields!symbol.Value</Value>
+                      <Value>=Fields!Reklama.Value</Value>
                     </Textbox>
                   </ReportItems>
@@ -333,4 +481,8 @@
             </TableRow>
           </TableRows>
+          <Visibility>
+            <Hidden>true</Hidden>
+            <ToggleItem>textbox10</ToggleItem>
+          </Visibility>
         </Details>
         <Header>
@@ -349,7 +501,24 @@
                         <PaddingBottom>2pt</PaddingBottom>
                       </Style>
-                      <ZIndex>11</ZIndex>
+                      <ZIndex>18</ZIndex>
                       <CanGrow>true</CanGrow>
                       <Value>Zamowienie</Value>
+                    </Textbox>
+                  </ReportItems>
+                </TableCell>
+                <TableCell>
+                  <ReportItems>
+                    <Textbox Name="textbox4">
+                      <rd:DefaultName>textbox4</rd:DefaultName>
+                      <Style>
+                        <TextAlign>Left</TextAlign>
+                        <PaddingLeft>2pt</PaddingLeft>
+                        <PaddingRight>2pt</PaddingRight>
+                        <PaddingTop>2pt</PaddingTop>
+                        <PaddingBottom>2pt</PaddingBottom>
+                      </Style>
+                      <ZIndex>17</ZIndex>
+                      <CanGrow>true</CanGrow>
+                      <Value>Reklama</Value>
                     </Textbox>
                   </ReportItems>
@@ -366,5 +535,5 @@
                         <PaddingBottom>2pt</PaddingBottom>
                       </Style>
-                      <ZIndex>10</ZIndex>
+                      <ZIndex>16</ZIndex>
                       <CanGrow>true</CanGrow>
                       <Value>Rok</Value>
@@ -383,5 +552,5 @@
                         <PaddingBottom>2pt</PaddingBottom>
                       </Style>
-                      <ZIndex>9</ZIndex>
+                      <ZIndex>15</ZIndex>
                       <CanGrow>true</CanGrow>
                       <Value>Data</Value>
@@ -400,5 +569,5 @@
                         <PaddingBottom>2pt</PaddingBottom>
                       </Style>
-                      <ZIndex>8</ZIndex>
+                      <ZIndex>14</ZIndex>
                       <CanGrow>true</CanGrow>
                       <Value>Netto</Value>
@@ -412,4 +581,7 @@
         </Header>
         <TableColumns>
+          <TableColumn>
+            <Width>7cm</Width>
+          </TableColumn>
           <TableColumn>
             <Width>7cm</Width>
@@ -425,5 +597,5 @@
           </TableColumn>
         </TableColumns>
-        <Height>3.28307cm</Height>
+        <Height>3.91798cm</Height>
         <Footer>
           <TableRows>
@@ -440,5 +612,21 @@
                         <PaddingBottom>2pt</PaddingBottom>
                       </Style>
-                      <ZIndex>7</ZIndex>
+                      <ZIndex>9</ZIndex>
+                      <CanGrow>true</CanGrow>
+                      <Value />
+                    </Textbox>
+                  </ReportItems>
+                </TableCell>
+                <TableCell>
+                  <ReportItems>
+                    <Textbox Name="textbox6">
+                      <rd:DefaultName>textbox6</rd:DefaultName>
+                      <Style>
+                        <PaddingLeft>2pt</PaddingLeft>
+                        <PaddingRight>2pt</PaddingRight>
+                        <PaddingTop>2pt</PaddingTop>
+                        <PaddingBottom>2pt</PaddingBottom>
+                      </Style>
+                      <ZIndex>8</ZIndex>
                       <CanGrow>true</CanGrow>
                       <Value />
@@ -456,5 +644,5 @@
                         <PaddingBottom>2pt</PaddingBottom>
                       </Style>
-                      <ZIndex>6</ZIndex>
+                      <ZIndex>7</ZIndex>
                       <CanGrow>true</CanGrow>
                       <Value />
@@ -472,5 +660,5 @@
                         <PaddingBottom>2pt</PaddingBottom>
                       </Style>
-                      <ZIndex>5</ZIndex>
+                      <ZIndex>6</ZIndex>
                       <CanGrow>true</CanGrow>
                       <Value />
@@ -488,5 +676,5 @@
                         <PaddingBottom>2pt</PaddingBottom>
                       </Style>
-                      <ZIndex>4</ZIndex>
+                      <ZIndex>5</ZIndex>
                       <CanGrow>true</CanGrow>
                       <Value />
@@ -525,5 +713,5 @@
       </Textbox>
     </ReportItems>
-    <Height>5.9246cm</Height>
+    <Height>6.3029cm</Height>
   </Body>
   <Language>en-US</Language>