Index: branches/Emisje/BazaReklam/OrderDetails.cs
===================================================================
--- branches/Emisje/BazaReklam/OrderDetails.cs (revision 777)
+++ branches/Emisje/BazaReklam/OrderDetails.cs (revision 778)
@@ -96,4 +96,13 @@
         }
 
+        private Bargain SelectedBargain
+        {
+            get
+            {
+                if (promocjaComboBox.SelectedItem == null) return null;
+                return (Bargain)promocjaComboBox.SelectedItem;
+            }
+        }
+
         protected REKLAMADataSet.REKLAMARow Reklama
         {
@@ -127,4 +136,10 @@
             cbLocation.ValueMember = "Id";
             cbLocation.SelectedIndex = 0;
+
+            BargainRepository bargainRepository = new BargainRepository(ConnString.getConnString().Value);
+            ComboBoxHelper.Bind(bargainRepository.FindAllActive(), promocjaComboBox);
+            promocjaComboBox.DisplayMember = "Name";
+            promocjaComboBox.ValueMember = "Id";
+            promocjaComboBox.SelectedIndex = -1;
 
             ComboBoxHelper.Bind(_titles, tYTULComboBox);
@@ -345,5 +360,5 @@
             }
 
-            if (string.IsNullOrEmpty(promocjaComboBox.Text))
+            if (SelectedBargain == null)
             {
                 DataRowView row = (DataRowView)rEKLAMABindingSource.Current;
@@ -351,5 +366,5 @@
             }
             else
-                Reklama.PROMOCJA = Convert.ToInt32(((DataRowView)promocjaComboBox.SelectedItem).Row[0]);
+                Reklama.PROMOCJA = SelectedBargain.Id;
 
             if (nowyRekord)
@@ -638,12 +653,4 @@
             }
 
-            ////lokalizacja
-            //if (sTRONATextBox.Text == "")
-            //{
-            //    MessageBox.Show("Podaj lokalizacjê.");
-            //    zATWIERDZONO_DO_DRUKUCheckBox.CheckState = CheckState.Unchecked;
-            //    return;
-            //}
-
             if (rEKLAMAUKAZESIEWNRBindingSource.List.Count != 0) return;
 
@@ -836,4 +843,6 @@
             bylyZmiany = false;
 
+            promocjaComboBox.SelectedIndex = -1;
+
             numeryReklam.Clear();
 
@@ -954,5 +963,5 @@
             {
                 index++;
-                if (item is DataRowView && Convert.ToInt32(((DataRowView)item).Row[0]) == value)
+                if (item is Bargain && Convert.ToInt32(((Bargain)item).Id) == value)
                     return index;                
             }
@@ -1724,19 +1733,5 @@
 
             if (Validate())
-            {
                 RecalculateAdSize();
-
-                //txtTotalModuleAmount.Text =
-                //    ReCaluculateModuleAmount(txtHorizontal.Text, txtVertical.Text).ToString();
-
-                //int horizontal, vertical;
-                //if (int.TryParse(txtHorizontal.Text, out horizontal) && int.TryParse(txtVertical.Text, out vertical))
-                //{
-                //    AdSize adSize = AdHelper.GetAdSize(horizontal, vertical, SelectedModule);
-
-                //    sZERTextBox.Text = adSize.Width.ToString();
-                //    wYSTextBox.Text = adSize.Height.ToString();
-                //}
-            }
         }
 
@@ -1746,20 +1741,5 @@
 
             if (Validate())
-            {
-
                 RecalculateAdSize();
-                
-                //txtTotalModuleAmount.Text =
-                //    ReCaluculateModuleAmount(txtHorizontal.Text, txtVertical.Text).ToString();
-
-                //int horizontal, vertical;
-                //if (int.TryParse(txtHorizontal.Text, out horizontal) && int.TryParse(txtVertical.Text, out vertical))
-                //{
-                //    AdSize adSize = AdHelper.GetAdSize(horizontal, vertical, SelectedModule);
-
-                //    sZERTextBox.Text = adSize.Width.ToString();
-                //    wYSTextBox.Text = adSize.Height.ToString();
-                //}
-            }
         }
 
Index: branches/Emisje/BazaReklam/Baza Reklam.csproj
===================================================================
--- branches/Emisje/BazaReklam/Baza Reklam.csproj (revision 777)
+++ branches/Emisje/BazaReklam/Baza Reklam.csproj (revision 778)
@@ -134,4 +134,5 @@
     <Compile Include="Classes\Model\AdLocation.cs" />
     <Compile Include="Classes\Model\Agent.cs" />
+    <Compile Include="Classes\Model\Bargain.cs" />
     <Compile Include="Classes\Model\Country.cs" />
     <Compile Include="Classes\Model\Dzial.cs" />
@@ -153,4 +154,5 @@
     <Compile Include="Classes\Repositories\AdLocationRepository.cs" />
     <Compile Include="Classes\Repositories\AgentRepository.cs" />
+    <Compile Include="Classes\Repositories\BargainRepository.cs" />
     <Compile Include="Classes\Repositories\CountryRepository.cs" />
     <Compile Include="Classes\Repositories\IRepository.cs" />
Index: branches/Emisje/BazaReklam/Classes/Repositories/BargainRepository.cs
===================================================================
--- branches/Emisje/BazaReklam/Classes/Repositories/BargainRepository.cs (revision 778)
+++ branches/Emisje/BazaReklam/Classes/Repositories/BargainRepository.cs (revision 778)
@@ -0,0 +1,62 @@
+using System.Collections.Generic;
+using System.Data;
+using System.Data.SqlClient;
+using Baza_Reklam.Classes.Model;
+
+namespace Baza_Reklam.Classes.Repositories
+{
+    public class BargainRepository : Repository<Bargain>
+    {
+        private readonly string _connectionString;
+
+        public BargainRepository(string connectionString)
+        {
+            _connectionString = connectionString;
+        }
+
+        public List<Bargain> FindAllActive()
+        {
+            const string query = "sp_GetAktywnePromocje";
+
+            List<Bargain> bargains = new List<Bargain>();
+
+            SqlConnection conn = null;
+            SqlCommand cmd = null;
+            SqlDataReader reader = null;
+            try
+            {
+                conn = new SqlConnection(_connectionString);
+                conn.Open();
+                cmd = new SqlCommand(query, conn);
+                cmd.CommandType = CommandType.StoredProcedure;
+                reader = cmd.ExecuteReader();
+                if (reader != null)
+                {
+                    while (reader.Read())
+                    {
+                        Bargain bargain = new Bargain();
+                        bargain.Id = reader.GetInt32(0);
+                        bargain.Name = reader.GetString(1);
+                        bargain.IsActive = true;
+                        bargains.Add(bargain);
+                    }
+                }
+            }
+            finally
+            {
+                if (reader != null)
+                {
+                    reader.Close();
+                    reader.Dispose();
+                }
+                if (cmd != null) cmd.Dispose();
+                if (conn != null)
+                {
+                    conn.Close();
+                    conn.Dispose();
+                }
+            }
+            return bargains;
+        }
+    }
+}
Index: branches/Emisje/BazaReklam/Classes/Model/Bargain.cs
===================================================================
--- branches/Emisje/BazaReklam/Classes/Model/Bargain.cs (revision 778)
+++ branches/Emisje/BazaReklam/Classes/Model/Bargain.cs (revision 778)
@@ -0,0 +1,27 @@
+namespace Baza_Reklam.Classes.Model
+{
+    public class Bargain
+    {
+        private int _id;
+        private string _name;
+        private bool _isActive;
+
+        public int Id
+        {
+            get { return _id; }
+            set { _id = value; }
+        }
+
+        public string Name
+        {
+            get { return _name; }
+            set { _name = value; }
+        }
+
+        public bool IsActive
+        {
+            get { return _isActive; }
+            set { _isActive = value; }
+        }
+    }
+}
Index: branches/Emisje/BazaReklam/OrderDetails.Designer.cs
===================================================================
--- branches/Emisje/BazaReklam/OrderDetails.Designer.cs (revision 776)
+++ branches/Emisje/BazaReklam/OrderDetails.Designer.cs (revision 778)
@@ -1238,11 +1238,8 @@
             // promocjaComboBox
             // 
-            this.promocjaComboBox.DataSource = this.pROMOCJEBindingSource;
-            this.promocjaComboBox.DisplayMember = "Nazwa";
             this.promocjaComboBox.Location = new System.Drawing.Point(286, 185);
             this.promocjaComboBox.Name = "promocjaComboBox";
             this.promocjaComboBox.Size = new System.Drawing.Size(124, 21);
             this.promocjaComboBox.TabIndex = 14;
-            this.promocjaComboBox.ValueMember = "id";
             // 
             // button3