Index: /branches/Abonament/BazaReklam/ZamowieniaForm.cs
===================================================================
--- /branches/Abonament/BazaReklam/ZamowieniaForm.cs (revision 878)
+++ /branches/Abonament/BazaReklam/ZamowieniaForm.cs (revision 879)
@@ -234,5 +234,4 @@
         }
 
-
         private bool CanAddProductToOrder(IProduct product, List<IProduct> products, REKLAMADataSet.zamowieniaRow order, out string errorMessage)
         {
@@ -251,4 +250,5 @@
                 canAddProduct = false;
             }
+
             if (products.FindAll(delegate(IProduct p) { return p.Vat != product.Vat && p.OrderId == order.idZamowienia; }).Count > 0)
             {
@@ -268,11 +268,20 @@
             //Sprawdz czy reklamy maja takiego samego InvoiceProviders
             //TODO: wywala sie przy dodawaniu abonamentu do zamowienia...
-            if (canAddProduct)
-            {
+            if (canAddProduct && products.Count > 0)
+            {
+/*
                 Title title1 = _titles.Find(delegate(Title title) { return title.ShortName == product.ShortName; });
                 Title title2 = _titles.Find(delegate(Title title) { return title.ShortName == product.ShortName; });
-                if (title1.InvoiceProvider != title2.InvoiceProvider)
-                {
-                    sb.AppendLine("Reklamy maj¹ ró¿nych sprzedawców. \nNa fakturze mo¿e wystêpowaæ tylko jeden sprzedawca.");
+*/
+                Title title1 = _titles.Find(delegate(Title title) { return title.Id == product.TitleId; });
+                Title title2 = _titles.Find(delegate(Title title) { return title.Id == products[0].TitleId; });
+                if (title1 == null || title2 == null)
+                {
+                    sb.AppendLine("Nie okreœlone tytu³y produktów.");
+                    canAddProduct = false;
+                }
+                else if (title1.InvoiceProvider != title2.InvoiceProvider)
+                {
+                    sb.AppendLine("Produkty maj¹ ró¿nych sprzedawców.\nNa fakturze mo¿e wystêpowaæ tylko jeden sprzedawca.");
                     canAddProduct = false;
                 }
Index: /branches/Abonament/BazaReklam/SubscriptionForm.cs
===================================================================
--- /branches/Abonament/BazaReklam/SubscriptionForm.cs (revision 760)
+++ /branches/Abonament/BazaReklam/SubscriptionForm.cs (revision 879)
@@ -39,5 +39,4 @@
             BindControls();
         }
-
 
         [Obsolete("Use ComboBoxHelper after merge from ReklamaReorganizacja branch")]
Index: /branches/Abonament/BazaReklam/ClientsForm.cs
===================================================================
--- /branches/Abonament/BazaReklam/ClientsForm.cs (revision 839)
+++ /branches/Abonament/BazaReklam/ClientsForm.cs (revision 879)
@@ -2500,6 +2500,5 @@
             List<Subscription> subscriptions = customerRepository.FindSubscriptions(klient.CustomerID);
             gridSubscriptions.AutoGenerateColumns = false;
-            gridSubscriptions.DataSource = subscriptions;
-            
+            gridSubscriptions.DataSource = subscriptions;            
         }
     }