From 98e1e1df30a99621f46756223d0c05ceda405c92 Mon Sep 17 00:00:00 2001
From: unknown <tanshu@.(none)>
Date: Sat, 22 Jan 2011 18:08:30 +0530
Subject: [PATCH] Item Modifier added

---
 Tanshu.Accounts.BI/ModifierBI.cs              | 70 +++++++++++++++
 Tanshu.Accounts.BI/ProductBI.cs               | 24 ++---
 .../{ProductTypeBI.cs => ProductGroupBI.cs}   | 32 +++----
 Tanshu.Accounts.BI/ProductGroupModifierBI.cs  | 81 +++++++++++++++++
 Tanshu.Accounts.BI/Tanshu.Accounts.BI.csproj  |  4 +-
 .../DAOFactory/ModifierDAO.cs                 | 15 ++++
 .../DAOFactory/ProductGroupDAO.cs             | 17 ++++
 .../DAOFactory/ProductGroupModifierDAO.cs     | 16 ++++
 .../DAOFactory/ProductTypeDAO.cs              | 17 ----
 .../Data Contracts/ComplexProductBO.cs        | 28 ------
 .../Data Contracts/ModifierBO.cs              | 10 +++
 .../Data Contracts/ProductBO.cs               |  2 +-
 .../Data Contracts/ProductDisplayBO.cs        |  2 +-
 .../Data Contracts/ProductGroupBO.cs          | 13 +++
 .../Data Contracts/ProductGroupModifierBO.cs  | 13 +++
 .../Data Contracts/ProductTypeBO.cs           | 22 -----
 .../Service Contracts/ProductBI.cs            | 21 -----
 .../Service Contracts/ProductGroupBI.cs       | 18 ++++
 .../Service Contracts/ProductTypesBI.cs       | 19 ----
 .../Tanshu.Accounts.Contracts.csproj          | 12 +--
 Tanshu.Accounts.DAOFactory/DAOFactory.cs      |  4 +-
 .../SqlServerDAOFactory.cs                    | 14 ++-
 Tanshu.Accounts.Helpers/ControlFactory.cs     | 48 ++++++++--
 Tanshu.Accounts.PointOfSale/App.config        |  2 +-
 .../Controllers/BillController.cs             | 17 ++++
 .../Controllers/ISaleForm.cs                  |  1 +
 Tanshu.Accounts.PointOfSale/MainForm.cs       |  2 +-
 .../ProductsForm.Designer.cs                  |  2 +-
 Tanshu.Accounts.PointOfSale/ProductsForm.cs   | 20 ++---
 .../Sales/SalesForm.cs                        | 23 +++--
 .../Updates/UpdateForm.Designer.cs            | 51 ++++++++---
 .../Updates/UpdateForm.cs                     |  2 +
 .../Updates/UpdateSales.Designer.cs           | 55 ++++++------
 .../Updates/UpdateSales.cs                    |  2 +
 Tanshu.Accounts.Print/Thermal.cs              |  2 +-
 Tanshu.Accounts.SqlDAO/MembershipDAO.cs       | 20 ++---
 Tanshu.Accounts.SqlDAO/ModifierDAO.cs         | 52 +++++++++++
 Tanshu.Accounts.SqlDAO/ProductDAO.cs          | 24 ++---
 .../ProductGroupModifierDAO.cs                | 89 +++++++++++++++++++
 Tanshu.Accounts.SqlDAO/ProductTypeDAO.cs      | 68 ++++++--------
 .../Tanshu.Accounts.SqlDAO.csproj             |  2 +
 Tanshu.Accounts.SqlDAO/UserDAO.cs             | 22 ++---
 42 files changed, 674 insertions(+), 284 deletions(-)
 create mode 100644 Tanshu.Accounts.BI/ModifierBI.cs
 rename Tanshu.Accounts.BI/{ProductTypeBI.cs => ProductGroupBI.cs} (58%)
 create mode 100644 Tanshu.Accounts.BI/ProductGroupModifierBI.cs
 create mode 100644 Tanshu.Accounts.Contracts/DAOFactory/ModifierDAO.cs
 create mode 100644 Tanshu.Accounts.Contracts/DAOFactory/ProductGroupDAO.cs
 create mode 100644 Tanshu.Accounts.Contracts/DAOFactory/ProductGroupModifierDAO.cs
 delete mode 100644 Tanshu.Accounts.Contracts/DAOFactory/ProductTypeDAO.cs
 delete mode 100644 Tanshu.Accounts.Contracts/Data Contracts/ComplexProductBO.cs
 create mode 100644 Tanshu.Accounts.Contracts/Data Contracts/ModifierBO.cs
 create mode 100644 Tanshu.Accounts.Contracts/Data Contracts/ProductGroupBO.cs
 create mode 100644 Tanshu.Accounts.Contracts/Data Contracts/ProductGroupModifierBO.cs
 delete mode 100644 Tanshu.Accounts.Contracts/Data Contracts/ProductTypeBO.cs
 delete mode 100644 Tanshu.Accounts.Contracts/Service Contracts/ProductBI.cs
 create mode 100644 Tanshu.Accounts.Contracts/Service Contracts/ProductGroupBI.cs
 delete mode 100644 Tanshu.Accounts.Contracts/Service Contracts/ProductTypesBI.cs
 create mode 100644 Tanshu.Accounts.SqlDAO/ModifierDAO.cs
 create mode 100644 Tanshu.Accounts.SqlDAO/ProductGroupModifierDAO.cs

diff --git a/Tanshu.Accounts.BI/ModifierBI.cs b/Tanshu.Accounts.BI/ModifierBI.cs
new file mode 100644
index 0000000..9f21888
--- /dev/null
+++ b/Tanshu.Accounts.BI/ModifierBI.cs
@@ -0,0 +1,70 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading;
+using Tanshu.Accounts.DAOFactory;
+using Tanshu.Data.DAO;
+using Tanshu.Accounts.Contracts;
+
+namespace Tanshu.Accounts.BI
+{
+    public static class ModifierBI
+    {
+        public static void Insert(ModifierBO modifier)
+        {
+            GetFactory factory = GetFactory.GetDAOFactory(Database.GetFactoryType);
+            using (IConnectionDAO connection = factory.Connection)
+            {
+                using (IModifierDAO dao = factory.GetModifierDAO(connection))
+                {
+                    dao.Insert(modifier);
+                }
+            }
+        }
+        //public void Update(ModifierBO modifier)
+        //{
+        //    GetFactory factory = GetFactory.GetDAOFactory(Database.GetFactoryType);
+        //    using (IConnectionDAO connection = factory.Connection)
+        //    {
+        //        using (var dao = factory.GetModifierDAO(connection))
+        //        {
+        //            dao.Update(modifier);
+        //        }
+        //    }
+        //}
+        public static void Delete(string modifierID)
+        {
+            GetFactory factory = GetFactory.GetDAOFactory(Database.GetFactoryType);
+            using (IConnectionDAO connection = factory.Connection)
+            {
+                using (IModifierDAO dao = factory.GetModifierDAO(connection))
+                {
+                    dao.Delete(modifierID);
+                }
+            }
+        }
+        public static ModifierBO GetModifier(string modifierID)
+        {
+            GetFactory factory = GetFactory.GetDAOFactory(Database.GetFactoryType);
+            using (IConnectionDAO connection = factory.Connection)
+            {
+                using (IModifierDAO dao = factory.GetModifierDAO(connection))
+                {
+                    return dao.GetModifier(modifierID);
+                }
+            }
+        }
+        public static List<ModifierBO> GetModifiers()
+        {
+            GetFactory factory = GetFactory.GetDAOFactory(Database.GetFactoryType);
+            using (IConnectionDAO connection = factory.Connection)
+            {
+                using (IModifierDAO dao = factory.GetModifierDAO(connection))
+                {
+                    return dao.GetModifiers();
+                }
+            }
+        }
+    }
+}
diff --git a/Tanshu.Accounts.BI/ProductBI.cs b/Tanshu.Accounts.BI/ProductBI.cs
index 37a42d2..0b0b0c5 100644
--- a/Tanshu.Accounts.BI/ProductBI.cs
+++ b/Tanshu.Accounts.BI/ProductBI.cs
@@ -8,9 +8,9 @@ using Tanshu.Data.DAO;
 
 namespace Tanshu.Accounts.BI
 {
-    public class ProductBI : IProductBI
+    public static class ProductBI
     {
-        public bool Insert(ProductBO product)
+        public static bool Insert(ProductBO product)
         {
             GetFactory factory = GetFactory.GetDAOFactory(Database.GetFactoryType);
             using (IConnectionDAO connection = factory.Connection)
@@ -21,7 +21,7 @@ namespace Tanshu.Accounts.BI
                 }
             }
         }
-        public bool Update(ProductBO product)
+        public static bool Update(ProductBO product)
         {
             GetFactory factory = GetFactory.GetDAOFactory(Database.GetFactoryType);
             using (IConnectionDAO connection = factory.Connection)
@@ -32,7 +32,7 @@ namespace Tanshu.Accounts.BI
                 }
             }
         }
-        public bool Delete(Guid productID)
+        public static bool Delete(Guid productID)
         {
             GetFactory factory = GetFactory.GetDAOFactory(Database.GetFactoryType);
             using (IConnectionDAO connection = factory.Connection)
@@ -43,7 +43,7 @@ namespace Tanshu.Accounts.BI
                 }
             }
         }
-        public ProductBO GetProductFromName(string nameAndUnits)
+        public static ProductBO GetProductFromName(string nameAndUnits)
         {
             GetFactory factory = GetFactory.GetDAOFactory(Database.GetFactoryType);
             using (IConnectionDAO connection = factory.Connection)
@@ -54,7 +54,7 @@ namespace Tanshu.Accounts.BI
                 }
             }
         }
-        public ProductBO GetProduct(Guid productID)
+        public static ProductBO GetProduct(Guid productID)
         {
             GetFactory factory = GetFactory.GetDAOFactory(Database.GetFactoryType);
             using (IConnectionDAO connection = factory.Connection)
@@ -65,7 +65,7 @@ namespace Tanshu.Accounts.BI
                 }
             }
         }
-        public decimal GetProductStock(DateTime date, Guid productID, Guid? voucherID)
+        public static decimal GetProductStock(DateTime date, Guid productID, Guid? voucherID)
         {
             GetFactory factory = GetFactory.GetDAOFactory(Database.GetFactoryType);
             using (IConnectionDAO connection = factory.Connection)
@@ -76,7 +76,7 @@ namespace Tanshu.Accounts.BI
                 }
             }
         }
-        public List<ProductDisplayBO> GetProducts()
+        public static List<ProductDisplayBO> GetProducts()
         {
             GetFactory factory = GetFactory.GetDAOFactory(Database.GetFactoryType);
             using (IConnectionDAO connection = factory.Connection)
@@ -88,7 +88,7 @@ namespace Tanshu.Accounts.BI
             }
         }
 
-        public List<ProductDisplaySmallBO> GetFilteredProducts(Dictionary<string, string> filter)
+        public static List<ProductDisplaySmallBO> GetFilteredProducts(Dictionary<string, string> filter)
         {
             GetFactory factory = GetFactory.GetDAOFactory(Database.GetFactoryType);
             using (IConnectionDAO connection = factory.Connection)
@@ -100,7 +100,7 @@ namespace Tanshu.Accounts.BI
             }
         }
 
-        public void UpdateShortName()
+        public static void UpdateShortName()
         {
             GetFactory factory = GetFactory.GetDAOFactory(Database.GetFactoryType);
             using (IConnectionDAO connection = factory.Connection)
@@ -112,14 +112,14 @@ namespace Tanshu.Accounts.BI
             }
         }
 
-        public List<ProductDisplaySmallBO> GetUnFilteredProducts()
+        public static List<ProductDisplaySmallBO> GetUnFilteredProducts()
         {
             Dictionary<string, string> filter = new Dictionary<string, string>();
             filter.Add("Name", "");
             filter.Add("Type", "");
             return GetFilteredProducts(filter);
         }
-        public List<ProductDisplaySmallBO> GetProducts(Guid productTypeID)
+        public static List<ProductDisplaySmallBO> GetProducts(Guid productTypeID)
         {
             GetFactory factory = GetFactory.GetDAOFactory(Database.GetFactoryType);
             using (IConnectionDAO connection = factory.Connection)
diff --git a/Tanshu.Accounts.BI/ProductTypeBI.cs b/Tanshu.Accounts.BI/ProductGroupBI.cs
similarity index 58%
rename from Tanshu.Accounts.BI/ProductTypeBI.cs
rename to Tanshu.Accounts.BI/ProductGroupBI.cs
index e13624d..c2126c5 100644
--- a/Tanshu.Accounts.BI/ProductTypeBI.cs
+++ b/Tanshu.Accounts.BI/ProductGroupBI.cs
@@ -8,60 +8,60 @@ using Tanshu.Data.DAO;
 
 namespace Tanshu.Accounts.BI
 {
-    public class ProductTypeBI : IProductTypeBI
+    public class ProductGroupBI : IProductGroupBI
     {
-        public ProductTypeBO GetProductType(Guid productTypeID)
+        public ProductGroupBO GetProductGroup(Guid productGroupID)
         {
             GetFactory factory = GetFactory.GetDAOFactory(Database.GetFactoryType);
             using (IConnectionDAO connection = factory.Connection)
             {
-                using (var dao = factory.GetProductTypeDAO(connection))
+                using (var dao = factory.GetProductGroupDAO(connection))
                 {
-                    return dao.GetProductType(productTypeID);
+                    return dao.GetProductGroup(productGroupID);
                 }
             }
         }
-        public ProductTypeBO GetProductTypeByName(string name)
+        public ProductGroupBO GetProductGroupByName(string name)
         {
             GetFactory factory = GetFactory.GetDAOFactory(Database.GetFactoryType);
             using (IConnectionDAO connection = factory.Connection)
             {
-                using (var dao = factory.GetProductTypeDAO(connection))
+                using (var dao = factory.GetProductGroupDAO(connection))
                 {
-                    return dao.GetProductType(name);
+                    return dao.GetProductGroup(name);
                 }
             }
         }
-        public bool Insert(ProductTypeBO productType)
+        public bool Insert(ProductGroupBO productGroup)
         {
             GetFactory factory = GetFactory.GetDAOFactory(Database.GetFactoryType);
             using (IConnectionDAO connection = factory.Connection)
             {
-                using (var dao = factory.GetProductTypeDAO(connection))
+                using (var dao = factory.GetProductGroupDAO(connection))
                 {
-                    return dao.Insert(productType);
+                    return dao.Insert(productGroup);
                 }
             }
         }
-        public bool Update(ProductTypeBO productType)
+        public bool Update(ProductGroupBO productGroup)
         {
             GetFactory factory = GetFactory.GetDAOFactory(Database.GetFactoryType);
             using (IConnectionDAO connection = factory.Connection)
             {
-                using (var dao = factory.GetProductTypeDAO(connection))
+                using (var dao = factory.GetProductGroupDAO(connection))
                 {
-                    return dao.Update(productType);
+                    return dao.Update(productGroup);
                 }
             }
         }
-        public List<ProductTypeBO> GetProductTypes()
+        public List<ProductGroupBO> GetProductGroups()
         {
             GetFactory factory = GetFactory.GetDAOFactory(Database.GetFactoryType);
             using (IConnectionDAO connection = factory.Connection)
             {
-                using (var dao = factory.GetProductTypeDAO(connection))
+                using (var dao = factory.GetProductGroupDAO(connection))
                 {
-                    return dao.GetProductTypes();
+                    return dao.GetProductGroups();
                 }
             }
         }
diff --git a/Tanshu.Accounts.BI/ProductGroupModifierBI.cs b/Tanshu.Accounts.BI/ProductGroupModifierBI.cs
new file mode 100644
index 0000000..8f3d695
--- /dev/null
+++ b/Tanshu.Accounts.BI/ProductGroupModifierBI.cs
@@ -0,0 +1,81 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using Tanshu.Accounts.Contracts;
+using Tanshu.Accounts.DAOFactory;
+using System.Data.SqlClient;
+using Tanshu.Data.DAO;
+
+namespace Tanshu.Accounts.BI
+{
+    public static class ProductGroupModifierBI
+    {
+        public static bool Insert(ProductGroupModifierBO productGroupModifier)
+        {
+            GetFactory factory = GetFactory.GetDAOFactory(Database.GetFactoryType);
+            using (IConnectionDAO connection = factory.Connection)
+            {
+                using (IProductGroupModifierDAO dao = factory.GetProductGroupModifierDAO(connection))
+                {
+                    return dao.Insert(productGroupModifier);
+                }
+            }
+        }
+        public static bool Update(ProductGroupModifierBO productGroupModifier)
+        {
+            GetFactory factory = GetFactory.GetDAOFactory(Database.GetFactoryType);
+            using (IConnectionDAO connection = factory.Connection)
+            {
+                using (IProductGroupModifierDAO dao = factory.GetProductGroupModifierDAO(connection))
+                {
+                    return dao.Update(productGroupModifier);
+                }
+            }
+        }
+        public static bool Delete(int productGroupModifierID)
+        {
+            GetFactory factory = GetFactory.GetDAOFactory(Database.GetFactoryType);
+            using (IConnectionDAO connection = factory.Connection)
+            {
+                using (IProductGroupModifierDAO dao = factory.GetProductGroupModifierDAO(connection))
+                {
+                    return dao.Delete(productGroupModifierID);
+                }
+            }
+        }
+        public static List<ProductGroupModifierBO> GetProductGroupModifiers()
+        {
+            GetFactory factory = GetFactory.GetDAOFactory(Database.GetFactoryType);
+            using (IConnectionDAO connection = factory.Connection)
+            {
+                using (IProductGroupModifierDAO dao = factory.GetProductGroupModifierDAO(connection))
+                {
+                    return dao.GetProductGroupModifiers();
+                }
+            }
+        }
+
+        public static List<ProductGroupModifierBO> GetProductGroupModifiers(Guid productGroupID)
+        {
+            GetFactory factory = GetFactory.GetDAOFactory(Database.GetFactoryType);
+            using (IConnectionDAO connection = factory.Connection)
+            {
+                using (IProductGroupModifierDAO dao = factory.GetProductGroupModifierDAO(connection))
+                {
+                    return dao.GetProductGroupModifiers(productGroupID);
+                }
+            }
+        }
+        public static bool HasCompulsoryModifier(Guid productGroupID)
+        {
+            GetFactory factory = GetFactory.GetDAOFactory(Database.GetFactoryType);
+            using (IConnectionDAO connection = factory.Connection)
+            {
+                using (IProductGroupModifierDAO dao = factory.GetProductGroupModifierDAO(connection))
+                {
+                    return dao.HasCompulsoryModifier(productGroupID);
+                }
+            }
+        }
+    }
+}
diff --git a/Tanshu.Accounts.BI/Tanshu.Accounts.BI.csproj b/Tanshu.Accounts.BI/Tanshu.Accounts.BI.csproj
index cb24d68..0c68bb6 100644
--- a/Tanshu.Accounts.BI/Tanshu.Accounts.BI.csproj
+++ b/Tanshu.Accounts.BI/Tanshu.Accounts.BI.csproj
@@ -64,9 +64,11 @@
   <ItemGroup>
     <Compile Include="AdvanceBI.cs" />
     <Compile Include="CheckoutBI.cs" />
+    <Compile Include="ProductGroupModifierBI.cs" />
+    <Compile Include="ModifierBI.cs" />
     <Compile Include="PrintLocationBI.cs" />
     <Compile Include="FoodTableBI.cs" />
-    <Compile Include="ProductTypeBI.cs" />
+    <Compile Include="ProductGroupBI.cs" />
     <Compile Include="CustomerBI.cs" />
     <Compile Include="ManagementBI.cs" />
     <Compile Include="RoleBI.cs" />
diff --git a/Tanshu.Accounts.Contracts/DAOFactory/ModifierDAO.cs b/Tanshu.Accounts.Contracts/DAOFactory/ModifierDAO.cs
new file mode 100644
index 0000000..b4f382a
--- /dev/null
+++ b/Tanshu.Accounts.Contracts/DAOFactory/ModifierDAO.cs
@@ -0,0 +1,15 @@
+using System;
+using System.Collections.Generic;
+using Tanshu.Accounts.Contracts;
+
+namespace Tanshu.Accounts.DAOFactory
+{
+    public interface IModifierDAO : IDisposable
+    {
+        void Insert(ModifierBO modifier);
+        //void Update(ModifierBO modifier);
+        void Delete(string modifierID);
+        ModifierBO GetModifier(string modifierID);
+        List<ModifierBO> GetModifiers();
+    }
+}
\ No newline at end of file
diff --git a/Tanshu.Accounts.Contracts/DAOFactory/ProductGroupDAO.cs b/Tanshu.Accounts.Contracts/DAOFactory/ProductGroupDAO.cs
new file mode 100644
index 0000000..106f6fc
--- /dev/null
+++ b/Tanshu.Accounts.Contracts/DAOFactory/ProductGroupDAO.cs
@@ -0,0 +1,17 @@
+using System;
+using System.Collections.Generic;
+using Tanshu.Accounts.Contracts;
+
+namespace Tanshu.Accounts.DAOFactory
+{
+    public interface IProductGroupDAO : IDisposable
+    {
+        bool Insert(ProductGroupBO productType);
+        ProductGroupBO GetProductGroup(Guid productGroupID);
+        ProductGroupBO GetProductGroup(string name);
+        bool Delete(Guid productGroupID);
+        bool Update(ProductGroupBO productGroup);
+        List<ProductGroupBO> GetProductGroups();
+
+    }
+}
diff --git a/Tanshu.Accounts.Contracts/DAOFactory/ProductGroupModifierDAO.cs b/Tanshu.Accounts.Contracts/DAOFactory/ProductGroupModifierDAO.cs
new file mode 100644
index 0000000..4b1cb96
--- /dev/null
+++ b/Tanshu.Accounts.Contracts/DAOFactory/ProductGroupModifierDAO.cs
@@ -0,0 +1,16 @@
+using System;
+using System.Collections.Generic;
+using Tanshu.Accounts.Contracts;
+
+namespace Tanshu.Accounts.DAOFactory
+{
+    public interface IProductGroupModifierDAO : IDisposable
+    {
+        bool Insert(ProductGroupModifierBO productGroupModifier);
+        bool Delete(int productGroupModifierID);
+        bool Update(ProductGroupModifierBO productGroupModifier);
+        List<ProductGroupModifierBO> GetProductGroupModifiers(Guid productGroupID);
+        List<ProductGroupModifierBO> GetProductGroupModifiers();
+        bool HasCompulsoryModifier(Guid productGroupID);
+    }
+}
diff --git a/Tanshu.Accounts.Contracts/DAOFactory/ProductTypeDAO.cs b/Tanshu.Accounts.Contracts/DAOFactory/ProductTypeDAO.cs
deleted file mode 100644
index 590a84e..0000000
--- a/Tanshu.Accounts.Contracts/DAOFactory/ProductTypeDAO.cs
+++ /dev/null
@@ -1,17 +0,0 @@
-using System;
-using System.Collections.Generic;
-using Tanshu.Accounts.Contracts;
-
-namespace Tanshu.Accounts.DAOFactory
-{
-    public interface IProductTypeDAO : IDisposable
-    {
-        bool Insert(ProductTypeBO productType);
-        ProductTypeBO GetProductType(Guid productTypeID);
-        ProductTypeBO GetProductType(string name);
-        bool Delete(Guid productTypeID);
-        bool Update(ProductTypeBO productType);
-        List<ProductTypeBO> GetProductTypes();
-
-    }
-}
diff --git a/Tanshu.Accounts.Contracts/Data Contracts/ComplexProductBO.cs b/Tanshu.Accounts.Contracts/Data Contracts/ComplexProductBO.cs
deleted file mode 100644
index 7f70ad2..0000000
--- a/Tanshu.Accounts.Contracts/Data Contracts/ComplexProductBO.cs	
+++ /dev/null
@@ -1,28 +0,0 @@
-using System;
-using System.Runtime.Serialization;
-
-namespace Tanshu.Accounts.Contracts
-{
-    [DataContract]
-    public class ComplexProductBO
-    {
-        [DataMember]
-        public Guid ComplexProductID { get; set; }
-        [DataMember]
-        public Guid ProductID { get; set; }
-        [DataMember]
-        public int Code { get; set; }
-        [DataMember]
-        public string Name { get; set; }
-        [DataMember]
-        public string Units { get; set; }
-        [DataMember]
-        public decimal SalePrice { get; set; }
-        [DataMember]
-        public Guid SaleTaxID { get; set; }
-        [DataMember]
-        public decimal Quantity { get; set; }
-        [DataMember]
-        public byte[] timestamp { get; set; }
-    }
-}
diff --git a/Tanshu.Accounts.Contracts/Data Contracts/ModifierBO.cs b/Tanshu.Accounts.Contracts/Data Contracts/ModifierBO.cs
new file mode 100644
index 0000000..7c6ea60
--- /dev/null
+++ b/Tanshu.Accounts.Contracts/Data Contracts/ModifierBO.cs	
@@ -0,0 +1,10 @@
+using System;
+using System.Runtime.Serialization;
+
+namespace Tanshu.Accounts.Contracts
+{
+    public class ModifierBO
+    {
+        public string ModifierID { get; set; }
+    }
+}
diff --git a/Tanshu.Accounts.Contracts/Data Contracts/ProductBO.cs b/Tanshu.Accounts.Contracts/Data Contracts/ProductBO.cs
index da4163d..e378387 100644
--- a/Tanshu.Accounts.Contracts/Data Contracts/ProductBO.cs	
+++ b/Tanshu.Accounts.Contracts/Data Contracts/ProductBO.cs	
@@ -15,7 +15,7 @@ namespace Tanshu.Accounts.Contracts
         [DataMember]
         public string Units { get; set; }
         [DataMember]
-        public Guid ProductTypeID { get; set; }
+        public Guid ProductGroupID { get; set; }
         [DataMember]
         public Guid SaleLedgerID { get; set; }
         [DataMember]
diff --git a/Tanshu.Accounts.Contracts/Data Contracts/ProductDisplayBO.cs b/Tanshu.Accounts.Contracts/Data Contracts/ProductDisplayBO.cs
index 330ae33..4f630e4 100644
--- a/Tanshu.Accounts.Contracts/Data Contracts/ProductDisplayBO.cs	
+++ b/Tanshu.Accounts.Contracts/Data Contracts/ProductDisplayBO.cs	
@@ -9,6 +9,6 @@ namespace Tanshu.Accounts.Contracts
         [DataMember]
         public decimal Price { get; set; }
         [DataMember]
-        public string Type { get; set; }
+        public string Group { get; set; }
     }
 }
diff --git a/Tanshu.Accounts.Contracts/Data Contracts/ProductGroupBO.cs b/Tanshu.Accounts.Contracts/Data Contracts/ProductGroupBO.cs
new file mode 100644
index 0000000..de40ba3
--- /dev/null
+++ b/Tanshu.Accounts.Contracts/Data Contracts/ProductGroupBO.cs	
@@ -0,0 +1,13 @@
+using System;
+using System.Runtime.Serialization;
+
+namespace Tanshu.Accounts.Contracts
+{
+    public class ProductGroupBO
+    {
+        public Guid ProductGroupID { get; set; }
+        public string Name { get; set; }
+        public decimal DiscountLimit { get; set; }
+        public bool IsModifierCompulsory { get; set; }
+    }
+}
diff --git a/Tanshu.Accounts.Contracts/Data Contracts/ProductGroupModifierBO.cs b/Tanshu.Accounts.Contracts/Data Contracts/ProductGroupModifierBO.cs
new file mode 100644
index 0000000..7bc7c93
--- /dev/null
+++ b/Tanshu.Accounts.Contracts/Data Contracts/ProductGroupModifierBO.cs	
@@ -0,0 +1,13 @@
+using System;
+using System.Runtime.Serialization;
+
+namespace Tanshu.Accounts.Contracts
+{
+    public class ProductGroupModifierBO
+    {
+        public virtual int ProductGroupModifierID { get; set; }
+        public virtual Guid? ProductGroupID { get; set; }
+        public virtual string ModifierID { get; set; }
+        public virtual bool ShowAutomatically { get; set; }
+    }
+}
diff --git a/Tanshu.Accounts.Contracts/Data Contracts/ProductTypeBO.cs b/Tanshu.Accounts.Contracts/Data Contracts/ProductTypeBO.cs
deleted file mode 100644
index 2a9252e..0000000
--- a/Tanshu.Accounts.Contracts/Data Contracts/ProductTypeBO.cs	
+++ /dev/null
@@ -1,22 +0,0 @@
-using System;
-using System.Runtime.Serialization;
-
-namespace Tanshu.Accounts.Contracts
-{
-    [DataContract]
-    public class ProductTypeBO
-    {
-        [DataMember]
-        public Guid ProductTypeID { get; set; }
-        [DataMember]
-        public string Name { get; set; }
-        [DataMember]
-        public decimal DiscountLimit { get; set; }
-        [DataMember]
-        public bool IsForSale { get; set; }
-        [DataMember]
-        public bool IsForPurchae { get; set; }
-        [DataMember]
-        public byte[] timestamp { get; set; }
-    }
-}
diff --git a/Tanshu.Accounts.Contracts/Service Contracts/ProductBI.cs b/Tanshu.Accounts.Contracts/Service Contracts/ProductBI.cs
deleted file mode 100644
index a0b319f..0000000
--- a/Tanshu.Accounts.Contracts/Service Contracts/ProductBI.cs	
+++ /dev/null
@@ -1,21 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.ServiceModel;
-using System.Data.SqlClient;
-
-namespace Tanshu.Accounts.Contracts
-{
-    public interface IProductBI
-    {
-        bool Insert(ProductBO product);
-        bool Update(ProductBO product);
-        bool Delete(Guid productID);
-        ProductBO GetProductFromName(string nameAndUnits);
-        ProductBO GetProduct(Guid productID);
-        decimal GetProductStock(DateTime date, Guid productID, Guid? voucherID);
-        List<ProductDisplayBO> GetProducts();
-        List<ProductDisplaySmallBO> GetFilteredProducts(Dictionary<string, string> filter);
-        List<ProductDisplaySmallBO> GetProducts(Guid productTypeID);
-    }
-}
diff --git a/Tanshu.Accounts.Contracts/Service Contracts/ProductGroupBI.cs b/Tanshu.Accounts.Contracts/Service Contracts/ProductGroupBI.cs
new file mode 100644
index 0000000..5ea2f35
--- /dev/null
+++ b/Tanshu.Accounts.Contracts/Service Contracts/ProductGroupBI.cs	
@@ -0,0 +1,18 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.ServiceModel;
+
+using System.Data.SqlClient;
+
+namespace Tanshu.Accounts.Contracts
+{
+    public interface IProductGroupBI
+    {
+        ProductGroupBO GetProductGroup(Guid productGroupID);
+        ProductGroupBO GetProductGroupByName(string name);
+        bool Insert(ProductGroupBO productGroup);
+        bool Update(ProductGroupBO productGroup);
+        List<ProductGroupBO> GetProductGroups();
+    }
+}
diff --git a/Tanshu.Accounts.Contracts/Service Contracts/ProductTypesBI.cs b/Tanshu.Accounts.Contracts/Service Contracts/ProductTypesBI.cs
deleted file mode 100644
index 83aa989..0000000
--- a/Tanshu.Accounts.Contracts/Service Contracts/ProductTypesBI.cs	
+++ /dev/null
@@ -1,19 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.ServiceModel;
-
-using System.Data.SqlClient;
-
-namespace Tanshu.Accounts.Contracts
-{
-    public interface IProductTypeBI
-    {
-        ProductTypeBO GetProductType(Guid productTypeID);
-
-        ProductTypeBO GetProductTypeByName(string name);
-        bool Insert(ProductTypeBO productType);
-        bool Update(ProductTypeBO productType);
-        List<ProductTypeBO> GetProductTypes();
-    }
-}
diff --git a/Tanshu.Accounts.Contracts/Tanshu.Accounts.Contracts.csproj b/Tanshu.Accounts.Contracts/Tanshu.Accounts.Contracts.csproj
index 6c3bd78..d1187c7 100644
--- a/Tanshu.Accounts.Contracts/Tanshu.Accounts.Contracts.csproj
+++ b/Tanshu.Accounts.Contracts/Tanshu.Accounts.Contracts.csproj
@@ -56,9 +56,11 @@
     <Compile Include="Communication\Delegates.cs" />
     <Compile Include="DAOFactory\CheckoutDAO.cs" />
     <Compile Include="DAOFactory\AdvanceDAO.cs" />
+    <Compile Include="DAOFactory\ProductGroupModifierDAO.cs" />
+    <Compile Include="DAOFactory\ModifierDAO.cs" />
     <Compile Include="DAOFactory\PrintLocationDAO.cs" />
     <Compile Include="DAOFactory\FoodTableDAO.cs" />
-    <Compile Include="DAOFactory\ProductTypeDAO.cs" />
+    <Compile Include="DAOFactory\ProductGroupDAO.cs" />
     <Compile Include="DAOFactory\ManagementDAO.cs" />
     <Compile Include="DAOFactory\PaymentDAO.cs" />
     <Compile Include="DAOFactory\SalesAnalysisDAO.cs" />
@@ -75,8 +77,9 @@
     <Compile Include="DAOFactory\VoucherDAO.cs" />
     <Compile Include="Data Contracts\AdvanceBO.cs" />
     <Compile Include="Data Contracts\AdvanceDisplayBO.cs" />
-    <Compile Include="Data Contracts\ComplexProductBO.cs" />
     <Compile Include="Data Contracts\BillItemKey.cs" />
+    <Compile Include="Data Contracts\ProductGroupModifierBO.cs" />
+    <Compile Include="Data Contracts\ModifierBO.cs" />
     <Compile Include="Data Contracts\PrintLocationBO.cs" />
     <Compile Include="Data Contracts\FoodTableBO.cs" />
     <Compile Include="Data Contracts\SalarySheetBO.cs" />
@@ -104,7 +107,7 @@
     <Compile Include="Data Contracts\ProductBO.cs" />
     <Compile Include="Data Contracts\ProductDisplayBO.cs" />
     <Compile Include="Data Contracts\ProductDisplaySmallBO.cs" />
-    <Compile Include="Data Contracts\ProductTypeBO.cs" />
+    <Compile Include="Data Contracts\ProductGroupBO.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Data Contracts\SalesAnalysisBO.cs" />
     <Compile Include="Data Contracts\SalesBillItemBO.cs" />
@@ -116,13 +119,12 @@
     <Compile Include="Service Contracts\CheckoutBI.cs" />
     <Compile Include="Service Contracts\PrintLocationBI.cs" />
     <Compile Include="Service Contracts\FoodTableBI.cs" />
-    <Compile Include="Service Contracts\ProductTypesBI.cs" />
+    <Compile Include="Service Contracts\ProductGroupBI.cs" />
     <Compile Include="Service Contracts\CustomerBI.cs" />
     <Compile Include="Service Contracts\WaiterBI.cs" />
     <Compile Include="Service Contracts\LedgerBI.cs" />
     <Compile Include="Service Contracts\MembershipBI.cs" />
     <Compile Include="Service Contracts\PaymentBI.cs" />
-    <Compile Include="Service Contracts\ProductBI.cs" />
     <Compile Include="Service Contracts\SalesAnalysisBI.cs" />
     <Compile Include="Service Contracts\SaleVoucherBI.cs" />
     <Compile Include="Service Contracts\UserBI.cs" />
diff --git a/Tanshu.Accounts.DAOFactory/DAOFactory.cs b/Tanshu.Accounts.DAOFactory/DAOFactory.cs
index 8158b3f..d01729c 100644
--- a/Tanshu.Accounts.DAOFactory/DAOFactory.cs
+++ b/Tanshu.Accounts.DAOFactory/DAOFactory.cs
@@ -24,10 +24,12 @@ namespace Tanshu.Accounts.DAOFactory
         public abstract ILedgerDAO GetLedgerDAO(IConnectionDAO connection);
         public abstract IManagementDAO GetManagementDAO(DateTime startDate, DateTime finishDate, IConnectionDAO connection);
         public abstract IMembershipDAO GetMembershipDAO(IConnectionDAO connection);
+        public abstract IModifierDAO GetModifierDAO(IConnectionDAO connection);
         public abstract IPaymentDAO GetPaymentDAO(IConnectionDAO connection);
         public abstract IPrintLocationDAO GetPrintLocationDAO(IConnectionDAO connection);
         public abstract IProductDAO GetProductDAO(IConnectionDAO connection);
-        public abstract IProductTypeDAO GetProductTypeDAO(IConnectionDAO connection);
+        public abstract IProductGroupDAO GetProductGroupDAO(IConnectionDAO connection);
+        public abstract IProductGroupModifierDAO GetProductGroupModifierDAO(IConnectionDAO connection);
         public abstract ISalesAnalysisDAO GetSalesAnalysisDAO(IConnectionDAO connection);
         public abstract ISaleVoucherDAO GetSaleVoucherDAO(IConnectionDAO connection);
         public abstract ISaleVoucherMixDAO GetSaleVoucherMixDAO(IConnectionDAO connection);
diff --git a/Tanshu.Accounts.DAOFactory/SqlServerDAOFactory.cs b/Tanshu.Accounts.DAOFactory/SqlServerDAOFactory.cs
index 12ce3c4..3a3a1b4 100644
--- a/Tanshu.Accounts.DAOFactory/SqlServerDAOFactory.cs
+++ b/Tanshu.Accounts.DAOFactory/SqlServerDAOFactory.cs
@@ -54,6 +54,11 @@ namespace Tanshu.Accounts.DAOFactory
             return new MembershipDAO(connection);
         }
 
+        public override IModifierDAO GetModifierDAO(IConnectionDAO connection)
+        {
+            return new ModifierDAO(connection);
+        }
+
         public override IPaymentDAO GetPaymentDAO(IConnectionDAO connection)
         {
             return new PaymentDAO(connection);
@@ -68,9 +73,14 @@ namespace Tanshu.Accounts.DAOFactory
         {
             return new ProductDAO(connection);
         }
-        public override IProductTypeDAO GetProductTypeDAO(IConnectionDAO connection)
+        public override IProductGroupDAO GetProductGroupDAO(IConnectionDAO connection)
         {
-            return new ProductTypeDAO(connection);
+            return new ProductGroupDAO(connection);
+        }
+
+        public override IProductGroupModifierDAO GetProductGroupModifierDAO(IConnectionDAO connection)
+        {
+            return new ProductGroupModifierDAO(connection);
         }
 
         public override ISalesAnalysisDAO GetSalesAnalysisDAO(IConnectionDAO connection)
diff --git a/Tanshu.Accounts.Helpers/ControlFactory.cs b/Tanshu.Accounts.Helpers/ControlFactory.cs
index 613bc7e..ad674ff 100644
--- a/Tanshu.Accounts.Helpers/ControlFactory.cs
+++ b/Tanshu.Accounts.Helpers/ControlFactory.cs
@@ -40,7 +40,7 @@ namespace Tanshu.Accounts.Helpers
             }
         }
 
-        public static void GenerateButtons(ref Panel panel, ref List<Button> buttonList, Rectangle clientArea, int x, int y, int border, int page, List<ProductTypeBO> list, ButtonClickDelegate bcDelegate)
+        public static void GenerateButtons(ref Panel panel, ref List<Button> buttonList, Rectangle clientArea, int x, int y, int border, int page, List<ProductGroupBO> list, ButtonClickDelegate bcDelegate)
         {
             if (buttonList.Count != 0)
             {
@@ -67,12 +67,12 @@ namespace Tanshu.Accounts.Helpers
                 //if (startButton)
                 //{
                 //    list.RemoveRange(0, start);
-                //    list.Insert(0, new ProductTypeBO() { Name = "Previous", ProductTypeID = new Guid() });
+                //    list.Insert(0, new ProductGroupBO() { Name = "Previous", ProductGroupID = new Guid() });
                 //}
                 //if (finishButton)
                 //{
                 //    list.RemoveRange((x * y) - 1, list.Count - (x * y) + 1);
-                //    list.Insert(x * y - 1, new ProductTypeBO() { Name = "Next", ProductTypeID = new Guid() });
+                //    list.Insert(x * y - 1, new ProductGroupBO() { Name = "Next", ProductGroupID = new Guid() });
                 //}
                 // the list is long
 
@@ -91,14 +91,45 @@ namespace Tanshu.Accounts.Helpers
                     if (list.Count < count)
                         break;
                     left = clientArea.Left + (i * (width + border));
-                    //ProductTypeBO item = list[(j * x) + i];
-                    ProductTypeBO item = list[count - 1];
-                    Button btn = GetButton(string.Format("{0}-{1}", i, j), item.Name, width, height, left, top, item.ProductTypeID, bcDelegate);
+                    //ProductGroupBO item = list[(j * x) + i];
+                    ProductGroupBO item = list[count - 1];
+                    Button btn = GetButton(string.Format("{0}-{1}", i, j), item.Name, width, height, left, top, item.ProductGroupID, bcDelegate);
                     panel.Controls.Add(btn);
                     buttonList.Add(btn);
                 }
             }
         }
+
+        public static void GenerateModifiers(ref Panel panel, ref List<Button> buttonList, Rectangle clientArea, int x, int y, int border, List<ProductGroupModifierBO> list, ButtonClickDelegate bcDelegate)
+        {
+            if (buttonList.Count != 0)
+            {
+                for (int i = buttonList.Count - 1; i >= 0; i--)
+                {
+                    buttonList[i].Dispose();
+                }
+                buttonList = new List<Button>();
+            }
+            int width = (clientArea.Width - (border * (x - 1))) / x;
+            int height = (clientArea.Height - (border * (y - 1))) / y;
+            int left = 0, top = 0, count = 0;
+            for (int j = 0; j < y; j++)
+            {
+                top = clientArea.Top + (j * (height + border));
+                for (int i = 0; i < x; i++)
+                {
+                    count++;
+                    if (list.Count < count)
+                        break;
+                    left = clientArea.Left + (i * (width + border));
+                    var item = list[count - 1];
+                    Button btn = GetButton(string.Format("{0}-{1}", i, j), item.ModifierID, width, height, left, top, item.ModifierID, bcDelegate);
+                    panel.Controls.Add(btn);
+                    buttonList.Add(btn);
+                }
+            }
+        }
+        
         public static void GenerateTables(ref Panel panel, ref List<Button> buttonList, Rectangle clientArea, int x, int y, int border, List<FoodTableBO> list, ButtonClickDelegate bcDelegate)
         {
             if (buttonList.Count != 0)
@@ -128,6 +159,11 @@ namespace Tanshu.Accounts.Helpers
                 }
             }
         }
+
+        
+        
+        
+        
         private static TextBox GetTextBox(string name, string text, int width, int height, int x, int y, object tag, ButtonClickDelegate bcDelegate)
         {
             TextBox textBox = CreateControl(ControlType.TextBox, name, text, width, height, x, y) as TextBox;
diff --git a/Tanshu.Accounts.PointOfSale/App.config b/Tanshu.Accounts.PointOfSale/App.config
index d2633a1..bb6e595 100644
--- a/Tanshu.Accounts.PointOfSale/App.config
+++ b/Tanshu.Accounts.PointOfSale/App.config
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <configuration>
   <connectionStrings>
-    <add name="connection" connectionString="Server=frodo;Initial Catalog=PeithoSales;User ID=sa;Password=123456" />
+    <add name="connection" connectionString="Server=.;Initial Catalog=PeithoSales;User ID=sa;Password=123456" />
   </connectionStrings>
   <appSettings>
     <add key ="Location" value ="Ground"/>
diff --git a/Tanshu.Accounts.PointOfSale/Controllers/BillController.cs b/Tanshu.Accounts.PointOfSale/Controllers/BillController.cs
index 21bbeda..5e5bf4c 100644
--- a/Tanshu.Accounts.PointOfSale/Controllers/BillController.cs
+++ b/Tanshu.Accounts.PointOfSale/Controllers/BillController.cs
@@ -44,6 +44,11 @@ namespace Tanshu.Accounts.PointOfSale
         {
             BillHelperFunctions.AddProductToGrid(productID, bindingSource, bill);
             ShowAmount();
+
+
+            ProductBO product = ProductBI.GetProduct(productID);
+            if (ProductGroupModifierBI.HasCompulsoryModifier(product.ProductGroupID))
+                saleForm.ShowModifiers(product.ProductGroupID);
         }
         public void ShowCustomerList(bool reset)
         {
@@ -449,6 +454,13 @@ namespace Tanshu.Accounts.PointOfSale
 
         }
 
+        //private Dictionary<string,string> modifiers;
+        public void AddModifier(string modifierID)
+        {
+            MessageBox.Show(modifierID);
+
+        }
+
         internal void SettleBill()
         {
             if (billInfo == null)
@@ -464,6 +476,11 @@ namespace Tanshu.Accounts.PointOfSale
                 case SettleOptions.Cancel:
                     break;
                 case SettleOptions.Cash:
+                    break;
+                case SettleOptions.CreditCard:
+                    break;
+                case SettleOptions.NoCharge:
+                    break;
 
             }
             throw new NotImplementedException();
diff --git a/Tanshu.Accounts.PointOfSale/Controllers/ISaleForm.cs b/Tanshu.Accounts.PointOfSale/Controllers/ISaleForm.cs
index fcf148f..0f18a08 100644
--- a/Tanshu.Accounts.PointOfSale/Controllers/ISaleForm.cs
+++ b/Tanshu.Accounts.PointOfSale/Controllers/ISaleForm.cs
@@ -14,5 +14,6 @@ namespace Tanshu.Accounts.PointOfSale
         void ShowAmount(decimal discountAmount, decimal grossAmount, decimal serviceChargeAmount, decimal taxAmount, decimal valueAmount, List<SalesBillItemBO> bill);
         void ShowInfo(string billID, string kotID, DateTime creationDate, DateTime date, DateTime lastEditDate, string customer, string tableID, Guid waiterID, string waiter);
         void SetUserName(string name);
+        void ShowModifiers(Guid productGroupID);
     }
 }
diff --git a/Tanshu.Accounts.PointOfSale/MainForm.cs b/Tanshu.Accounts.PointOfSale/MainForm.cs
index 85bda79..4c8fb3d 100644
--- a/Tanshu.Accounts.PointOfSale/MainForm.cs
+++ b/Tanshu.Accounts.PointOfSale/MainForm.cs
@@ -226,7 +226,7 @@ namespace Tanshu.Accounts.PointOfSale
             {
                 if (roleBI.IsAllowed)
                 {
-                    new ProductBI().UpdateShortName();
+                    ProductBI.UpdateShortName();
                     using (SalesForm frmSale = new SalesForm(new BillController()))
                         frmSale.ShowDialog();
                 }
diff --git a/Tanshu.Accounts.PointOfSale/ProductsForm.Designer.cs b/Tanshu.Accounts.PointOfSale/ProductsForm.Designer.cs
index 23c346d..c93a341 100644
--- a/Tanshu.Accounts.PointOfSale/ProductsForm.Designer.cs
+++ b/Tanshu.Accounts.PointOfSale/ProductsForm.Designer.cs
@@ -145,7 +145,7 @@
             // 
             // bsTypes
             // 
-            this.bsTypes.DataSource = typeof(Tanshu.Accounts.Contracts.ProductTypeBO);
+            this.bsTypes.DataSource = typeof(Tanshu.Accounts.Contracts.ProductGroupBO);
             // 
             // cmbUnits
             // 
diff --git a/Tanshu.Accounts.PointOfSale/ProductsForm.cs b/Tanshu.Accounts.PointOfSale/ProductsForm.cs
index fc0a44a..1919858 100644
--- a/Tanshu.Accounts.PointOfSale/ProductsForm.cs
+++ b/Tanshu.Accounts.PointOfSale/ProductsForm.cs
@@ -22,7 +22,7 @@ namespace Tanshu.Accounts.PointOfSale
 
         private void Products_Load(object sender, EventArgs e)
         {
-            productList = new ProductBI().GetProducts();
+            productList = ProductBI.GetProducts();
             bsProducts.DataSource = productList;
             FillCombos();
             bsProducts.MoveFirst();
@@ -48,7 +48,7 @@ namespace Tanshu.Accounts.PointOfSale
                 new StringType ("Bottle"),
                 new StringType ("Pack" )};
 
-            bsTypes.DataSource = new ProductTypeBI().GetProductTypes();
+            bsTypes.DataSource = new ProductGroupBI().GetProductGroups();
             bsPurchaseLedgers.DataSource = new LedgerBI().GetLedgersOfType('P');
             bsSalesLedgers.DataSource = new LedgerBI().GetLedgersOfType('X');
             bsSalesTax.DataSource = new LedgerBI().GetLedgersOfType('T');
@@ -81,7 +81,7 @@ namespace Tanshu.Accounts.PointOfSale
                         btnExit_Click(sender, e);
                     else
                     {
-                        productList = new ProductBI().GetProducts();
+                        productList = ProductBI.GetProducts();
                         bsProducts.DataSource = productList;
                         LockControls(false);
                     }
@@ -97,9 +97,9 @@ namespace Tanshu.Accounts.PointOfSale
                 {
                     if (MessageBox.Show("Are you sure?", "Delete", MessageBoxButtons.YesNo, MessageBoxIcon.Question, MessageBoxDefaultButton.Button2) == DialogResult.Yes)
                     {
-                        if (new ProductBI().Delete(productList.Single(p => p.Code == Convert.ToInt32(txtUniqueID.Text)).ProductID))
+                        if (ProductBI.Delete(productList.Single(p => p.Code == Convert.ToInt32(txtUniqueID.Text)).ProductID))
                         {
-                            productList = new ProductBI().GetProducts();
+                            productList = ProductBI.GetProducts();
                             btnNavFirst_Click(sender, e);
                         }
                     }
@@ -142,12 +142,12 @@ namespace Tanshu.Accounts.PointOfSale
             UserBO user = Session.User;
             ProductBO product = new ProductBO();
             if (!addNew)
-                product = new ProductBI().GetProduct(productList.ElementAt(bsProducts.Position).ProductID);
+                product = ProductBI.GetProduct(productList.ElementAt(bsProducts.Position).ProductID);
             product.Name = txtName.Text;
             product.MinimumLevel = Convert.ToDecimal(txtMinimumLevel.Text);
             product.MaximumLevel = Convert.ToDecimal(txtMaximumLevel.Text);
             product.Units = cmbUnits.Text;
-            product.ProductTypeID = new Guid(cmbProductTypes.SelectedValue.ToString());
+            product.ProductGroupID = new Guid(cmbProductTypes.SelectedValue.ToString());
             product.SalePrice = Convert.ToDecimal(txtSalePrice.Text);
             if (cmbPurchaseLedger.SelectedValue != null)
                 product.PurchaseLedgerID = new Guid(cmbPurchaseLedger.SelectedValue.ToString());
@@ -158,9 +158,9 @@ namespace Tanshu.Accounts.PointOfSale
             product.PurchasePrice = Convert.ToDecimal(txtPurchasePrice.Text);
             product.SaleTaxID = new Guid(cmbSalesTax.SelectedValue.ToString());
             if (addNew)
-                new ProductBI().Insert(product);
+                ProductBI.Insert(product);
             else
-                new ProductBI().Update(product);
+                ProductBI.Update(product);
 
             return true;
             #endregion
@@ -221,7 +221,7 @@ namespace Tanshu.Accounts.PointOfSale
         }
         private void lblNavLocation_Click(object sender, EventArgs e)
         {
-            using (SelectProduct selectProduct = new SelectProduct(new ProductBI().GetFilteredProducts, true))
+            using (SelectProduct selectProduct = new SelectProduct(ProductBI.GetFilteredProducts, true))
             {
                 selectProduct.ShowDialog();
                 if (selectProduct.SelectedItem != null)
diff --git a/Tanshu.Accounts.PointOfSale/Sales/SalesForm.cs b/Tanshu.Accounts.PointOfSale/Sales/SalesForm.cs
index 87bcf28..6217ab0 100644
--- a/Tanshu.Accounts.PointOfSale/Sales/SalesForm.cs
+++ b/Tanshu.Accounts.PointOfSale/Sales/SalesForm.cs
@@ -66,7 +66,7 @@ namespace Tanshu.Accounts.PointOfSale
                     }
                 case Keys.F7:
                     {
-                        using (SelectProduct selectProduct = new SelectProduct(new ProductBI().GetFilteredProducts, true))
+                        using (SelectProduct selectProduct = new SelectProduct(ProductBI.GetFilteredProducts, true))
                         {
                             selectProduct.ShowDialog();
                             if (selectProduct.SelectedItem != null)
@@ -165,7 +165,7 @@ namespace Tanshu.Accounts.PointOfSale
                 btnPrevious.Visible = true;
                 btnNext.Visible = true;
                 page = 0;
-                var list = new ProductTypeBI().GetProductTypes();
+                var list = new ProductGroupBI().GetProductGroups();
                 ControlFactory.GenerateButtons(ref pnlBilling, ref buttonHeads, new Rectangle(889, 90, 85, 498), 1, pageSize, 2, page, list, new ButtonClickDelegate(productTypeButton_Click));
             }
             else
@@ -175,13 +175,26 @@ namespace Tanshu.Accounts.PointOfSale
                 ControlFactory.GenerateTables(ref pnlBilling, ref buttonHeads, new Rectangle(390, 94, 499, 385), 6, 10, 2, new FoodTableBI().GetFoodTables(), new ButtonClickDelegate(tableButton_Click));
             }
         }
+        public void ShowModifiers(Guid productGroupID)
+        {
+            ControlFactory.GenerateModifiers(ref pnlBilling, ref buttonList, new Rectangle(390, 94, 499, 385), 5, 6, 2, ProductGroupModifierBI.GetProductGroupModifiers(productGroupID), new ButtonClickDelegate(modifierButton_Click));
+        }
+        private void modifierButton_Click(object sender, EventArgs e)
+        {
+            Button button = sender as Button;
+            if (button == null)
+                return;
+            string tag = (string)button.Tag;
+            billController.AddModifier(tag);
+        }
+
         private void productTypeButton_Click(object sender, EventArgs e)
         {
             Button button = sender as Button;
             if (button == null)
                 return;
             Guid tag = (Guid)button.Tag;
-            ControlFactory.GenerateButtons(ref pnlBilling, ref buttonList, new Rectangle(390, 94, 499, 385), 5, 6, 2, new ProductBI().GetProducts(tag), new ButtonClickDelegate(productButton_Click));
+            ControlFactory.GenerateButtons(ref pnlBilling, ref buttonList, new Rectangle(390, 94, 499, 385), 5, 6, 2, ProductBI.GetProducts(tag), new ButtonClickDelegate(productButton_Click));
         }
         private void productButton_Click(object sender, EventArgs e)
         {
@@ -365,7 +378,7 @@ namespace Tanshu.Accounts.PointOfSale
         private void btnPrevious_Click(object sender, EventArgs e)
         {
             page--;
-            var list = new ProductTypeBI().GetProductTypes();
+            var list = new ProductGroupBI().GetProductGroups();
             if (page == -1)
                 page = 0;
 
@@ -374,7 +387,7 @@ namespace Tanshu.Accounts.PointOfSale
         private void btnNext_Click(object sender, EventArgs e)
         {
             page++;
-            var list = new ProductTypeBI().GetProductTypes();
+            var list = new ProductGroupBI().GetProductGroups();
             int pages = Convert.ToInt32(Math.Ceiling(Convert.ToDouble(list.Count) / Convert.ToDouble(pageSize)));
             if (page == pages)
                 page--;
diff --git a/Tanshu.Accounts.PointOfSale/Updates/UpdateForm.Designer.cs b/Tanshu.Accounts.PointOfSale/Updates/UpdateForm.Designer.cs
index 573f855..8ddcf32 100644
--- a/Tanshu.Accounts.PointOfSale/Updates/UpdateForm.Designer.cs
+++ b/Tanshu.Accounts.PointOfSale/Updates/UpdateForm.Designer.cs
@@ -31,13 +31,15 @@
             this.dtpFrom = new System.Windows.Forms.DateTimePicker();
             this.dtpTo = new System.Windows.Forms.DateTimePicker();
             this.btnGo = new System.Windows.Forms.Button();
-            this.txtTwelve = new System.Windows.Forms.TextBox();
+            this.txtFive = new System.Windows.Forms.TextBox();
             this.txtFour = new System.Windows.Forms.TextBox();
             this.txtZero = new System.Windows.Forms.TextBox();
             this.label1 = new System.Windows.Forms.Label();
             this.label2 = new System.Windows.Forms.Label();
             this.label3 = new System.Windows.Forms.Label();
             this.txtStatus = new System.Windows.Forms.TextBox();
+            this.label4 = new System.Windows.Forms.Label();
+            this.txtTwelve = new System.Windows.Forms.TextBox();
             this.SuspendLayout();
             // 
             // dtpFrom
@@ -56,7 +58,7 @@
             // 
             // btnGo
             // 
-            this.btnGo.Location = new System.Drawing.Point(12, 142);
+            this.btnGo.Location = new System.Drawing.Point(12, 168);
             this.btnGo.Name = "btnGo";
             this.btnGo.Size = new System.Drawing.Size(268, 23);
             this.btnGo.TabIndex = 5;
@@ -64,13 +66,13 @@
             this.btnGo.UseVisualStyleBackColor = true;
             this.btnGo.Click += new System.EventHandler(this.btnGo_Click);
             // 
-            // txtTwelve
+            // txtFive
             // 
-            this.txtTwelve.Location = new System.Drawing.Point(50, 116);
-            this.txtTwelve.Name = "txtTwelve";
-            this.txtTwelve.Size = new System.Drawing.Size(230, 20);
-            this.txtTwelve.TabIndex = 4;
-            this.txtTwelve.Text = "0";
+            this.txtFive.Location = new System.Drawing.Point(50, 116);
+            this.txtFive.Name = "txtFive";
+            this.txtFive.Size = new System.Drawing.Size(230, 20);
+            this.txtFive.TabIndex = 4;
+            this.txtFive.Text = "0";
             // 
             // txtFour
             // 
@@ -111,30 +113,49 @@
             this.label3.AutoSize = true;
             this.label3.Location = new System.Drawing.Point(12, 119);
             this.label3.Name = "label3";
-            this.label3.Size = new System.Drawing.Size(36, 13);
+            this.label3.Size = new System.Drawing.Size(21, 13);
             this.label3.TabIndex = 8;
-            this.label3.Text = "12.5%";
+            this.label3.Text = "5%";
             // 
             // txtStatus
             // 
-            this.txtStatus.Location = new System.Drawing.Point(12, 171);
+            this.txtStatus.Location = new System.Drawing.Point(12, 197);
             this.txtStatus.Name = "txtStatus";
             this.txtStatus.ReadOnly = true;
             this.txtStatus.Size = new System.Drawing.Size(268, 20);
             this.txtStatus.TabIndex = 9;
             // 
+            // label4
+            // 
+            this.label4.AutoSize = true;
+            this.label4.Location = new System.Drawing.Point(12, 145);
+            this.label4.Name = "label4";
+            this.label4.Size = new System.Drawing.Size(36, 13);
+            this.label4.TabIndex = 11;
+            this.label4.Text = "12.5%";
+            // 
+            // txtTwelve
+            // 
+            this.txtTwelve.Location = new System.Drawing.Point(50, 142);
+            this.txtTwelve.Name = "txtTwelve";
+            this.txtTwelve.Size = new System.Drawing.Size(230, 20);
+            this.txtTwelve.TabIndex = 10;
+            this.txtTwelve.Text = "0";
+            // 
             // UpdateForm
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(292, 203);
+            this.ClientSize = new System.Drawing.Size(292, 229);
+            this.Controls.Add(this.label4);
+            this.Controls.Add(this.txtTwelve);
             this.Controls.Add(this.txtStatus);
             this.Controls.Add(this.label3);
             this.Controls.Add(this.label2);
             this.Controls.Add(this.label1);
             this.Controls.Add(this.txtZero);
             this.Controls.Add(this.txtFour);
-            this.Controls.Add(this.txtTwelve);
+            this.Controls.Add(this.txtFive);
             this.Controls.Add(this.btnGo);
             this.Controls.Add(this.dtpTo);
             this.Controls.Add(this.dtpFrom);
@@ -150,12 +171,14 @@
         private System.Windows.Forms.DateTimePicker dtpFrom;
         private System.Windows.Forms.DateTimePicker dtpTo;
         private System.Windows.Forms.Button btnGo;
-        private System.Windows.Forms.TextBox txtTwelve;
+        private System.Windows.Forms.TextBox txtFive;
         private System.Windows.Forms.TextBox txtFour;
         private System.Windows.Forms.TextBox txtZero;
         private System.Windows.Forms.Label label1;
         private System.Windows.Forms.Label label2;
         private System.Windows.Forms.Label label3;
         private System.Windows.Forms.TextBox txtStatus;
+        private System.Windows.Forms.Label label4;
+        private System.Windows.Forms.TextBox txtTwelve;
     }
 }
\ No newline at end of file
diff --git a/Tanshu.Accounts.PointOfSale/Updates/UpdateForm.cs b/Tanshu.Accounts.PointOfSale/Updates/UpdateForm.cs
index fb166b5..f495ddf 100644
--- a/Tanshu.Accounts.PointOfSale/Updates/UpdateForm.cs
+++ b/Tanshu.Accounts.PointOfSale/Updates/UpdateForm.cs
@@ -46,6 +46,8 @@ namespace Tanshu.Accounts.PointOfSale
             if (last == -1)
                 processDelegate.BeginInvoke(dtpFrom.Value, dtpTo.Value, GetTextboxValue(txtTwelve), .125M, new AsyncCallback(CallbackMethod), null);
             if (last == .125M)
+                processDelegate.BeginInvoke(dtpFrom.Value, dtpTo.Value, GetTextboxValue(txtFive), .05M, new AsyncCallback(CallbackMethod), null);
+            if (last == .05M)
                 processDelegate.BeginInvoke(dtpFrom.Value, dtpTo.Value, GetTextboxValue(txtFour), .04M, new AsyncCallback(CallbackMethod), null);
             if (last == .04M)
                 processDelegate.BeginInvoke(dtpFrom.Value, dtpTo.Value, GetTextboxValue(txtZero), 0M, new AsyncCallback(CallbackMethod), null);
diff --git a/Tanshu.Accounts.PointOfSale/Updates/UpdateSales.Designer.cs b/Tanshu.Accounts.PointOfSale/Updates/UpdateSales.Designer.cs
index f27cf5e..6c5a3e8 100644
--- a/Tanshu.Accounts.PointOfSale/Updates/UpdateSales.Designer.cs
+++ b/Tanshu.Accounts.PointOfSale/Updates/UpdateSales.Designer.cs
@@ -29,9 +29,9 @@
         private void InitializeComponent()
         {
             this.components = new System.ComponentModel.Container();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle5 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle6 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle();
             this.label1 = new System.Windows.Forms.Label();
             this.txtDiff = new System.Windows.Forms.TextBox();
             this.dgvPending = new System.Windows.Forms.DataGridView();
@@ -93,14 +93,14 @@
                         | System.Windows.Forms.AnchorStyles.Right)));
             this.dgvPending.AutoGenerateColumns = false;
             this.dgvPending.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.DisplayedCells;
-            dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
-            dataGridViewCellStyle4.BackColor = System.Drawing.SystemColors.Control;
-            dataGridViewCellStyle4.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            dataGridViewCellStyle4.ForeColor = System.Drawing.SystemColors.WindowText;
-            dataGridViewCellStyle4.SelectionBackColor = System.Drawing.SystemColors.Highlight;
-            dataGridViewCellStyle4.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
-            dataGridViewCellStyle4.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
-            this.dgvPending.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle4;
+            dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
+            dataGridViewCellStyle1.BackColor = System.Drawing.SystemColors.Control;
+            dataGridViewCellStyle1.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            dataGridViewCellStyle1.ForeColor = System.Drawing.SystemColors.WindowText;
+            dataGridViewCellStyle1.SelectionBackColor = System.Drawing.SystemColors.Highlight;
+            dataGridViewCellStyle1.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
+            dataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+            this.dgvPending.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle1;
             this.dgvPending.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
             this.dgvPending.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
             this.selectDataGridViewItem,
@@ -119,25 +119,25 @@
             this.printedDataGridViewCheckBoxColumn,
             this.alarmTimeDataGridViewTextBoxColumn});
             this.dgvPending.DataSource = this.bsPending;
-            dataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
-            dataGridViewCellStyle5.BackColor = System.Drawing.SystemColors.Window;
-            dataGridViewCellStyle5.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            dataGridViewCellStyle5.ForeColor = System.Drawing.SystemColors.ControlText;
-            dataGridViewCellStyle5.SelectionBackColor = System.Drawing.SystemColors.Highlight;
-            dataGridViewCellStyle5.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
-            dataGridViewCellStyle5.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
-            this.dgvPending.DefaultCellStyle = dataGridViewCellStyle5;
+            dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
+            dataGridViewCellStyle2.BackColor = System.Drawing.SystemColors.Window;
+            dataGridViewCellStyle2.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            dataGridViewCellStyle2.ForeColor = System.Drawing.SystemColors.ControlText;
+            dataGridViewCellStyle2.SelectionBackColor = System.Drawing.SystemColors.Highlight;
+            dataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
+            dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
+            this.dgvPending.DefaultCellStyle = dataGridViewCellStyle2;
             this.dgvPending.Location = new System.Drawing.Point(12, 38);
             this.dgvPending.MultiSelect = false;
             this.dgvPending.Name = "dgvPending";
-            dataGridViewCellStyle6.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
-            dataGridViewCellStyle6.BackColor = System.Drawing.SystemColors.Control;
-            dataGridViewCellStyle6.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            dataGridViewCellStyle6.ForeColor = System.Drawing.SystemColors.WindowText;
-            dataGridViewCellStyle6.SelectionBackColor = System.Drawing.SystemColors.Highlight;
-            dataGridViewCellStyle6.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
-            dataGridViewCellStyle6.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
-            this.dgvPending.RowHeadersDefaultCellStyle = dataGridViewCellStyle6;
+            dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
+            dataGridViewCellStyle3.BackColor = System.Drawing.SystemColors.Control;
+            dataGridViewCellStyle3.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            dataGridViewCellStyle3.ForeColor = System.Drawing.SystemColors.WindowText;
+            dataGridViewCellStyle3.SelectionBackColor = System.Drawing.SystemColors.Highlight;
+            dataGridViewCellStyle3.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
+            dataGridViewCellStyle3.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+            this.dgvPending.RowHeadersDefaultCellStyle = dataGridViewCellStyle3;
             this.dgvPending.RowHeadersVisible = false;
             this.dgvPending.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect;
             this.dgvPending.Size = new System.Drawing.Size(743, 500);
@@ -335,6 +335,7 @@
             this.cmbTax.Items.AddRange(new object[] {
             "0%",
             "4%",
+            "5%",
             "12.5%"});
             this.cmbTax.Location = new System.Drawing.Point(371, 10);
             this.cmbTax.Name = "cmbTax";
diff --git a/Tanshu.Accounts.PointOfSale/Updates/UpdateSales.cs b/Tanshu.Accounts.PointOfSale/Updates/UpdateSales.cs
index 1095085..10d7173 100644
--- a/Tanshu.Accounts.PointOfSale/Updates/UpdateSales.cs
+++ b/Tanshu.Accounts.PointOfSale/Updates/UpdateSales.cs
@@ -31,6 +31,8 @@ namespace Tanshu.Accounts.PointOfSale.Updates
                 tax = 0;
             else if (cmbTax.Text == "4%")
                 tax = .04M;
+            else if (cmbTax.Text == "5%")
+                tax = .05M;
             else if (cmbTax.Text == "12.5%")
                 tax = .125M;
             decimal target = Convert.ToDecimal(txtTarget.Text);
diff --git a/Tanshu.Accounts.Print/Thermal.cs b/Tanshu.Accounts.Print/Thermal.cs
index b96aae2..accea56 100644
--- a/Tanshu.Accounts.Print/Thermal.cs
+++ b/Tanshu.Accounts.Print/Thermal.cs
@@ -419,7 +419,7 @@ namespace Tanshu.Accounts.Print
             {
                 if (item.Printed != item.Quantity)
                 {
-                    Guid type = new ProductBI().GetProduct(item.productID).ProductTypeID;
+                    Guid type = ProductBI.GetProduct(item.productID).ProductGroupID;
                     var printer = PrintLocationBI.KotPrinter(type);
                     if (!dict.ContainsKey(printer))
                     {
diff --git a/Tanshu.Accounts.SqlDAO/MembershipDAO.cs b/Tanshu.Accounts.SqlDAO/MembershipDAO.cs
index 32f104f..552a882 100644
--- a/Tanshu.Accounts.SqlDAO/MembershipDAO.cs
+++ b/Tanshu.Accounts.SqlDAO/MembershipDAO.cs
@@ -24,7 +24,7 @@ namespace Tanshu.Accounts.SqlDAO
                 name = name.Substring(0, name.IndexOf(":"));
                 if (!IsUserInRole(name, "Security/CreateUser"))
                     return false;
-                SqlCommand cmd = new SqlCommand("SELECT COUNT(*) FROM Users WHERE LockedOut = 0 AND (Name = @Name AND Password = @Password) OR Name = @Name2");
+                SqlCommand cmd = new SqlCommand("SELECT COUNT(*) FROM Auth_Users WHERE LockedOut = 0 AND (Name = @Name AND Password = @Password) OR Name = @Name2");
                 cmd.Parameters.AddWithValue("@Name", name);
                 cmd.Parameters.AddWithValue("@Name2", name2);
                 cmd.Parameters.AddWithValue("@Password", password);
@@ -33,7 +33,7 @@ namespace Tanshu.Accounts.SqlDAO
             }
             else
             {
-                SqlCommand cmd = new SqlCommand("SELECT COUNT(*) FROM Users WHERE LockedOut = 0 AND Name = @Name AND Password = @Password");
+                SqlCommand cmd = new SqlCommand("SELECT COUNT(*) FROM Auth_Users WHERE LockedOut = 0 AND Name = @Name AND Password = @Password");
                 cmd.Parameters.AddWithValue("@Name", name);
                 cmd.Parameters.AddWithValue("@Password", password);
                 return (int)connection.ExecuteScalar(cmd) == 1;
@@ -42,7 +42,7 @@ namespace Tanshu.Accounts.SqlDAO
 
         public bool IsUserInRole(string username, string roleName)
         {
-            SqlCommand cmd = new SqlCommand("SELECT Count(*) FROM UserRoles ur INNER JOIN Users u ON u.UserID = ur.UserID WHERE u.Name = @UserName AND ur.Role = @Role");
+            SqlCommand cmd = new SqlCommand("SELECT Count(*) FROM Auth_UserRoles ur INNER JOIN Auth_Users u ON u.UserID = ur.UserID WHERE u.Name = @UserName AND ur.Role = @Role");
             cmd.Parameters.AddWithValue("@UserName", username);
             cmd.Parameters.AddWithValue("@Role", roleName);
 
@@ -52,7 +52,7 @@ namespace Tanshu.Accounts.SqlDAO
         //Upgraded to use Groups
         public bool IsUserInRole(Guid userID, string roleName)
         {
-            SqlCommand cmd = new SqlCommand("SELECT Count(*) FROM UserGroups ug INNER JOIN RoleGroups rg on ug.GroupID = rg.GroupID WHERE ug.UserID = @UserID AND rg.RoleID = @Role");
+            SqlCommand cmd = new SqlCommand("SELECT Count(*) FROM Auth_UserGroups ug INNER JOIN Auth_RoleGroups rg on ug.GroupID = rg.GroupID WHERE ug.UserID = @UserID AND rg.RoleID = @Role");
             cmd.Parameters.AddWithValue("@UserID", userID);
             cmd.Parameters.AddWithValue("@Role", roleName);
 
@@ -62,7 +62,7 @@ namespace Tanshu.Accounts.SqlDAO
         public string[] GetRolesForUser(string username)
         {
             List<string> roles = new List<string>();
-            using (SqlCommand cmd = new SqlCommand("SELECT ur.Role FROM UserRoles ur INNER JOIN Users u ON ur.UserID = u.UserID WHERE u.Name = @Name"))
+            using (SqlCommand cmd = new SqlCommand("SELECT ur.Role FROM Auth_UserRoles ur INNER JOIN Auth_Users u ON ur.UserID = u.UserID WHERE u.Name = @Name"))
             {
                 cmd.Parameters.AddWithValue("@Name", username);
                 using (IDataReader dr = connection.ExecuteReader(cmd))
@@ -82,7 +82,7 @@ namespace Tanshu.Accounts.SqlDAO
 
         public UserBO GetUserFromName(string name)
         {
-            SqlCommand cmd = new SqlCommand("SELECT * FROM Users WHERE Name = @Name");
+            SqlCommand cmd = new SqlCommand("SELECT * FROM Auth_Users WHERE Name = @Name");
             cmd.Parameters.AddWithValue("@Name", name);
             return BusinessObjectDAO<UserBO>.GetBusinessObject(connection.ExecuteReader(cmd));
         }
@@ -90,7 +90,7 @@ namespace Tanshu.Accounts.SqlDAO
         public string[] GetAllRoles()
         {
             List<string> roles = new List<string>();
-            using (IDataReader dr = connection.ExecuteReader("SELECT Role FROM Roles"))
+            using (IDataReader dr = connection.ExecuteReader("SELECT Role FROM Auth_Roles"))
             {
                 while (dr.Read())
                 {
@@ -112,7 +112,7 @@ namespace Tanshu.Accounts.SqlDAO
                 UserBO currentUser = GetUserFromName(user);
                 foreach (string role in roleNames)
                 {
-                    using (SqlCommand cmd = new SqlCommand("INSERT INTO UserRoles (UserRoleID, UserID, Role) VALUES (NEWID(), @UserID, @Role)"))
+                    using (SqlCommand cmd = new SqlCommand("INSERT INTO Auth_UserRoles (UserRoleID, UserID, Role) VALUES (NEWID(), @UserID, @Role)"))
                     {
                         cmd.Parameters.AddWithValue("@UserID", currentUser.UserID);
                         cmd.Parameters.AddWithValue("@Role", role);
@@ -124,7 +124,7 @@ namespace Tanshu.Accounts.SqlDAO
 
         public void RemoveUsersFromRoles(string[] usernames, string[] roleNames)
         {
-            string query = "DELETE FROM UserRoles WHERE UserID IN (";
+            string query = "DELETE FROM Auth_UserRoles WHERE UserID IN (";
 
             foreach (string user in usernames)
             {
@@ -142,7 +142,7 @@ namespace Tanshu.Accounts.SqlDAO
 
         public bool RoleExists(string roleID)
         {
-            using (SqlCommand cmd = new SqlCommand("IF EXISTS(SELECT * FROM Roles WHERE RoleID = @RoleID) SELECT CAST(1 AS bit) ELSE SELECT CAST(0 AS bit)"))
+            using (SqlCommand cmd = new SqlCommand("IF EXISTS(SELECT * FROM Auth_Roles WHERE RoleID = @RoleID) SELECT CAST(1 AS bit) ELSE SELECT CAST(0 AS bit)"))
             {
                 cmd.Parameters.AddWithValue("@RoleID", roleID);
                 return (bool)connection.ExecuteScalar(cmd);
diff --git a/Tanshu.Accounts.SqlDAO/ModifierDAO.cs b/Tanshu.Accounts.SqlDAO/ModifierDAO.cs
new file mode 100644
index 0000000..691b513
--- /dev/null
+++ b/Tanshu.Accounts.SqlDAO/ModifierDAO.cs
@@ -0,0 +1,52 @@
+using System;
+using System.Collections.Generic;
+using System.Data.SqlClient;
+using Tanshu.Accounts.Contracts;
+using Tanshu.Data.DAO;
+using Tanshu.Accounts.DAOFactory;
+
+namespace Tanshu.Accounts.SqlDAO
+{
+    public class ModifierDAO : BaseDAO, IModifierDAO
+    {
+        public ModifierDAO(IConnectionDAO connection)
+            : base(connection)
+        { }
+
+        public void Insert(ModifierBO modifier)
+        {
+            using (SqlCommand cmd = new SqlCommand(@"INSERT INTO Modifiers (ModifierID) VALUES (@ModifierID);"))
+            {
+                cmd.Parameters.AddWithValue("@Name", modifier.ModifierID);
+                connection.ExecuteNonQuery(cmd);
+            }
+        }
+        //public void Update(ModifierBO modifier)
+        //{
+        //    using (SqlCommand cmd = new SqlCommand(@"UPDATE Modifiers SET ModifierID = @ModifierID WHERE ModifierID = @ModifierID"))
+        //    {
+        //        cmd.Parameters.AddWithValue("@ModifierID", modifier.ModifierID);
+        //        connection.ExecuteNonQuery(cmd);
+        //    }
+        //}
+        public void Delete(string modifierID)
+        {
+            using (SqlCommand cmd = new SqlCommand("DELETE FROM Modifiers WHERE ModifierID = @ModifierID"))
+            {
+                cmd.Parameters.AddWithValue("@ModifierID", modifierID);
+                connection.ExecuteNonQuery(cmd);
+            }
+        }
+
+        public ModifierBO GetModifier(string modifierID)
+        {
+            SqlCommand cmd = new SqlCommand("SELECT * FROM Modifiers Where ModifierID = @ModifierID;");
+            cmd.Parameters.AddWithValue("@ModifierID", modifierID);
+            return BusinessObjectDAO<ModifierBO>.GetBusinessObject(connection.ExecuteReader(cmd));
+        }
+        public List<ModifierBO> GetModifiers()
+        {
+            return BusinessObjectDAO<ModifierBO>.GetBusinessObjects(connection.ExecuteReader("SELECT * FROM Modifiers;"));
+        }
+    }
+}
diff --git a/Tanshu.Accounts.SqlDAO/ProductDAO.cs b/Tanshu.Accounts.SqlDAO/ProductDAO.cs
index 8d8ed7b..411199c 100644
--- a/Tanshu.Accounts.SqlDAO/ProductDAO.cs
+++ b/Tanshu.Accounts.SqlDAO/ProductDAO.cs
@@ -21,7 +21,7 @@ namespace Tanshu.Accounts.SqlDAO
             product.ProductID = Guid.NewGuid();
             SqlCommand cmd = new SqlCommand(@"
 SELECT @Code = ISNULL(MAX(Code), 0) + 1 FROM Products;
-INSERT INTO Products (ProductID, Code, Name, Units, ProductTypeID, SaleLedgerID, SaleTaxID ,SalePrice , PurchaseLedgerID ,PurchaseTaxID , PurchasePrice, Discontinued, MinimumLevel, MaximumLevel, SortOrder) VALUES (@ProductID, @Code, @Name, @Units, @ProductTypeID, @SaleLedgerID, @SaleTaxID, @SalePrice ,@PurchaseLedgerID ,@PurchaseTaxID , @PurchasePrice, @Discontinued, @MinimumLevel, @MaximumLevel, @SortOrder);
+INSERT INTO Products (ProductID, Code, Name, Units, ProductGroupID, SaleLedgerID, SaleTaxID ,SalePrice , PurchaseLedgerID ,PurchaseTaxID , PurchasePrice, Discontinued, MinimumLevel, MaximumLevel, SortOrder) VALUES (@ProductID, @Code, @Name, @Units, @ProductGroupID, @SaleLedgerID, @SaleTaxID, @SalePrice ,@PurchaseLedgerID ,@PurchaseTaxID , @PurchasePrice, @Discontinued, @MinimumLevel, @MaximumLevel, @SortOrder);
 SELECT @timestamp = timestamp FROM Products WHERE ProductID = @ProductID;");
             {
                 cmd.Parameters.AddWithValue("@ProductID", product.ProductID);
@@ -30,7 +30,7 @@ SELECT @timestamp = timestamp FROM Products WHERE ProductID = @ProductID;");
                 cmd.Parameters.AddWithValue("@Code", product.Code);
                 cmd.Parameters.AddWithValue("@Name", product.Name);
                 cmd.Parameters.AddWithValue("@Units", product.Units);
-                cmd.Parameters.AddWithValue("@ProductTypeID", product.ProductTypeID);
+                cmd.Parameters.AddWithValue("@ProductGroupID", product.ProductGroupID);
                 cmd.Parameters.AddWithValue("@SaleLedgerID", product.SaleLedgerID);
                 cmd.Parameters.AddWithValue("@SaleTaxID", product.SaleTaxID);
                 cmd.Parameters.AddWithValue("@SalePrice", product.SalePrice);
@@ -64,12 +64,12 @@ SELECT @timestamp = timestamp FROM Products WHERE ProductID = @ProductID;");
         }
         public bool Update(ProductBO product)
         {
-            SqlCommand cmd = new SqlCommand(@"UPDATE Products SET Code = @Code ,Name = @Name ,Units = @Units ,ProductTypeID = @ProductTypeID ,SaleLedgerID = @SaleLedgerID ,SaleTaxID = @SaleTaxID ,SalePrice = @SalePrice ,PurchaseLedgerID = @PurchaseLedgerID ,PurchaseTaxID = @PurchaseTaxID ,PurchasePrice = @PurchasePrice ,Discontinued = @Discontinued ,MinimumLevel = @MinimumLevel ,MaximumLevel = @MaximumLevel, SortOrder=@SortOrder WHERE ProductID = @ProductID SELECT @timestamp = timestamp FROM Products WHERE ProductID = @ProductID;");
+            SqlCommand cmd = new SqlCommand(@"UPDATE Products SET Code = @Code ,Name = @Name ,Units = @Units ,ProductGroupID = @ProductGroupID ,SaleLedgerID = @SaleLedgerID ,SaleTaxID = @SaleTaxID ,SalePrice = @SalePrice ,PurchaseLedgerID = @PurchaseLedgerID ,PurchaseTaxID = @PurchaseTaxID ,PurchasePrice = @PurchasePrice ,Discontinued = @Discontinued ,MinimumLevel = @MinimumLevel ,MaximumLevel = @MaximumLevel, SortOrder=@SortOrder WHERE ProductID = @ProductID SELECT @timestamp = timestamp FROM Products WHERE ProductID = @ProductID;");
             cmd.Parameters.AddWithValue("@ProductID", product.ProductID);
             cmd.Parameters.AddWithValue("@Code", product.Code);
             cmd.Parameters.AddWithValue("@Name", product.Name);
             cmd.Parameters.AddWithValue("@Units", product.Units);
-            cmd.Parameters.AddWithValue("@ProductTypeID", product.ProductTypeID);
+            cmd.Parameters.AddWithValue("@ProductGroupID", product.ProductGroupID);
             cmd.Parameters.AddWithValue("@SaleLedgerID", product.SaleLedgerID);
             cmd.Parameters.AddWithValue("@SaleTaxID", product.SaleTaxID);
             cmd.Parameters.AddWithValue("@SalePrice", product.SalePrice);
@@ -121,7 +121,7 @@ GROUP BY i.ProductID";
         public List<ProductDisplayBO> GetProducts()
         {
             //SELECT p.ProductID, p.Picture, p.Code, p.Name, p.Units, p.ProductTypeID, p.SaleLedgerID, p.SaleTaxID, p.SalePrice, p.PurchaseLedgerID, p.PurchaseTaxID, p.PurchasePrice, p.Discontinued, p.MinimumLevel, p.MaximumLevel, p.timestamp, p.SortOrder, pt.Name AS Type FROM Products p INNER JOIN ProductTypes pt ON p.ProductTypeID = pt.ProductTypeID ORDER BY p.Name
-            SqlCommand cmd = new SqlCommand("SELECT p.ProductID, p.Picture, p.Code, p.Name, p.Units, p.ProductTypeID, p.SaleLedgerID, p.SaleTaxID, p.SalePrice, p.PurchaseLedgerID, p.PurchaseTaxID, p.PurchasePrice, p.Discontinued, p.MinimumLevel, p.MaximumLevel, p.SortOrder, pt.Name AS Type FROM Products p INNER JOIN ProductTypes pt ON p.ProductTypeID = pt.ProductTypeID ORDER BY p.Name");
+            SqlCommand cmd = new SqlCommand("SELECT p.ProductID, p.Picture, p.Code, p.Name, p.Units, p.ProductGroupID, p.SaleLedgerID, p.SaleTaxID, p.SalePrice, p.PurchaseLedgerID, p.PurchaseTaxID, p.PurchasePrice, p.Discontinued, p.MinimumLevel, p.MaximumLevel, p.SortOrder, pg.Name AS Group FROM Products p INNER JOIN ProductGroup pg ON p.ProductGroupID = pt.ProductGroupID ORDER BY p.Name");
             return BusinessObjectDAO<ProductDisplayBO>.GetBusinessObjects(connection.ExecuteReader(cmd));
         }
 
@@ -152,10 +152,10 @@ GROUP BY i.ProductID";
             string query = @" 
 SELECT p.ProductID, p.Code, p.Name + ' (' + p.Units + ') ' + ShortName AS Name,
 p.SalePrice * (1 + t.Rate) AS Price, 
-pt.Name AS Category
+pg.Name AS Group
 FROM Products p INNER JOIN Tax t ON p.SaleTaxID = t.TaxID
-INNER JOIN ProductTypes pt ON p.ProductTypeID = pt.ProductTypeID
-WHERE pt.IsForSale = 1 AND p.SalePrice > 0 AND p.Discontinued = 0
+INNER JOIN ProductGroup pg ON p.ProductGroupID = pg.ProductGroupID
+WHERE p.SalePrice >= 0 AND p.Discontinued = 0
 ";
             string[] n = filter["Name"].Split(" ".ToCharArray());
 
@@ -203,18 +203,18 @@ WHERE pt.IsForSale = 1 AND p.SalePrice > 0 AND p.Discontinued = 0
             string query = @"
 WITH ProductsRN AS
 (SELECT *, ROW_NUMBER() OVER(ORDER BY Name) AS RowNum FROM Products WHERE Name LIKE '%{0}%')
-SELECT TOP {1} p.*, pt.Name AS Type FROM ProductsRN p INNER JOIN ProductTypes pt ON p.ProductTypeID = pt.ProductTypeID WHERE RowNum > {2}
+SELECT TOP {1} p.*, pg.Name AS Group FROM ProductsRN p INNER JOIN ProductGroup pg ON p.ProductGroupID = pg.ProductGroupID WHERE RowNum > {2}
 ";
             query = string.Format(query, name, count, skip);
             return BusinessObjectDAO<ProductDisplayBO>.GetBusinessObjects(connection.ExecuteReader(query));
 
         }
-        public List<ProductDisplaySmallBO> GetProducts(Guid productTypeID)
+        public List<ProductDisplaySmallBO> GetProducts(Guid productGroupID)
         {
             List<ProductDisplaySmallBO> list = new List<ProductDisplaySmallBO>();
-            string query = "SELECT ProductID, Code, Name + ' (' + Units + ')' AS Name, SalePrice AS Price, '' AS Category FROM Products WHERE ProductTypeID = @ProductTypeID ORDER BY Code;";
+            string query = "SELECT ProductID, Code, Name + ' (' + Units + ')' AS Name, SalePrice AS Price, '' AS Category FROM Products WHERE ProductGroupID = @ProductGroupID ORDER BY Code;";
             SqlCommand cmd = new SqlCommand(query);
-            cmd.Parameters.AddWithValue("@ProductTypeID", productTypeID);
+            cmd.Parameters.AddWithValue("@ProductGroupID", productGroupID);
             using (IDataReader dr = connection.ExecuteReader(cmd))
             {
                 while (dr.Read())
diff --git a/Tanshu.Accounts.SqlDAO/ProductGroupModifierDAO.cs b/Tanshu.Accounts.SqlDAO/ProductGroupModifierDAO.cs
new file mode 100644
index 0000000..ef118fe
--- /dev/null
+++ b/Tanshu.Accounts.SqlDAO/ProductGroupModifierDAO.cs
@@ -0,0 +1,89 @@
+using System;
+using System.Collections.Generic;
+using System.Data.SqlClient;
+using Tanshu.Accounts.Contracts;
+using Tanshu.Data.DAO;
+using Tanshu.Accounts.DAOFactory;
+using FluentNHibernate.Automapping;
+using FluentNHibernate.Cfg;
+
+namespace Tanshu.Accounts.SqlDAO
+{
+    public class ProductGroupModifierDAO : BaseDAO, IProductGroupModifierDAO
+    {
+        public ProductGroupModifierDAO(IConnectionDAO connection)
+            : base(connection)
+        { }
+
+        public bool Insert(ProductGroupModifierBO productGroupModifier)
+        {
+            using (SqlCommand cmd = new SqlCommand(@"
+SELECT @ProductGroupModifierID = ISNULL(MAX(ProductGroupModifierID),0) + 1 FROM ProductGroupModifierID;
+INSERT INTO ProductGroupModifier (ProductGroupModifierID, ProductGroupID, ModifierID, ShowAutomatically) VALUES (@ProductGroupModifierID, @ProductGroupID, @ModifierID, @ShowAutomatically);
+"))
+            {
+                cmd.Parameters.Add("@ProductGroupModifierID", System.Data.SqlDbType.Int);
+                cmd.Parameters["@ProductGroupModifierID"].Direction = System.Data.ParameterDirection.Output;
+                if (productGroupModifier.ProductGroupID.HasValue)
+                    cmd.Parameters.AddWithValue("@ProductGroupID", productGroupModifier.ProductGroupID);
+                else
+                    cmd.Parameters.AddWithValue("@ProductGroupID", DBNull.Value);
+                cmd.Parameters.AddWithValue("@ModifierID", productGroupModifier.ModifierID);
+                cmd.Parameters.AddWithValue("@ShowAutomatically", productGroupModifier.ShowAutomatically);
+                connection.ExecuteNonQuery(cmd);
+                productGroupModifier.ProductGroupModifierID = (int)cmd.Parameters["@ProductGroupModifierID"].Value;
+                return true;
+            }
+        }
+
+        public bool Update(ProductGroupModifierBO productGroupModifier)
+        {
+            using (SqlCommand cmd = new SqlCommand(@"UPDATE ProductGroupModifier SET ProductGroupID = @ProductGroupID, ModifierID = @ModifierID, ShowAutomatically = @ShowAutomatically WHERE ProductGroupModifierID = @ProductGroupModifierID;"))
+            {
+                cmd.Parameters.AddWithValue("@ProductGroupModifierID", productGroupModifier.ProductGroupModifierID);
+                if (productGroupModifier.ProductGroupID.HasValue)
+                    cmd.Parameters.AddWithValue("@ProductGroupID", productGroupModifier.ProductGroupID);
+                else
+                    cmd.Parameters.AddWithValue("@ProductGroupID", DBNull.Value);
+                cmd.Parameters.AddWithValue("@ModifierID", productGroupModifier.ModifierID);
+                cmd.Parameters.AddWithValue("@ShowAutomatically", productGroupModifier.ShowAutomatically);
+                connection.ExecuteNonQuery(cmd);
+                return true;
+            }
+        }
+
+        public bool Delete(int productGroupModifierID)
+        {
+            using (SqlCommand cmd = new SqlCommand("DELETE FROM ProductGroupModifier WHERE ProductGroupModifierID = @ProductGroupModifierID"))
+            {
+                cmd.Parameters.AddWithValue("@ProductGroupModifierID", productGroupModifierID);
+                connection.ExecuteNonQuery(cmd);
+                return true;
+            }
+        }
+
+        public List<ProductGroupModifierBO> GetProductGroupModifiers(Guid productGroupID)
+        {
+            SqlCommand cmd = new SqlCommand("SELECT * FROM ProductGroupModifier Where ProductGroupID = @ProductGroupID;");
+            cmd.Parameters.AddWithValue("@ProductGroupID", productGroupID);
+            return BusinessObjectDAO<ProductGroupModifierBO>.GetBusinessObjects(connection.ExecuteReader(cmd));
+        }
+
+        public List<ProductGroupModifierBO> GetProductGroupModifiers()
+        {
+            using (SqlCommand cmd = new SqlCommand("SELECT * FROM ProductGroupModifier"))
+            {
+                return BusinessObjectDAO<ProductGroupModifierBO>.GetBusinessObjects(connection.ExecuteReader(cmd));
+            }
+        }
+
+        public bool HasCompulsoryModifier(Guid productGroupID)
+        {
+            using (SqlCommand cmd = new SqlCommand("SELECT COUNT(*) FROM ProductGroupModifier WHERE ShowAutomatically = 1 AND (ProductGroupID IS NULL OR ProductGroupID = @ProductGroupID)"))
+            {
+                cmd.Parameters.AddWithValue("@ProductGroupID", productGroupID);
+                return (int)connection.ExecuteScalar(cmd) > 0;
+            }
+        }
+    }
+}
diff --git a/Tanshu.Accounts.SqlDAO/ProductTypeDAO.cs b/Tanshu.Accounts.SqlDAO/ProductTypeDAO.cs
index 19f5826..bad6012 100644
--- a/Tanshu.Accounts.SqlDAO/ProductTypeDAO.cs
+++ b/Tanshu.Accounts.SqlDAO/ProductTypeDAO.cs
@@ -8,78 +8,68 @@ using Tanshu.Accounts.DAOFactory;
 
 namespace Tanshu.Accounts.SqlDAO
 {
-    public class ProductTypeDAO : BaseDAO , IProductTypeDAO
+    public class ProductGroupDAO : BaseDAO , IProductGroupDAO
     {
-        public ProductTypeDAO(IConnectionDAO connection)
+        public ProductGroupDAO(IConnectionDAO connection)
             : base(connection)
         { }
 
-        public bool Insert(ProductTypeBO productType)
+        public bool Insert(ProductGroupBO productGroup)
         {
-            productType.ProductTypeID = Guid.NewGuid();
+            productGroup.ProductGroupID = Guid.NewGuid();
             using (SqlCommand cmd = new SqlCommand(@"
-SELECT @Code = ISNULL(MAX(Code),0) + 1 FROM ProductTypes WHERE Type = @Type;
-INSERT INTO ProductTypes (ProductTypeID, Code, Name, Type, ParentProductTypeID, CostCenterID) VALUES (@ProductTypeID, @Code, @Name, @Type, @ParentProductTypeID, @CostCenterID);
-SELECT @timestamp = timestamp FROM ProductTypes WHERE ProductTypeID = @ProductTypeID;
+SELECT @Code = ISNULL(MAX(Code),0) + 1 FROM ProductGroup WHERE ProductGroupID = @ProductGroupID;
+INSERT INTO ProductGroup (ProductGroupID, Name, DiscountLimit, IsModifierCompulsory) VALUES (@ProductGroupID, @Name, @DiscountLimit, @IsModifierCompulsory);
 "))
             {
-                cmd.Parameters.AddWithValue("@ProductTypeID", productType.ProductTypeID);
-                cmd.Parameters.AddWithValue("@Name", productType.Name);
-                cmd.Parameters.AddWithValue("@DiscountLimit", productType.DiscountLimit);
-                cmd.Parameters.AddWithValue("@IsForSale", productType.IsForSale);
-                cmd.Parameters.AddWithValue("@IsForPurchase", productType.IsForPurchae);
-                cmd.Parameters.Add("@timestamp", System.Data.SqlDbType.Timestamp);
-                cmd.Parameters["@timestamp"].Direction = System.Data.ParameterDirection.Output;
+                cmd.Parameters.AddWithValue("@ProductGroupID", productGroup.ProductGroupID);
+                cmd.Parameters.AddWithValue("@Name", productGroup.Name);
+                cmd.Parameters.AddWithValue("@DiscountLimit", productGroup.DiscountLimit);
+                cmd.Parameters.AddWithValue("@IsModifierCompulsory", productGroup.IsModifierCompulsory);
                 connection.ExecuteNonQuery(cmd);
-                productType.timestamp = (byte[])cmd.Parameters["@timestamp"].Value;
                 return true;
             }
         }
-        public ProductTypeBO GetProductType(Guid productTypeID)
+        public ProductGroupBO GetProductGroup(Guid productGroupID)
         {
-            SqlCommand cmd = new SqlCommand("SELECT * FROM ProductTypes WHERE ProductTypeID = @ProductTypeID");
-            cmd.Parameters.AddWithValue("@ProductTypeID", productTypeID);
-            return BusinessObjectDAO<ProductTypeBO>.GetBusinessObject(connection.ExecuteReader(cmd));
+            SqlCommand cmd = new SqlCommand("SELECT * FROM ProductGroup WHERE ProductGroupID = @ProductGroupID");
+            cmd.Parameters.AddWithValue("@ProductGroupID", productGroupID);
+            return BusinessObjectDAO<ProductGroupBO>.GetBusinessObject(connection.ExecuteReader(cmd));
         }
-        public ProductTypeBO GetProductType(string name)
+        public ProductGroupBO GetProductGroup(string name)
         {
-            SqlCommand cmd = new SqlCommand("SELECT * FROM ProductTypes WHERE Name = @Name");
+            SqlCommand cmd = new SqlCommand("SELECT * FROM ProductGroup WHERE Name = @Name");
             cmd.Parameters.AddWithValue("@Name", name);
-            return BusinessObjectDAO<ProductTypeBO>.GetBusinessObject(connection.ExecuteReader(cmd));
+            return BusinessObjectDAO<ProductGroupBO>.GetBusinessObject(connection.ExecuteReader(cmd));
         }
-        public bool Delete(Guid productTypeID)
+        public bool Delete(Guid productGroupID)
         {
-            using (SqlCommand cmd = new SqlCommand("DELETE FROM ProductTypes WHERE ProductTypeID = @ProductTypeID"))
+            using (SqlCommand cmd = new SqlCommand("DELETE FROM ProductGroup WHERE ProductGroupID = @ProductGroupID"))
             {
-                cmd.Parameters.AddWithValue("@ProductTypeID", productTypeID);
+                cmd.Parameters.AddWithValue("@ProductGroupID", productGroupID);
                 connection.ExecuteNonQuery(cmd);
                 return true;
             }
         }
-        public bool Update(ProductTypeBO productType)
+        public bool Update(ProductGroupBO productGroup)
         {
 
             using (SqlCommand cmd = new SqlCommand(@"
-UPDATE ProductTypes SET Code = @Code, Name = @Name, Type = @Type, ParentProductTypeID = @ParentProductTypeID, CostCenterID = @CostCenterID WHERE ProductTypeID = @ProductTypeID
-SELECT @timestamp = timestamp FROM ProductTypes WHERE ProductTypeID = @ProductTypeID;
+UPDATE ProductGroup SET Name = @Name, DiscountLimit = @DiscountLimit, IsModifierCompulsory = @IsModifierCompulsory WHERE ProductGroupID = @ProductGroupID
 "))
             {
-                cmd.Parameters.AddWithValue("@ProductTypeID", productType.ProductTypeID);
-                cmd.Parameters.AddWithValue("@Name", productType.Name);
-                cmd.Parameters.AddWithValue("@DiscountLimit", productType.DiscountLimit);
-                cmd.Parameters.AddWithValue("@IsForSale", productType.IsForSale);
-                cmd.Parameters.AddWithValue("@IsForPurchase", productType.IsForPurchae);
-                cmd.Parameters.Add("@timestamp", System.Data.SqlDbType.Timestamp);
-                cmd.Parameters["@timestamp"].Direction = System.Data.ParameterDirection.Output;
+                cmd.Parameters.AddWithValue("@ProductGroupID", productGroup.ProductGroupID);
+                cmd.Parameters.AddWithValue("@Name", productGroup.Name);
+                cmd.Parameters.AddWithValue("@DiscountLimit", productGroup.DiscountLimit);
+                cmd.Parameters.AddWithValue("@IsModifierCompulsory", productGroup.IsModifierCompulsory);
                 connection.ExecuteNonQuery(cmd);
-                productType.timestamp = (byte[])cmd.Parameters["@timestamp"].Value;
                 return true;
             }
         }
-        public List<ProductTypeBO> GetProductTypes()
+        public List<ProductGroupBO> GetProductGroups()
         {
-            string query = "SELECT * from ProductTypes";
-            return BusinessObjectDAO<ProductTypeBO>.GetBusinessObjects(connection.ExecuteReader(query));
+            string query = "SELECT * from ProductGroup";
+            return BusinessObjectDAO<ProductGroupBO>.GetBusinessObjects(connection.ExecuteReader(query));
         }
 
     }
diff --git a/Tanshu.Accounts.SqlDAO/Tanshu.Accounts.SqlDAO.csproj b/Tanshu.Accounts.SqlDAO/Tanshu.Accounts.SqlDAO.csproj
index 4f2328b..867308e 100644
--- a/Tanshu.Accounts.SqlDAO/Tanshu.Accounts.SqlDAO.csproj
+++ b/Tanshu.Accounts.SqlDAO/Tanshu.Accounts.SqlDAO.csproj
@@ -65,6 +65,8 @@
     <Compile Include="AdvanceDAO.cs" />
     <Compile Include="BaseDAO.cs" />
     <Compile Include="CheckoutDAO.cs" />
+    <Compile Include="ProductGroupModifierDAO.cs" />
+    <Compile Include="ModifierDAO.cs" />
     <Compile Include="PrintLocationDAO.cs" />
     <Compile Include="FoodTableDAO.cs" />
     <Compile Include="ProductTypeDAO.cs" />
diff --git a/Tanshu.Accounts.SqlDAO/UserDAO.cs b/Tanshu.Accounts.SqlDAO/UserDAO.cs
index bbd1ead..832d289 100644
--- a/Tanshu.Accounts.SqlDAO/UserDAO.cs
+++ b/Tanshu.Accounts.SqlDAO/UserDAO.cs
@@ -15,18 +15,18 @@ namespace Tanshu.Accounts.SqlDAO
 
         public UserBO GetUser(Guid userID)
         {
-            SqlCommand cmd = new SqlCommand("SELECT * FROM Users WHERE UserID = @UserID");
+            SqlCommand cmd = new SqlCommand("SELECT * FROM Auth_Users WHERE UserID = @UserID");
             cmd.Parameters.AddWithValue("@UserID", userID);
             return BusinessObjectDAO<UserBO>.GetBusinessObject(connection.ExecuteReader(cmd));
         }
         public List<UserBO> GetUsers()
         {
-            return BusinessObjectDAO<UserBO>.GetBusinessObjects(connection.ExecuteReader("SELECT * FROM Users"));
+            return BusinessObjectDAO<UserBO>.GetBusinessObjects(connection.ExecuteReader("SELECT * FROM Auth_Users"));
         }
         public List<UserBO> GetFilteredUsers(Dictionary<string, string> filter)
         {
             string name = string.Format("%{0}%", filter["Name"]);
-            using (SqlCommand cmd = new SqlCommand("SELECT * FROM Users WHERE Name LIKE @Name ORDER BY Name"))
+            using (SqlCommand cmd = new SqlCommand("SELECT * FROM Auth_Users WHERE Name LIKE @Name ORDER BY Name"))
             {
                 cmd.Parameters.AddWithValue("@Name", name);
                 return BusinessObjectDAO<UserBO>.GetBusinessObjects(connection.ExecuteReader(cmd));
@@ -34,7 +34,7 @@ namespace Tanshu.Accounts.SqlDAO
         }
         public bool UserExists(string userName)
         {
-            using (SqlCommand cmd = new SqlCommand("SELECT Count(*) FROM Users WHERE Name = @Name"))
+            using (SqlCommand cmd = new SqlCommand("SELECT Count(*) FROM Auth_Users WHERE Name = @Name"))
             {
                 cmd.Parameters.AddWithValue("@Name", userName);
                 return (int)connection.ExecuteScalar(cmd) == 1;
@@ -44,9 +44,9 @@ namespace Tanshu.Accounts.SqlDAO
         {
             using (SqlCommand cmd = new SqlCommand(@"
 SELECT @UserID = NEWID()
-INSERT INTO Users (UserID, Name, Password, LockedOut) 
+INSERT INTO Auth_Users (UserID, Name, Password, LockedOut) 
 VALUES (@UserID, @Name, @Password, @LockedOut)
-SELECT @timestamp = timestamp FROM Users WHERE UserID = @UserID
+SELECT @timestamp = timestamp FROM Auth_Users WHERE UserID = @UserID
 "))
             {
                 cmd.Parameters.Add("@UserID", System.Data.SqlDbType.UniqueIdentifier);
@@ -64,7 +64,7 @@ SELECT @timestamp = timestamp FROM Users WHERE UserID = @UserID
         }
         //public bool CheckPassword(string userName, string password)
         //{
-        //    using (SqlCommand cmd = new SqlCommand("SELECT Count(*) FROM Users WHERE Name = @Name AND Password = @Password"))
+        //    using (SqlCommand cmd = new SqlCommand("SELECT Count(*) FROM Auth_Users WHERE Name = @Name AND Password = @Password"))
         //    {
         //        cmd.Parameters.AddWithValue("@Name", userName);
         //        cmd.Parameters.AddWithValue("@Password", password);
@@ -73,7 +73,7 @@ SELECT @timestamp = timestamp FROM Users WHERE UserID = @UserID
         //}
         public bool ChangePassword(UserBO userData, string newPassword)
         {
-            using (SqlCommand cmd = new SqlCommand("UPDATE Users SET Password = @NewPassword WHERE Name = @Name AND Password = @Password; SELECT @@rowcount"))
+            using (SqlCommand cmd = new SqlCommand("UPDATE Auth_Users SET Password = @NewPassword WHERE Name = @Name AND Password = @Password; SELECT @@rowcount"))
             {
                 cmd.Parameters.AddWithValue("@Name", userData.Name);
                 cmd.Parameters.AddWithValue("@Password", userData.Password);
@@ -85,12 +85,12 @@ SELECT @timestamp = timestamp FROM Users WHERE UserID = @UserID
         public bool Update(UserBO user)
         {
             using (SqlCommand cmd = new SqlCommand(@"
-UPDATE Users SET 
+UPDATE Auth_Users SET 
     Name = @Name, 
     Password = @Password, 
     LockedOut = @LockedOut
 WHERE UserID = @UserID;
-SELECT @timestamp = timestamp FROM Users WHERE UserID = @UserID
+SELECT @timestamp = timestamp FROM Auth_Users WHERE UserID = @UserID
 "))
             {
                 cmd.Parameters.AddWithValue("@UserID", user.UserID);
@@ -107,7 +107,7 @@ SELECT @timestamp = timestamp FROM Users WHERE UserID = @UserID
 
         public bool Delete(Guid userID)
         {
-            using (SqlCommand cmd = new SqlCommand("DELETE FROM Users WHERE UserID = @UserID"))
+            using (SqlCommand cmd = new SqlCommand("DELETE FROM Auth_Users WHERE UserID = @UserID"))
             {
                 cmd.Parameters.AddWithValue("@UserID", userID);
                 connection.ExecuteNonQuery(cmd);