Index: /Baza Reklam 2 - Faktury/OrderDetails.cs
===================================================================
--- /Baza Reklam 2 - Faktury/OrderDetails.cs (revision 94)
+++ /Baza Reklam 2 - Faktury/OrderDetails.cs (revision 100)
@@ -833,5 +833,5 @@
             DataView datatable = (DataView)this.rEKLAMABindingSource.List;
             DataRowView row = datatable.AddNew();
-
+           
             row["CustomerId"] = this.customerId;
             row["DATA ZAMÓWIENIA"] = DateTime.Now;
@@ -1040,4 +1040,6 @@
                 //oznaczenie ZD
                 ZDpanel.BackColor = zatwiedzonoDoDruku ? Color.LightGreen : Color.Red;
+                
+
 
                 //UPRAWnienia
@@ -1048,4 +1050,7 @@
                 if (!User.getUser().St_kierownik)
                 {
+                    cENA_JEDNTextBox.ReadOnly = zatwiedzonoDoDruku;
+                    rABATTextBox.ReadOnly = zatwiedzonoDoDruku;
+
                     if (wystawionoFakture)
                     {
Index: /Baza Reklam 2 - Faktury/AddZamowienieForm.Designer.cs
===================================================================
--- /Baza Reklam 2 - Faktury/AddZamowienieForm.Designer.cs (revision 84)
+++ /Baza Reklam 2 - Faktury/AddZamowienieForm.Designer.cs (revision 100)
@@ -270,5 +270,5 @@
             this.iD_KONTAComboBox.Size = new System.Drawing.Size(144, 21);
             this.iD_KONTAComboBox.TabIndex = 56;
-            this.iD_KONTAComboBox.ValueMember = "IdKonta";
+            this.iD_KONTAComboBox.ValueMember = "id";
             // 
             // kONTABindingSource
Index: /Baza Reklam 2 - Faktury/Classes/Utils.cs
===================================================================
--- /Baza Reklam 2 - Faktury/Classes/Utils.cs (revision 93)
+++ /Baza Reklam 2 - Faktury/Classes/Utils.cs (revision 100)
@@ -172,5 +172,5 @@
         public static int numerNowejFaktury(string tagAgenta, int year)
         {
-            string query = "select count(*) from faktury where [numer_roz]='" + tagAgenta + "' AND [numer_rok]=" + year;
+            string query = "select count(*) from faktury where korekta = 0 and [numer_roz]='" + tagAgenta + "' AND [numer_rok]=" + year;
 
             int nr = (int)ExecuteQuery(query);
@@ -259,5 +259,5 @@
         public static int numerNowejFakturyKorekty(string tagAgenta, int year)
         {
-            string query = "select count(*) from faktury where idFakturyKorekta is not null AND [numer_rok]=" + year;
+            string query = "select count(*) from faktury where korekta=1 AND [numer_rok]=" + year;
 
             int nr = (int)ExecuteQuery(query);
Index: /Baza Reklam 2 - Faktury/Raporty/zamowienie2.rdlc
===================================================================
--- /Baza Reklam 2 - Faktury/Raporty/zamowienie2.rdlc (revision 98)
+++ /Baza Reklam 2 - Faktury/Raporty/zamowienie2.rdlc (revision 100)
@@ -1297,5 +1297,5 @@
           <BorderStyle>
             <Top>Solid</Top>
-            <Bottom>Solid</Bottom>
+            <Bottom>None</Bottom>
           </BorderStyle>
           <FontSize>16pt</FontSize>
@@ -2327,12 +2327,25 @@
                       <rd:DefaultName>textbox44</rd:DefaultName>
                       <Style>
-                        <PaddingLeft>2pt</PaddingLeft>
-                        <PaddingRight>2pt</PaddingRight>
-                        <PaddingTop>2pt</PaddingTop>
-                        <PaddingBottom>2pt</PaddingBottom>
+                        <BorderColor>
+                          <Default>DimGray</Default>
+                        </BorderColor>
+                        <BorderStyle>
+                          <Default>Solid</Default>
+                        </BorderStyle>
+                        <BorderWidth>
+                          <Default>0.5pt</Default>
+                        </BorderWidth>
+                        <FontSize>8pt</FontSize>
+                        <FontWeight>700</FontWeight>
+                        <Format>C</Format>
+                        <PaddingLeft>2pt</PaddingLeft>
+                        <PaddingRight>2pt</PaddingRight>
+                        <PaddingTop>2pt</PaddingTop>
+                        <PaddingBottom>2pt</PaddingBottom>
+                        <Language>pl</Language>
                       </Style>
                       <ZIndex>17</ZIndex>
                       <CanGrow>true</CanGrow>
-                      <Value />
+                      <Value>=Sum(Fields!NETTO.Value)</Value>
                     </Textbox>
                   </ReportItems>
@@ -2343,12 +2356,25 @@
                       <rd:DefaultName>textbox45</rd:DefaultName>
                       <Style>
-                        <PaddingLeft>2pt</PaddingLeft>
-                        <PaddingRight>2pt</PaddingRight>
-                        <PaddingTop>2pt</PaddingTop>
-                        <PaddingBottom>2pt</PaddingBottom>
+                        <BorderColor>
+                          <Default>DimGray</Default>
+                        </BorderColor>
+                        <BorderStyle>
+                          <Default>Solid</Default>
+                        </BorderStyle>
+                        <BorderWidth>
+                          <Default>0.5pt</Default>
+                        </BorderWidth>
+                        <FontSize>8pt</FontSize>
+                        <FontWeight>700</FontWeight>
+                        <Format>P</Format>
+                        <PaddingLeft>2pt</PaddingLeft>
+                        <PaddingRight>2pt</PaddingRight>
+                        <PaddingTop>2pt</PaddingTop>
+                        <PaddingBottom>2pt</PaddingBottom>
+                        <Language>pl</Language>
                       </Style>
                       <ZIndex>16</ZIndex>
                       <CanGrow>true</CanGrow>
-                      <Value />
+                      <Value>=Fields!VAT.Value</Value>
                     </Textbox>
                   </ReportItems>
@@ -2359,12 +2385,25 @@
                       <rd:DefaultName>textbox46</rd:DefaultName>
                       <Style>
-                        <PaddingLeft>2pt</PaddingLeft>
-                        <PaddingRight>2pt</PaddingRight>
-                        <PaddingTop>2pt</PaddingTop>
-                        <PaddingBottom>2pt</PaddingBottom>
+                        <BorderColor>
+                          <Default>DimGray</Default>
+                        </BorderColor>
+                        <BorderStyle>
+                          <Default>Solid</Default>
+                        </BorderStyle>
+                        <BorderWidth>
+                          <Default>0.5pt</Default>
+                        </BorderWidth>
+                        <FontSize>8pt</FontSize>
+                        <FontWeight>700</FontWeight>
+                        <Format>C</Format>
+                        <PaddingLeft>2pt</PaddingLeft>
+                        <PaddingRight>2pt</PaddingRight>
+                        <PaddingTop>2pt</PaddingTop>
+                        <PaddingBottom>2pt</PaddingBottom>
+                        <Language>pl</Language>
                       </Style>
                       <ZIndex>15</ZIndex>
                       <CanGrow>true</CanGrow>
-                      <Value />
+                      <Value>=Sum(Fields!PVAT.Value)</Value>
                     </Textbox>
                   </ReportItems>
Index: /Baza Reklam 2 - Faktury/FacturesFormNEW.cs
===================================================================
--- /Baza Reklam 2 - Faktury/FacturesFormNEW.cs (revision 91)
+++ /Baza Reklam 2 - Faktury/FacturesFormNEW.cs (revision 100)
@@ -490,7 +490,6 @@
             {
                 DataRowView row = (DataRowView)VIEW_ZESTAWIENIE_FAKTUR_NOWEBindingSource.Current;
-
+                
                 int custID = Convert.ToInt32(row["ID_NABYWCY"]);
-
                 ClientsForm.getClientsForm((MDIBazaReklam)this.MdiParent).pokazKlienta(custID);
 
@@ -498,5 +497,4 @@
 
                 ClientsForm.getClientsForm((MDIBazaReklam)this.MdiParent).Show();
-
             }   
         }
@@ -512,6 +510,4 @@
                 kodRozliczeniowyToolStripTextBox.Text = User.getUser().Kod_agenta;
             }
-
-          
         }
 
@@ -538,5 +534,5 @@
                             != Convert.ToDecimal(r.Cells["sumaNettoZEmisji"].Value))
                         {
-                            r.DefaultCellStyle.ForeColor = Color.Red;
+                            r.DefaultCellStyle.ForeColor = Color.DarkSlateBlue;
                         }
                     }