From 853fad06921adfd51fac3e40513d653fc3ad60d1 Mon Sep 17 00:00:00 2001
From: unknown <tanshu@.(none)>
Date: Mon, 10 Jan 2011 05:06:24 +0530
Subject: [PATCH] Partly working

---
 Tanshu.Accounts.BI/FoodTableBI.cs             |  69 +++
 Tanshu.Accounts.BI/ProductBI.cs               |   4 +-
 Tanshu.Accounts.BI/ProductTypeBI.cs           |  69 +++
 Tanshu.Accounts.BI/Tanshu.Accounts.BI.csproj  |   2 +
 .../DAOFactory/FoodTableDAO.cs                |  15 +
 .../DAOFactory/ProductDAO.cs                  |   5 +-
 .../DAOFactory/ProductTypeDAO.cs              |  17 +
 .../Data Contracts/FoodTableBO.cs             |  11 +
 .../Data Contracts/SalesBillItemBO.cs         |   2 +-
 .../Service Contracts/FoodTableBI.cs          |  18 +
 .../Service Contracts/ProductBI.cs            |  12 +-
 .../Service Contracts/ProductTypesBI.cs       |  19 +
 .../Tanshu.Accounts.Contracts.csproj          |   5 +
 Tanshu.Accounts.DAOFactory/DAOFactory.cs      |   2 +
 .../SqlServerDAOFactory.cs                    |   9 +
 Tanshu.Accounts.Helpers/ControlFactory.cs     | 107 +++-
 Tanshu.Accounts.PointOfSale/App.config        |   2 +-
 .../Authentication/LoginForm.cs               |   2 -
 Tanshu.Accounts.PointOfSale/ProductsForm.cs   |   2 +-
 .../Sales/SalesForm.Designer.cs               | 544 ++----------------
 .../Sales/SalesForm.cs                        | 439 +++++---------
 .../Sales/SalesForm.resx                      |  30 +-
 Tanshu.Accounts.SqlDAO/FoodTableDAO.cs        |  43 ++
 Tanshu.Accounts.SqlDAO/ProductDAO.cs          |  31 +-
 Tanshu.Accounts.SqlDAO/ProductTypeDAO.cs      |  86 +++
 .../Tanshu.Accounts.SqlDAO.csproj             |   2 +
 26 files changed, 706 insertions(+), 841 deletions(-)
 create mode 100644 Tanshu.Accounts.BI/FoodTableBI.cs
 create mode 100644 Tanshu.Accounts.BI/ProductTypeBI.cs
 create mode 100644 Tanshu.Accounts.Contracts/DAOFactory/FoodTableDAO.cs
 create mode 100644 Tanshu.Accounts.Contracts/DAOFactory/ProductTypeDAO.cs
 create mode 100644 Tanshu.Accounts.Contracts/Data Contracts/FoodTableBO.cs
 create mode 100644 Tanshu.Accounts.Contracts/Service Contracts/FoodTableBI.cs
 create mode 100644 Tanshu.Accounts.Contracts/Service Contracts/ProductTypesBI.cs
 create mode 100644 Tanshu.Accounts.SqlDAO/FoodTableDAO.cs
 create mode 100644 Tanshu.Accounts.SqlDAO/ProductTypeDAO.cs

diff --git a/Tanshu.Accounts.BI/FoodTableBI.cs b/Tanshu.Accounts.BI/FoodTableBI.cs
new file mode 100644
index 0000000..84dacbd
--- /dev/null
+++ b/Tanshu.Accounts.BI/FoodTableBI.cs
@@ -0,0 +1,69 @@
+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 class FoodTableBI : IFoodTableBI
+    {
+        public void Insert(FoodTableBO foodTable)
+        {
+            GetFactory factory = GetFactory.GetDAOFactory(Database.GetFactoryType);
+            using (IConnectionDAO connection = factory.Connection)
+            {
+                using (IFoodTableDAO dao = factory.GetFoodTableDAO(connection))
+                {
+                    dao.Insert(foodTable);
+                }
+            }
+        }
+        public void Update(FoodTableBO foodTable)
+        {
+            GetFactory factory = GetFactory.GetDAOFactory(Database.GetFactoryType);
+            using (IConnectionDAO connection = factory.Connection)
+            {
+                using (IFoodTableDAO dao = factory.GetFoodTableDAO(connection))
+                {
+                    dao.Update(foodTable);
+                }
+            }
+        }
+        public bool Delete(int tableID)
+        {
+            GetFactory factory = GetFactory.GetDAOFactory(Database.GetFactoryType);
+            using (IConnectionDAO connection = factory.Connection)
+            {
+                using (IFoodTableDAO dao = factory.GetFoodTableDAO(connection))
+                {
+                    return dao.Delete(tableID);
+                }
+            }
+        }
+        public FoodTableBO GetFoodTable(int tableID)
+        {
+            GetFactory factory = GetFactory.GetDAOFactory(Database.GetFactoryType);
+            using (IConnectionDAO connection = factory.Connection)
+            {
+                using (IFoodTableDAO dao = factory.GetFoodTableDAO(connection))
+                {
+                    return dao.GetFoodTable(tableID);
+                }
+            }
+        }
+        public List<FoodTableBO> GetFoodTables()
+        {
+            GetFactory factory = GetFactory.GetDAOFactory(Database.GetFactoryType);
+            using (IConnectionDAO connection = factory.Connection)
+            {
+                using (IFoodTableDAO dao = factory.GetFoodTableDAO(connection))
+                {
+                    return dao.GetFoodTables();
+                }
+            }
+        }
+    }
+}
diff --git a/Tanshu.Accounts.BI/ProductBI.cs b/Tanshu.Accounts.BI/ProductBI.cs
index 21dcea1..37a42d2 100644
--- a/Tanshu.Accounts.BI/ProductBI.cs
+++ b/Tanshu.Accounts.BI/ProductBI.cs
@@ -119,14 +119,14 @@ namespace Tanshu.Accounts.BI
             filter.Add("Type", "");
             return GetFilteredProducts(filter);
         }
-        public List<ProductTypeBO> GetProductTypes()
+        public List<ProductDisplaySmallBO> GetProducts(Guid productTypeID)
         {
             GetFactory factory = GetFactory.GetDAOFactory(Database.GetFactoryType);
             using (IConnectionDAO connection = factory.Connection)
             {
                 using (IProductDAO dao = factory.GetProductDAO(connection))
                 {
-                    return dao.GetProductTypes();
+                    return dao.GetProducts(productTypeID);
                 }
             }
         }
diff --git a/Tanshu.Accounts.BI/ProductTypeBI.cs b/Tanshu.Accounts.BI/ProductTypeBI.cs
new file mode 100644
index 0000000..e13624d
--- /dev/null
+++ b/Tanshu.Accounts.BI/ProductTypeBI.cs
@@ -0,0 +1,69 @@
+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 class ProductTypeBI : IProductTypeBI
+    {
+        public ProductTypeBO GetProductType(Guid productTypeID)
+        {
+            GetFactory factory = GetFactory.GetDAOFactory(Database.GetFactoryType);
+            using (IConnectionDAO connection = factory.Connection)
+            {
+                using (var dao = factory.GetProductTypeDAO(connection))
+                {
+                    return dao.GetProductType(productTypeID);
+                }
+            }
+        }
+        public ProductTypeBO GetProductTypeByName(string name)
+        {
+            GetFactory factory = GetFactory.GetDAOFactory(Database.GetFactoryType);
+            using (IConnectionDAO connection = factory.Connection)
+            {
+                using (var dao = factory.GetProductTypeDAO(connection))
+                {
+                    return dao.GetProductType(name);
+                }
+            }
+        }
+        public bool Insert(ProductTypeBO productType)
+        {
+            GetFactory factory = GetFactory.GetDAOFactory(Database.GetFactoryType);
+            using (IConnectionDAO connection = factory.Connection)
+            {
+                using (var dao = factory.GetProductTypeDAO(connection))
+                {
+                    return dao.Insert(productType);
+                }
+            }
+        }
+        public bool Update(ProductTypeBO productType)
+        {
+            GetFactory factory = GetFactory.GetDAOFactory(Database.GetFactoryType);
+            using (IConnectionDAO connection = factory.Connection)
+            {
+                using (var dao = factory.GetProductTypeDAO(connection))
+                {
+                    return dao.Update(productType);
+                }
+            }
+        }
+        public List<ProductTypeBO> GetProductTypes()
+        {
+            GetFactory factory = GetFactory.GetDAOFactory(Database.GetFactoryType);
+            using (IConnectionDAO connection = factory.Connection)
+            {
+                using (var dao = factory.GetProductTypeDAO(connection))
+                {
+                    return dao.GetProductTypes();
+                }
+            }
+        }
+    }
+}
diff --git a/Tanshu.Accounts.BI/Tanshu.Accounts.BI.csproj b/Tanshu.Accounts.BI/Tanshu.Accounts.BI.csproj
index 77622f1..7910111 100644
--- a/Tanshu.Accounts.BI/Tanshu.Accounts.BI.csproj
+++ b/Tanshu.Accounts.BI/Tanshu.Accounts.BI.csproj
@@ -64,6 +64,8 @@
   <ItemGroup>
     <Compile Include="AdvanceBI.cs" />
     <Compile Include="CheckoutBI.cs" />
+    <Compile Include="FoodTableBI.cs" />
+    <Compile Include="ProductTypeBI.cs" />
     <Compile Include="CustomerBI.cs" />
     <Compile Include="ManagementBI.cs" />
     <Compile Include="RoleBI.cs" />
diff --git a/Tanshu.Accounts.Contracts/DAOFactory/FoodTableDAO.cs b/Tanshu.Accounts.Contracts/DAOFactory/FoodTableDAO.cs
new file mode 100644
index 0000000..a4052bb
--- /dev/null
+++ b/Tanshu.Accounts.Contracts/DAOFactory/FoodTableDAO.cs
@@ -0,0 +1,15 @@
+using System;
+using System.Collections.Generic;
+using Tanshu.Accounts.Contracts;
+
+namespace Tanshu.Accounts.DAOFactory
+{
+    public interface IFoodTableDAO : IDisposable
+    {
+        void Insert(FoodTableBO foodTable);
+        void Update(FoodTableBO foodTable);
+        bool Delete(int tableID);
+        FoodTableBO GetFoodTable(int tableID);
+        List<FoodTableBO> GetFoodTables();
+    }
+}
\ No newline at end of file
diff --git a/Tanshu.Accounts.Contracts/DAOFactory/ProductDAO.cs b/Tanshu.Accounts.Contracts/DAOFactory/ProductDAO.cs
index 273764d..6399661 100644
--- a/Tanshu.Accounts.Contracts/DAOFactory/ProductDAO.cs
+++ b/Tanshu.Accounts.Contracts/DAOFactory/ProductDAO.cs
@@ -19,8 +19,9 @@ namespace Tanshu.Accounts.DAOFactory
 
         List<ProductDisplaySmallBO> GetFilteredProducts(Dictionary<string, string> filter);
 
-        List<ProductTypeBO> GetProductTypes();
-
         List<ProductDisplayBO> GetProducts(string name, int skip, int count);
+
+        List<ProductDisplaySmallBO> GetProducts(Guid productTypeID);
+
     }
 }
diff --git a/Tanshu.Accounts.Contracts/DAOFactory/ProductTypeDAO.cs b/Tanshu.Accounts.Contracts/DAOFactory/ProductTypeDAO.cs
new file mode 100644
index 0000000..590a84e
--- /dev/null
+++ b/Tanshu.Accounts.Contracts/DAOFactory/ProductTypeDAO.cs
@@ -0,0 +1,17 @@
+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/FoodTableBO.cs b/Tanshu.Accounts.Contracts/Data Contracts/FoodTableBO.cs
new file mode 100644
index 0000000..cade291
--- /dev/null
+++ b/Tanshu.Accounts.Contracts/Data Contracts/FoodTableBO.cs	
@@ -0,0 +1,11 @@
+using System;
+using System.Runtime.Serialization;
+
+namespace Tanshu.Accounts.Contracts
+{
+    public class FoodTableBO
+    {
+        public int TableID { get; set; }
+        public string Name { get; set; }
+    }
+}
diff --git a/Tanshu.Accounts.Contracts/Data Contracts/SalesBillItemBO.cs b/Tanshu.Accounts.Contracts/Data Contracts/SalesBillItemBO.cs
index 89d591e..7565367 100644
--- a/Tanshu.Accounts.Contracts/Data Contracts/SalesBillItemBO.cs	
+++ b/Tanshu.Accounts.Contracts/Data Contracts/SalesBillItemBO.cs	
@@ -18,7 +18,7 @@ namespace Tanshu.Accounts.Contracts
             get { return price; }
             set
             {
-                if (value <= 0)
+                if (value < 0)
                     throw new ArgumentException("Price has to be non-negative greater than zero.");
                 else
                     price = value;
diff --git a/Tanshu.Accounts.Contracts/Service Contracts/FoodTableBI.cs b/Tanshu.Accounts.Contracts/Service Contracts/FoodTableBI.cs
new file mode 100644
index 0000000..df31a2a
--- /dev/null
+++ b/Tanshu.Accounts.Contracts/Service Contracts/FoodTableBI.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 IFoodTableBI
+    {
+        void Insert(FoodTableBO foodTable);
+        void Update(FoodTableBO foodTable);
+        bool Delete(int tableID);
+        FoodTableBO GetFoodTable(int tableID);
+        List<FoodTableBO> GetFoodTables();
+    }
+}
diff --git a/Tanshu.Accounts.Contracts/Service Contracts/ProductBI.cs b/Tanshu.Accounts.Contracts/Service Contracts/ProductBI.cs
index a8e3cb2..a0b319f 100644
--- a/Tanshu.Accounts.Contracts/Service Contracts/ProductBI.cs	
+++ b/Tanshu.Accounts.Contracts/Service Contracts/ProductBI.cs	
@@ -6,26 +6,16 @@ using System.Data.SqlClient;
 
 namespace Tanshu.Accounts.Contracts
 {
-    [ServiceContract]
     public interface IProductBI
     {
-        [OperationContract]
         bool Insert(ProductBO product);
-        [OperationContract]
         bool Update(ProductBO product);
-        [OperationContract]
         bool Delete(Guid productID);
-        [OperationContract]
         ProductBO GetProductFromName(string nameAndUnits);
-        [OperationContract]
         ProductBO GetProduct(Guid productID);
-        [OperationContract]
         decimal GetProductStock(DateTime date, Guid productID, Guid? voucherID);
-        [OperationContract]
         List<ProductDisplayBO> GetProducts();
-        [OperationContract]
         List<ProductDisplaySmallBO> GetFilteredProducts(Dictionary<string, string> filter);
-        [OperationContract]
-        List<ProductTypeBO> GetProductTypes();
+        List<ProductDisplaySmallBO> GetProducts(Guid productTypeID);
     }
 }
diff --git a/Tanshu.Accounts.Contracts/Service Contracts/ProductTypesBI.cs b/Tanshu.Accounts.Contracts/Service Contracts/ProductTypesBI.cs
new file mode 100644
index 0000000..83aa989
--- /dev/null
+++ b/Tanshu.Accounts.Contracts/Service Contracts/ProductTypesBI.cs	
@@ -0,0 +1,19 @@
+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 8b1abd7..8a88cdd 100644
--- a/Tanshu.Accounts.Contracts/Tanshu.Accounts.Contracts.csproj
+++ b/Tanshu.Accounts.Contracts/Tanshu.Accounts.Contracts.csproj
@@ -56,6 +56,8 @@
     <Compile Include="Communication\Delegates.cs" />
     <Compile Include="DAOFactory\CheckoutDAO.cs" />
     <Compile Include="DAOFactory\AdvanceDAO.cs" />
+    <Compile Include="DAOFactory\FoodTableDAO.cs" />
+    <Compile Include="DAOFactory\ProductTypeDAO.cs" />
     <Compile Include="DAOFactory\ManagementDAO.cs" />
     <Compile Include="DAOFactory\PaymentDAO.cs" />
     <Compile Include="DAOFactory\SalesAnalysisDAO.cs" />
@@ -74,6 +76,7 @@
     <Compile Include="Data Contracts\AdvanceDisplayBO.cs" />
     <Compile Include="Data Contracts\ComplexProductBO.cs" />
     <Compile Include="Data Contracts\BillItemKey.cs" />
+    <Compile Include="Data Contracts\FoodTableBO.cs" />
     <Compile Include="Data Contracts\SalarySheetBO.cs" />
     <Compile Include="Data Contracts\SalarySheetDisplayBO.cs" />
     <Compile Include="Data Contracts\TaxBO.cs" />
@@ -109,6 +112,8 @@
     <Compile Include="Roles.cs" />
     <Compile Include="Service Contracts\AdvanceBI.cs" />
     <Compile Include="Service Contracts\CheckoutBI.cs" />
+    <Compile Include="Service Contracts\FoodTableBI.cs" />
+    <Compile Include="Service Contracts\ProductTypesBI.cs" />
     <Compile Include="Service Contracts\CustomerBI.cs" />
     <Compile Include="Service Contracts\WaiterBI.cs" />
     <Compile Include="Service Contracts\LedgerBI.cs" />
diff --git a/Tanshu.Accounts.DAOFactory/DAOFactory.cs b/Tanshu.Accounts.DAOFactory/DAOFactory.cs
index e18c37c..66d07e9 100644
--- a/Tanshu.Accounts.DAOFactory/DAOFactory.cs
+++ b/Tanshu.Accounts.DAOFactory/DAOFactory.cs
@@ -19,12 +19,14 @@ namespace Tanshu.Accounts.DAOFactory
         public abstract IAdvanceDAO GetAdvanceDAO(IConnectionDAO connection);
         public abstract ICheckoutDAO GetCheckoutDAO(DateTime startDate, DateTime finishDate, Guid userID, IConnectionDAO connection);
         public abstract ICustomerDAO GetCustomerDAO(IConnectionDAO connection);
+        public abstract IFoodTableDAO GetFoodTableDAO(IConnectionDAO connection);
         public abstract IInventoryDAO GetInventoryDAO(IConnectionDAO connection);
         public abstract ILedgerDAO GetLedgerDAO(IConnectionDAO connection);
         public abstract IManagementDAO GetManagementDAO(DateTime startDate, DateTime finishDate, IConnectionDAO connection);
         public abstract IMembershipDAO GetMembershipDAO(IConnectionDAO connection);
         public abstract IPaymentDAO GetPaymentDAO(IConnectionDAO connection);
         public abstract IProductDAO GetProductDAO(IConnectionDAO connection);
+        public abstract IProductTypeDAO GetProductTypeDAO(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 55a9676..7d248fd 100644
--- a/Tanshu.Accounts.DAOFactory/SqlServerDAOFactory.cs
+++ b/Tanshu.Accounts.DAOFactory/SqlServerDAOFactory.cs
@@ -29,6 +29,11 @@ namespace Tanshu.Accounts.DAOFactory
             return new CustomerDAO(connection);
         }
 
+        public override IFoodTableDAO GetFoodTableDAO(IConnectionDAO connection)
+        {
+            return new FoodTableDAO(connection);
+        }
+
         public override IInventoryDAO GetInventoryDAO(IConnectionDAO connection)
         {
             return new InventoryDAO(connection);
@@ -58,6 +63,10 @@ namespace Tanshu.Accounts.DAOFactory
         {
             return new ProductDAO(connection);
         }
+        public override IProductTypeDAO GetProductTypeDAO(IConnectionDAO connection)
+        {
+            return new ProductTypeDAO(connection);
+        }
 
         public override ISalesAnalysisDAO GetSalesAnalysisDAO(IConnectionDAO connection)
         {
diff --git a/Tanshu.Accounts.Helpers/ControlFactory.cs b/Tanshu.Accounts.Helpers/ControlFactory.cs
index 3392dab..7bb88ca 100644
--- a/Tanshu.Accounts.Helpers/ControlFactory.cs
+++ b/Tanshu.Accounts.Helpers/ControlFactory.cs
@@ -10,39 +10,122 @@ namespace Tanshu.Accounts.Helpers
 {
     public static class ControlFactory
     {
-        public static void GenerateButtons(ref Panel panel, Rectangle clientArea, int x, int y, int border, List<ProductDisplaySmallBO> list, ButtonClickDelegate bcDelegate)
+        public static void GenerateButtons(ref Panel panel, ref List<Button> buttonList, Rectangle clientArea, int x, int y, int border, List<ProductDisplaySmallBO> 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 i = 0; i < x; i++)
+            for (int j = 0; j < y; j++)
             {
-                left = clientArea.Left + (i * (width + border));
-                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;
-                    top = clientArea.Top + (j * (height + border));
-                    ProductDisplaySmallBO item = list[(i * x) + j];
+                    left = clientArea.Left + (i * (width + border));
+                    ProductDisplaySmallBO item = list[(j * x) + i];
                     Button btn = GetButton(string.Format("{0}-{1}", i, j), item.Name, width, height, left, top, item.ProductID, bcDelegate);
                     panel.Controls.Add(btn);
+                    buttonList.Add(btn);
                 }
             }
         }
 
-        public static void GenerateButtons(ref Panel panel, Rectangle clientArea, int x, int y, int border, ButtonClickDelegate bcDelegate)
+        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)
         {
+            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;
-            for (int i = 0; i < x; i++)
+            int left = 0, top = 0, count = 0;
+            if (list.Count > x * y)
             {
-                int left = clientArea.Left + (i * (width + border));
-                for (int j = 0; j < y; j++)
+                if (page != 0)
+                    list.RemoveRange(0, y * page);
+                if (list.Count > y)
+                    list.RemoveRange(y, list.Count - y);
+                //int pages = Convert.ToInt32(Math.Ceiling(Convert.ToDouble(list.Count / (x * y)))) - 1;
+                //if (page > 0)
+                //    startButton = true;
+                //if (page != pages)
+                //    finishButton = true;
+                //if (startButton)
+                //{
+                //    list.RemoveRange(0, start);
+                //    list.Insert(0, new ProductTypeBO() { Name = "Previous", ProductTypeID = 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() });
+                //}
+                // the list is long
+
+            }
+            int sJ = 0;
+            int sI = 0;
+            //Math.DivRem(start, x, out sI);
+            //sJ = (start - sI) / y;
+            //count = start - 1;
+            for (int j = sJ; j < y; j++)
+            {
+                top = clientArea.Top + (j * (height + border));
+                for (int i = sI; i < x; i++)
                 {
-                    int top = clientArea.Top + (j * (height + border));
-                    Button btn = GetButton(string.Format("{0}-{1}", i, j), string.Format("{0}-{1}", i, j), width, height, left, top, string.Format("{0}-{1} Clicked", i, j), bcDelegate);
+                    count++;
+                    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);
                     panel.Controls.Add(btn);
+                    buttonList.Add(btn);
+                }
+            }
+        }
+        public static void GenerateButtons(ref Panel panel, ref List<Button> buttonList, Rectangle clientArea, int x, int y, int border, List<FoodTableBO> 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));
+                    //ProductTypeBO item = list[(j * x) + i];
+                    FoodTableBO item = list[count - 1];
+                    Button btn = GetButton(string.Format("{0}-{1}", i, j), item.Name, width, height, left, top, item.TableID, bcDelegate);
+                    panel.Controls.Add(btn);
+                    buttonList.Add(btn);
                 }
             }
         }
diff --git a/Tanshu.Accounts.PointOfSale/App.config b/Tanshu.Accounts.PointOfSale/App.config
index c5dcea1..9535e88 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=.;Initial Catalog=PeithoPOS;User ID=sa;Password=123456" />
+    <add name="connection" connectionString="Server=.;Initial Catalog=PeithoSales;User ID=sa;Password=123456" />
   </connectionStrings>
   <appSettings>
     <add key ="Factory" value ="SqlServer"/>
diff --git a/Tanshu.Accounts.PointOfSale/Authentication/LoginForm.cs b/Tanshu.Accounts.PointOfSale/Authentication/LoginForm.cs
index 8843eff..60f8a4d 100644
--- a/Tanshu.Accounts.PointOfSale/Authentication/LoginForm.cs
+++ b/Tanshu.Accounts.PointOfSale/Authentication/LoginForm.cs
@@ -12,13 +12,11 @@ namespace Tanshu.Accounts.PointOfSale
         private static readonly Tanshu.Logging.SqlLogger log = new Tanshu.Logging.SqlLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
         private bool isAuthenticated;
         private string userName;
-        private bool cancelled;
         public LoginForm()
         {
             InitializeComponent();
             isAuthenticated = false;
             userName = null;
-            cancelled = true;
         }
 
         private void txtUserName_KeyDown(object sender, KeyEventArgs e)
diff --git a/Tanshu.Accounts.PointOfSale/ProductsForm.cs b/Tanshu.Accounts.PointOfSale/ProductsForm.cs
index 7bc7e29..fc0a44a 100644
--- a/Tanshu.Accounts.PointOfSale/ProductsForm.cs
+++ b/Tanshu.Accounts.PointOfSale/ProductsForm.cs
@@ -48,7 +48,7 @@ namespace Tanshu.Accounts.PointOfSale
                 new StringType ("Bottle"),
                 new StringType ("Pack" )};
 
-            bsTypes.DataSource = new ProductBI().GetProductTypes();
+            bsTypes.DataSource = new ProductTypeBI().GetProductTypes();
             bsPurchaseLedgers.DataSource = new LedgerBI().GetLedgersOfType('P');
             bsSalesLedgers.DataSource = new LedgerBI().GetLedgersOfType('X');
             bsSalesTax.DataSource = new LedgerBI().GetLedgersOfType('T');
diff --git a/Tanshu.Accounts.PointOfSale/Sales/SalesForm.Designer.cs b/Tanshu.Accounts.PointOfSale/Sales/SalesForm.Designer.cs
index 1d85f4a..7a76566 100644
--- a/Tanshu.Accounts.PointOfSale/Sales/SalesForm.Designer.cs
+++ b/Tanshu.Accounts.PointOfSale/Sales/SalesForm.Designer.cs
@@ -31,10 +31,6 @@
             this.components = new System.ComponentModel.Container();
             System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle();
             System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle();
-            this.bindingSource = new System.Windows.Forms.BindingSource(this.components);
-            this.bsWaiter = new System.Windows.Forms.BindingSource(this.components);
-            this.bsPending = new System.Windows.Forms.BindingSource(this.components);
-            this.tmrPending = new System.Windows.Forms.Timer(this.components);
             this.label7 = new System.Windows.Forms.Label();
             this.txtDiscount = new System.Windows.Forms.TextBox();
             this.Label12 = new System.Windows.Forms.Label();
@@ -42,17 +38,16 @@
             this.txtAmount = new System.Windows.Forms.TextBox();
             this.label6 = new System.Windows.Forms.Label();
             this.label5 = new System.Windows.Forms.Label();
-            this.txtNarration = new System.Windows.Forms.TextBox();
             this.txtGrossTax = new System.Windows.Forms.TextBox();
             this.dgvProducts = new System.Windows.Forms.DataGridView();
             this.Display = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.printedDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.additionalDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.bindingSource = new System.Windows.Forms.BindingSource(this.components);
             this.pnlBilling = new System.Windows.Forms.Panel();
             this.btnWaiter = new System.Windows.Forms.Button();
             this.txtCode = new System.Windows.Forms.TextBox();
             this.btnClear = new System.Windows.Forms.Button();
-            this.btnMultiPrint = new System.Windows.Forms.Button();
             this.btnRate = new System.Windows.Forms.Button();
             this.btnPrintKot = new System.Windows.Forms.Button();
             this.btnPrintBill = new System.Windows.Forms.Button();
@@ -61,8 +56,6 @@
             this.btnQuantity = new System.Windows.Forms.Button();
             this.txtTableID = new System.Windows.Forms.TextBox();
             this.label11 = new System.Windows.Forms.Label();
-            this.label10 = new System.Windows.Forms.Label();
-            this.txtUserID = new System.Windows.Forms.TextBox();
             this.label9 = new System.Windows.Forms.Label();
             this.label8 = new System.Windows.Forms.Label();
             this.label4 = new System.Windows.Forms.Label();
@@ -74,70 +67,22 @@
             this.txtBillID = new System.Windows.Forms.TextBox();
             this.txtKotID = new System.Windows.Forms.TextBox();
             this.btnCustomer = new System.Windows.Forms.Button();
-            this.pnlWaiting = new System.Windows.Forms.Panel();
-            this.btnImportant = new System.Windows.Forms.Button();
-            this.dgvPending = new System.Windows.Forms.DataGridView();
-            this.selectDataGridViewCheckBoxColumn = new System.Windows.Forms.DataGridViewCheckBoxColumn();
-            this.billNoDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.kotDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.TableID = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.amountDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.importantDataGridViewCheckBoxColumn = new System.Windows.Forms.DataGridViewCheckBoxColumn();
-            this.alarmDataGridViewCheckBoxColumn = new System.Windows.Forms.DataGridViewCheckBoxColumn();
-            this.bookingTimeDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.lastEditedDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.waiterDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.cashierDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.printedDataGridViewCheckBoxColumn = new System.Windows.Forms.DataGridViewCheckBoxColumn();
-            this.alarmTimeDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.btnAlarm = new System.Windows.Forms.Button();
-            this.chkRefresh = new System.Windows.Forms.CheckBox();
-            this.btnRefresh = new System.Windows.Forms.Button();
-            this.btnPaidCC = new System.Windows.Forms.Button();
-            this.btnPaidCash = new System.Windows.Forms.Button();
-            this.btnBillList = new System.Windows.Forms.Button();
-            this.btnSelectBill = new System.Windows.Forms.Button();
-            this.btnStartBill = new System.Windows.Forms.Button();
-            this.tcPending = new System.Windows.Forms.TabControl();
-            this.tpToday = new System.Windows.Forms.TabPage();
-            this.tpWeek = new System.Windows.Forms.TabPage();
-            this.tpAll = new System.Windows.Forms.TabPage();
-            this.tpImportant = new System.Windows.Forms.TabPage();
-            this.tpAlarm = new System.Windows.Forms.TabPage();
-            this.lblUser = new System.Windows.Forms.Label();
+            this.bsWaiter = new System.Windows.Forms.BindingSource(this.components);
+            this.bsPending = new System.Windows.Forms.BindingSource(this.components);
+            this.btnPrevious = new System.Windows.Forms.Button();
+            this.btnNext = new System.Windows.Forms.Button();
+            ((System.ComponentModel.ISupportInitialize)(this.dgvProducts)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.bindingSource)).BeginInit();
+            this.pnlBilling.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.bsWaiter)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.bsPending)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.dgvProducts)).BeginInit();
-            this.pnlBilling.SuspendLayout();
-            this.pnlWaiting.SuspendLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.dgvPending)).BeginInit();
-            this.tcPending.SuspendLayout();
             this.SuspendLayout();
             // 
-            // bindingSource
-            // 
-            this.bindingSource.DataSource = typeof(Tanshu.Accounts.Contracts.SalesBillItemBO);
-            // 
-            // bsWaiter
-            // 
-            this.bsWaiter.DataSource = typeof(Tanshu.Accounts.Contracts.WaiterBO);
-            // 
-            // bsPending
-            // 
-            this.bsPending.DataSource = typeof(Tanshu.Accounts.Contracts.PendingBillsBO);
-            // 
-            // tmrPending
-            // 
-            this.tmrPending.Enabled = true;
-            this.tmrPending.Interval = 5000;
-            this.tmrPending.Tick += new System.EventHandler(this.tmrPending_Tick);
-            // 
             // label7
             // 
             this.label7.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
             this.label7.AutoSize = true;
-            this.label7.Location = new System.Drawing.Point(795, 517);
+            this.label7.Location = new System.Drawing.Point(12, 537);
             this.label7.Name = "label7";
             this.label7.Size = new System.Drawing.Size(49, 13);
             this.label7.TabIndex = 112;
@@ -147,7 +92,7 @@
             // txtDiscount
             // 
             this.txtDiscount.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
-            this.txtDiscount.Location = new System.Drawing.Point(850, 514);
+            this.txtDiscount.Location = new System.Drawing.Point(363, 534);
             this.txtDiscount.Name = "txtDiscount";
             this.txtDiscount.ReadOnly = true;
             this.txtDiscount.Size = new System.Drawing.Size(120, 20);
@@ -159,7 +104,7 @@
             this.Label12.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
             this.Label12.AutoSize = true;
             this.Label12.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.Label12.Location = new System.Drawing.Point(808, 569);
+            this.Label12.Location = new System.Drawing.Point(12, 591);
             this.Label12.Name = "Label12";
             this.Label12.Size = new System.Drawing.Size(36, 13);
             this.Label12.TabIndex = 116;
@@ -169,7 +114,7 @@
             // txtGrossAmount
             // 
             this.txtGrossAmount.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
-            this.txtGrossAmount.Location = new System.Drawing.Point(850, 540);
+            this.txtGrossAmount.Location = new System.Drawing.Point(363, 560);
             this.txtGrossAmount.Name = "txtGrossAmount";
             this.txtGrossAmount.ReadOnly = true;
             this.txtGrossAmount.Size = new System.Drawing.Size(120, 20);
@@ -182,7 +127,7 @@
             this.txtAmount.BackColor = System.Drawing.Color.Black;
             this.txtAmount.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
             this.txtAmount.ForeColor = System.Drawing.Color.Transparent;
-            this.txtAmount.Location = new System.Drawing.Point(850, 566);
+            this.txtAmount.Location = new System.Drawing.Point(363, 586);
             this.txtAmount.Name = "txtAmount";
             this.txtAmount.ReadOnly = true;
             this.txtAmount.Size = new System.Drawing.Size(120, 22);
@@ -194,7 +139,7 @@
             // 
             this.label6.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
             this.label6.AutoSize = true;
-            this.label6.Location = new System.Drawing.Point(800, 543);
+            this.label6.Location = new System.Drawing.Point(12, 563);
             this.label6.Name = "label6";
             this.label6.Size = new System.Drawing.Size(46, 13);
             this.label6.TabIndex = 108;
@@ -205,25 +150,17 @@
             // 
             this.label5.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
             this.label5.AutoSize = true;
-            this.label5.Location = new System.Drawing.Point(808, 488);
+            this.label5.Location = new System.Drawing.Point(12, 505);
             this.label5.Name = "label5";
             this.label5.Size = new System.Drawing.Size(36, 13);
             this.label5.TabIndex = 110;
             this.label5.Text = "Taxes";
             this.label5.TextAlign = System.Drawing.ContentAlignment.TopRight;
             // 
-            // txtNarration
-            // 
-            this.txtNarration.Location = new System.Drawing.Point(12, 482);
-            this.txtNarration.Multiline = true;
-            this.txtNarration.Name = "txtNarration";
-            this.txtNarration.Size = new System.Drawing.Size(216, 106);
-            this.txtNarration.TabIndex = 4;
-            // 
             // txtGrossTax
             // 
             this.txtGrossTax.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
-            this.txtGrossTax.Location = new System.Drawing.Point(850, 488);
+            this.txtGrossTax.Location = new System.Drawing.Point(363, 508);
             this.txtGrossTax.Name = "txtGrossTax";
             this.txtGrossTax.ReadOnly = true;
             this.txtGrossTax.Size = new System.Drawing.Size(120, 20);
@@ -254,7 +191,7 @@
             this.dgvProducts.RowHeadersVisible = false;
             this.dgvProducts.RowTemplate.Height = 19;
             this.dgvProducts.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect;
-            this.dgvProducts.Size = new System.Drawing.Size(471, 386);
+            this.dgvProducts.Size = new System.Drawing.Size(372, 412);
             this.dgvProducts.TabIndex = 0;
             this.dgvProducts.VirtualMode = true;
             this.dgvProducts.CellFormatting += new System.Windows.Forms.DataGridViewCellFormattingEventHandler(this.dgvProducts_CellFormatting);
@@ -288,14 +225,19 @@
             this.additionalDataGridViewTextBoxColumn.ReadOnly = true;
             this.additionalDataGridViewTextBoxColumn.Width = 5;
             // 
+            // bindingSource
+            // 
+            this.bindingSource.DataSource = typeof(Tanshu.Accounts.Contracts.SalesBillItemBO);
+            // 
             // pnlBilling
             // 
             this.pnlBilling.AutoSize = true;
             this.pnlBilling.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink;
+            this.pnlBilling.Controls.Add(this.btnNext);
+            this.pnlBilling.Controls.Add(this.btnPrevious);
             this.pnlBilling.Controls.Add(this.btnWaiter);
             this.pnlBilling.Controls.Add(this.txtCode);
             this.pnlBilling.Controls.Add(this.btnClear);
-            this.pnlBilling.Controls.Add(this.btnMultiPrint);
             this.pnlBilling.Controls.Add(this.btnRate);
             this.pnlBilling.Controls.Add(this.btnPrintKot);
             this.pnlBilling.Controls.Add(this.btnPrintBill);
@@ -304,8 +246,6 @@
             this.pnlBilling.Controls.Add(this.btnQuantity);
             this.pnlBilling.Controls.Add(this.txtTableID);
             this.pnlBilling.Controls.Add(this.label11);
-            this.pnlBilling.Controls.Add(this.label10);
-            this.pnlBilling.Controls.Add(this.txtUserID);
             this.pnlBilling.Controls.Add(this.label9);
             this.pnlBilling.Controls.Add(this.label8);
             this.pnlBilling.Controls.Add(this.label4);
@@ -319,7 +259,6 @@
             this.pnlBilling.Controls.Add(this.btnCustomer);
             this.pnlBilling.Controls.Add(this.dgvProducts);
             this.pnlBilling.Controls.Add(this.txtGrossTax);
-            this.pnlBilling.Controls.Add(this.txtNarration);
             this.pnlBilling.Controls.Add(this.label5);
             this.pnlBilling.Controls.Add(this.label6);
             this.pnlBilling.Controls.Add(this.txtAmount);
@@ -330,14 +269,14 @@
             this.pnlBilling.Dock = System.Windows.Forms.DockStyle.Fill;
             this.pnlBilling.Location = new System.Drawing.Point(0, 0);
             this.pnlBilling.Name = "pnlBilling";
-            this.pnlBilling.Size = new System.Drawing.Size(982, 662);
+            this.pnlBilling.Size = new System.Drawing.Size(982, 688);
             this.pnlBilling.TabIndex = 121;
             // 
             // btnWaiter
             // 
-            this.btnWaiter.Location = new System.Drawing.Point(341, 482);
+            this.btnWaiter.Location = new System.Drawing.Point(255, 610);
             this.btnWaiter.Name = "btnWaiter";
-            this.btnWaiter.Size = new System.Drawing.Size(101, 106);
+            this.btnWaiter.Size = new System.Drawing.Size(75, 75);
             this.btnWaiter.TabIndex = 150;
             this.btnWaiter.Text = "Select Waiter - F5";
             this.btnWaiter.UseVisualStyleBackColor = true;
@@ -347,34 +286,24 @@
             // 
             this.txtCode.Location = new System.Drawing.Point(489, 54);
             this.txtCode.Name = "txtCode";
-            this.txtCode.Size = new System.Drawing.Size(481, 20);
+            this.txtCode.Size = new System.Drawing.Size(312, 20);
             this.txtCode.TabIndex = 149;
             // 
             // btnClear
             // 
-            this.btnClear.Location = new System.Drawing.Point(234, 482);
+            this.btnClear.Location = new System.Drawing.Point(174, 610);
             this.btnClear.Name = "btnClear";
-            this.btnClear.Size = new System.Drawing.Size(101, 106);
+            this.btnClear.Size = new System.Drawing.Size(75, 75);
             this.btnClear.TabIndex = 148;
             this.btnClear.Text = "Clear - Esc";
             this.btnClear.UseVisualStyleBackColor = true;
             this.btnClear.Click += new System.EventHandler(this.btnClear_Click);
             // 
-            // btnMultiPrint
-            // 
-            this.btnMultiPrint.Location = new System.Drawing.Point(773, 485);
-            this.btnMultiPrint.Name = "btnMultiPrint";
-            this.btnMultiPrint.Size = new System.Drawing.Size(21, 106);
-            this.btnMultiPrint.TabIndex = 147;
-            this.btnMultiPrint.Text = "Multi Print";
-            this.btnMultiPrint.UseVisualStyleBackColor = true;
-            this.btnMultiPrint.Click += new System.EventHandler(this.btnMultiPrint_Click);
-            // 
             // btnRate
             // 
-            this.btnRate.Location = new System.Drawing.Point(663, 566);
+            this.btnRate.Location = new System.Drawing.Point(336, 610);
             this.btnRate.Name = "btnRate";
-            this.btnRate.Size = new System.Drawing.Size(104, 23);
+            this.btnRate.Size = new System.Drawing.Size(75, 75);
             this.btnRate.TabIndex = 146;
             this.btnRate.Text = "&Rate";
             this.btnRate.UseVisualStyleBackColor = true;
@@ -382,9 +311,9 @@
             // 
             // btnPrintKot
             // 
-            this.btnPrintKot.Location = new System.Drawing.Point(555, 482);
+            this.btnPrintKot.Location = new System.Drawing.Point(93, 610);
             this.btnPrintKot.Name = "btnPrintKot";
-            this.btnPrintKot.Size = new System.Drawing.Size(102, 106);
+            this.btnPrintKot.Size = new System.Drawing.Size(75, 75);
             this.btnPrintKot.TabIndex = 145;
             this.btnPrintKot.Text = "Print KOT - F12";
             this.btnPrintKot.UseVisualStyleBackColor = true;
@@ -392,9 +321,9 @@
             // 
             // btnPrintBill
             // 
-            this.btnPrintBill.Location = new System.Drawing.Point(448, 482);
+            this.btnPrintBill.Location = new System.Drawing.Point(12, 610);
             this.btnPrintBill.Name = "btnPrintBill";
-            this.btnPrintBill.Size = new System.Drawing.Size(101, 106);
+            this.btnPrintBill.Size = new System.Drawing.Size(75, 75);
             this.btnPrintBill.TabIndex = 144;
             this.btnPrintBill.Text = "Print Bill - F11";
             this.btnPrintBill.UseVisualStyleBackColor = true;
@@ -402,9 +331,9 @@
             // 
             // btnVoid
             // 
-            this.btnVoid.Location = new System.Drawing.Point(663, 485);
+            this.btnVoid.Location = new System.Drawing.Point(417, 610);
             this.btnVoid.Name = "btnVoid";
-            this.btnVoid.Size = new System.Drawing.Size(104, 23);
+            this.btnVoid.Size = new System.Drawing.Size(75, 75);
             this.btnVoid.TabIndex = 143;
             this.btnVoid.Text = "Cancel Current Bill";
             this.btnVoid.UseVisualStyleBackColor = true;
@@ -447,23 +376,6 @@
             this.label11.TabIndex = 139;
             this.label11.Text = "Table";
             // 
-            // label10
-            // 
-            this.label10.AutoSize = true;
-            this.label10.Location = new System.Drawing.Point(804, 12);
-            this.label10.Name = "label10";
-            this.label10.Size = new System.Drawing.Size(73, 13);
-            this.label10.TabIndex = 138;
-            this.label10.Text = "Last Edit User";
-            // 
-            // txtUserID
-            // 
-            this.txtUserID.Location = new System.Drawing.Point(807, 28);
-            this.txtUserID.Name = "txtUserID";
-            this.txtUserID.ReadOnly = true;
-            this.txtUserID.Size = new System.Drawing.Size(163, 20);
-            this.txtUserID.TabIndex = 137;
-            // 
             // label9
             // 
             this.label9.AutoSize = true;
@@ -555,336 +467,44 @@
             this.btnCustomer.ForeColor = System.Drawing.Color.Red;
             this.btnCustomer.Location = new System.Drawing.Point(12, 54);
             this.btnCustomer.Name = "btnCustomer";
-            this.btnCustomer.Size = new System.Drawing.Size(471, 34);
+            this.btnCustomer.Size = new System.Drawing.Size(372, 34);
             this.btnCustomer.TabIndex = 126;
             this.btnCustomer.UseVisualStyleBackColor = true;
             this.btnCustomer.Click += new System.EventHandler(this.btnCustomer_Click);
             // 
-            // pnlWaiting
+            // bsWaiter
             // 
-            this.pnlWaiting.AutoSize = true;
-            this.pnlWaiting.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink;
-            this.pnlWaiting.Controls.Add(this.btnImportant);
-            this.pnlWaiting.Controls.Add(this.dgvPending);
-            this.pnlWaiting.Controls.Add(this.btnAlarm);
-            this.pnlWaiting.Controls.Add(this.chkRefresh);
-            this.pnlWaiting.Controls.Add(this.btnRefresh);
-            this.pnlWaiting.Controls.Add(this.btnPaidCC);
-            this.pnlWaiting.Controls.Add(this.btnPaidCash);
-            this.pnlWaiting.Controls.Add(this.btnBillList);
-            this.pnlWaiting.Controls.Add(this.btnSelectBill);
-            this.pnlWaiting.Controls.Add(this.btnStartBill);
-            this.pnlWaiting.Controls.Add(this.tcPending);
-            this.pnlWaiting.Controls.Add(this.lblUser);
-            this.pnlWaiting.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.pnlWaiting.Location = new System.Drawing.Point(0, 0);
-            this.pnlWaiting.Name = "pnlWaiting";
-            this.pnlWaiting.Size = new System.Drawing.Size(982, 662);
-            this.pnlWaiting.TabIndex = 121;
-            this.pnlWaiting.Paint += new System.Windows.Forms.PaintEventHandler(this.pnlWaiting_Paint);
+            this.bsWaiter.DataSource = typeof(Tanshu.Accounts.Contracts.WaiterBO);
             // 
-            // btnImportant
+            // bsPending
             // 
-            this.btnImportant.Location = new System.Drawing.Point(850, 459);
-            this.btnImportant.Name = "btnImportant";
-            this.btnImportant.Size = new System.Drawing.Size(120, 62);
-            this.btnImportant.TabIndex = 137;
-            this.btnImportant.Text = "Mark / UnMark Important";
-            this.btnImportant.UseVisualStyleBackColor = true;
-            this.btnImportant.Click += new System.EventHandler(this.btnImportant_Click);
+            this.bsPending.DataSource = typeof(Tanshu.Accounts.Contracts.PendingBillsBO);
             // 
-            // dgvPending
+            // btnPrevious
             // 
-            this.dgvPending.AllowUserToAddRows = false;
-            this.dgvPending.AllowUserToDeleteRows = false;
-            this.dgvPending.AllowUserToOrderColumns = true;
-            this.dgvPending.AllowUserToResizeRows = false;
-            this.dgvPending.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
-                        | System.Windows.Forms.AnchorStyles.Left)
-                        | System.Windows.Forms.AnchorStyles.Right)));
-            this.dgvPending.AutoGenerateColumns = false;
-            this.dgvPending.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.DisplayedCells;
-            this.dgvPending.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
-            this.dgvPending.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
-            this.selectDataGridViewCheckBoxColumn,
-            this.billNoDataGridViewTextBoxColumn,
-            this.kotDataGridViewTextBoxColumn,
-            this.TableID,
-            this.amountDataGridViewTextBoxColumn,
-            this.importantDataGridViewCheckBoxColumn,
-            this.alarmDataGridViewCheckBoxColumn,
-            this.bookingTimeDataGridViewTextBoxColumn,
-            this.lastEditedDataGridViewTextBoxColumn,
-            this.waiterDataGridViewTextBoxColumn,
-            this.cashierDataGridViewTextBoxColumn,
-            this.printedDataGridViewCheckBoxColumn,
-            this.alarmTimeDataGridViewTextBoxColumn});
-            this.dgvPending.DataSource = this.bsPending;
-            this.dgvPending.Location = new System.Drawing.Point(12, 40);
-            this.dgvPending.MultiSelect = false;
-            this.dgvPending.Name = "dgvPending";
-            this.dgvPending.RowHeadersVisible = false;
-            this.dgvPending.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect;
-            this.dgvPending.Size = new System.Drawing.Size(696, 487);
-            this.dgvPending.TabIndex = 0;
-            this.dgvPending.VirtualMode = true;
-            this.dgvPending.CellDoubleClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvPending_CellDoubleClick);
-            this.dgvPending.CellValueNeeded += new System.Windows.Forms.DataGridViewCellValueEventHandler(this.dgvPending_CellValueNeeded);
-            this.dgvPending.CellFormatting += new System.Windows.Forms.DataGridViewCellFormattingEventHandler(this.dgvPending_CellFormatting);
-            this.dgvPending.CellValuePushed += new System.Windows.Forms.DataGridViewCellValueEventHandler(this.dgvPending_CellValuePushed);
+            this.btnPrevious.Location = new System.Drawing.Point(890, 12);
+            this.btnPrevious.Name = "btnPrevious";
+            this.btnPrevious.Size = new System.Drawing.Size(80, 80);
+            this.btnPrevious.TabIndex = 151;
+            this.btnPrevious.Text = "Previous";
+            this.btnPrevious.UseVisualStyleBackColor = true;
+            this.btnPrevious.Click += new System.EventHandler(this.btnPrevious_Click);
             // 
-            // selectDataGridViewCheckBoxColumn
+            // btnNext
             // 
-            this.selectDataGridViewCheckBoxColumn.HeaderText = "Select";
-            this.selectDataGridViewCheckBoxColumn.Name = "selectDataGridViewCheckBoxColumn";
-            this.selectDataGridViewCheckBoxColumn.Width = 43;
-            // 
-            // billNoDataGridViewTextBoxColumn
-            // 
-            this.billNoDataGridViewTextBoxColumn.DataPropertyName = "BillNo";
-            this.billNoDataGridViewTextBoxColumn.HeaderText = "BillNo";
-            this.billNoDataGridViewTextBoxColumn.Name = "billNoDataGridViewTextBoxColumn";
-            this.billNoDataGridViewTextBoxColumn.Width = 59;
-            // 
-            // kotDataGridViewTextBoxColumn
-            // 
-            this.kotDataGridViewTextBoxColumn.DataPropertyName = "Kot";
-            this.kotDataGridViewTextBoxColumn.HeaderText = "Kot";
-            this.kotDataGridViewTextBoxColumn.Name = "kotDataGridViewTextBoxColumn";
-            this.kotDataGridViewTextBoxColumn.Width = 48;
-            // 
-            // TableID
-            // 
-            this.TableID.DataPropertyName = "TableID";
-            this.TableID.HeaderText = "TableID";
-            this.TableID.Name = "TableID";
-            this.TableID.Width = 70;
-            // 
-            // amountDataGridViewTextBoxColumn
-            // 
-            this.amountDataGridViewTextBoxColumn.DataPropertyName = "Amount";
-            this.amountDataGridViewTextBoxColumn.HeaderText = "Amount";
-            this.amountDataGridViewTextBoxColumn.Name = "amountDataGridViewTextBoxColumn";
-            this.amountDataGridViewTextBoxColumn.Width = 68;
-            // 
-            // importantDataGridViewCheckBoxColumn
-            // 
-            this.importantDataGridViewCheckBoxColumn.DataPropertyName = "Important";
-            this.importantDataGridViewCheckBoxColumn.HeaderText = "Important";
-            this.importantDataGridViewCheckBoxColumn.Name = "importantDataGridViewCheckBoxColumn";
-            this.importantDataGridViewCheckBoxColumn.Width = 57;
-            // 
-            // alarmDataGridViewCheckBoxColumn
-            // 
-            this.alarmDataGridViewCheckBoxColumn.DataPropertyName = "Alarm";
-            this.alarmDataGridViewCheckBoxColumn.HeaderText = "Alarm";
-            this.alarmDataGridViewCheckBoxColumn.Name = "alarmDataGridViewCheckBoxColumn";
-            this.alarmDataGridViewCheckBoxColumn.Width = 39;
-            // 
-            // bookingTimeDataGridViewTextBoxColumn
-            // 
-            this.bookingTimeDataGridViewTextBoxColumn.DataPropertyName = "BookingTime";
-            this.bookingTimeDataGridViewTextBoxColumn.HeaderText = "BookingTime";
-            this.bookingTimeDataGridViewTextBoxColumn.Name = "bookingTimeDataGridViewTextBoxColumn";
-            this.bookingTimeDataGridViewTextBoxColumn.Width = 94;
-            // 
-            // lastEditedDataGridViewTextBoxColumn
-            // 
-            this.lastEditedDataGridViewTextBoxColumn.DataPropertyName = "LastEdited";
-            this.lastEditedDataGridViewTextBoxColumn.HeaderText = "LastEdited";
-            this.lastEditedDataGridViewTextBoxColumn.Name = "lastEditedDataGridViewTextBoxColumn";
-            this.lastEditedDataGridViewTextBoxColumn.Width = 82;
-            // 
-            // waiterDataGridViewTextBoxColumn
-            // 
-            this.waiterDataGridViewTextBoxColumn.DataPropertyName = "Waiter";
-            this.waiterDataGridViewTextBoxColumn.HeaderText = "Waiter";
-            this.waiterDataGridViewTextBoxColumn.Name = "waiterDataGridViewTextBoxColumn";
-            this.waiterDataGridViewTextBoxColumn.Width = 63;
-            // 
-            // cashierDataGridViewTextBoxColumn
-            // 
-            this.cashierDataGridViewTextBoxColumn.DataPropertyName = "Cashier";
-            this.cashierDataGridViewTextBoxColumn.HeaderText = "Cashier";
-            this.cashierDataGridViewTextBoxColumn.Name = "cashierDataGridViewTextBoxColumn";
-            this.cashierDataGridViewTextBoxColumn.Width = 67;
-            // 
-            // printedDataGridViewCheckBoxColumn
-            // 
-            this.printedDataGridViewCheckBoxColumn.DataPropertyName = "Printed";
-            this.printedDataGridViewCheckBoxColumn.HeaderText = "Printed";
-            this.printedDataGridViewCheckBoxColumn.Name = "printedDataGridViewCheckBoxColumn";
-            this.printedDataGridViewCheckBoxColumn.Width = 46;
-            // 
-            // alarmTimeDataGridViewTextBoxColumn
-            // 
-            this.alarmTimeDataGridViewTextBoxColumn.DataPropertyName = "AlarmTime";
-            this.alarmTimeDataGridViewTextBoxColumn.HeaderText = "AlarmTime";
-            this.alarmTimeDataGridViewTextBoxColumn.Name = "alarmTimeDataGridViewTextBoxColumn";
-            this.alarmTimeDataGridViewTextBoxColumn.Width = 81;
-            // 
-            // btnAlarm
-            // 
-            this.btnAlarm.Location = new System.Drawing.Point(850, 393);
-            this.btnAlarm.Name = "btnAlarm";
-            this.btnAlarm.Size = new System.Drawing.Size(120, 64);
-            this.btnAlarm.TabIndex = 136;
-            this.btnAlarm.Text = "Alarm";
-            this.btnAlarm.UseVisualStyleBackColor = true;
-            this.btnAlarm.Click += new System.EventHandler(this.btnAlarm_Click);
-            // 
-            // chkRefresh
-            // 
-            this.chkRefresh.AutoSize = true;
-            this.chkRefresh.Checked = true;
-            this.chkRefresh.CheckState = System.Windows.Forms.CheckState.Checked;
-            this.chkRefresh.Location = new System.Drawing.Point(714, 40);
-            this.chkRefresh.Name = "chkRefresh";
-            this.chkRefresh.Size = new System.Drawing.Size(121, 17);
-            this.chkRefresh.TabIndex = 134;
-            this.chkRefresh.Text = "Keep refreshing Bills";
-            this.chkRefresh.UseVisualStyleBackColor = true;
-            // 
-            // btnRefresh
-            // 
-            this.btnRefresh.Location = new System.Drawing.Point(9, 527);
-            this.btnRefresh.Name = "btnRefresh";
-            this.btnRefresh.Size = new System.Drawing.Size(129, 117);
-            this.btnRefresh.TabIndex = 133;
-            this.btnRefresh.Text = "Refresh - F5";
-            this.btnRefresh.UseVisualStyleBackColor = true;
-            this.btnRefresh.Click += new System.EventHandler(this.btnRefresh_Click);
-            // 
-            // btnPaidCC
-            // 
-            this.btnPaidCC.Location = new System.Drawing.Point(850, 527);
-            this.btnPaidCC.Name = "btnPaidCC";
-            this.btnPaidCC.Size = new System.Drawing.Size(120, 117);
-            this.btnPaidCC.TabIndex = 6;
-            this.btnPaidCC.Text = "Paid By CC";
-            this.btnPaidCC.UseVisualStyleBackColor = true;
-            this.btnPaidCC.Click += new System.EventHandler(this.btnPaidCC_Click);
-            // 
-            // btnPaidCash
-            // 
-            this.btnPaidCash.Location = new System.Drawing.Point(714, 527);
-            this.btnPaidCash.Name = "btnPaidCash";
-            this.btnPaidCash.Size = new System.Drawing.Size(130, 117);
-            this.btnPaidCash.TabIndex = 5;
-            this.btnPaidCash.Text = "Paid";
-            this.btnPaidCash.UseVisualStyleBackColor = true;
-            this.btnPaidCash.Click += new System.EventHandler(this.btnPaidCash_Click);
-            // 
-            // btnBillList
-            // 
-            this.btnBillList.Location = new System.Drawing.Point(714, 393);
-            this.btnBillList.Name = "btnBillList";
-            this.btnBillList.Size = new System.Drawing.Size(130, 128);
-            this.btnBillList.TabIndex = 4;
-            this.btnBillList.Text = "List Of Bills to Cancel";
-            this.btnBillList.UseVisualStyleBackColor = true;
-            this.btnBillList.Click += new System.EventHandler(this.btnBillList_Click);
-            // 
-            // btnSelectBill
-            // 
-            this.btnSelectBill.Location = new System.Drawing.Point(714, 239);
-            this.btnSelectBill.Name = "btnSelectBill";
-            this.btnSelectBill.Size = new System.Drawing.Size(256, 148);
-            this.btnSelectBill.TabIndex = 3;
-            this.btnSelectBill.Text = "Select Bill";
-            this.btnSelectBill.UseVisualStyleBackColor = true;
-            this.btnSelectBill.Click += new System.EventHandler(this.btnSelectBill_Click);
-            // 
-            // btnStartBill
-            // 
-            this.btnStartBill.Location = new System.Drawing.Point(714, 63);
-            this.btnStartBill.Name = "btnStartBill";
-            this.btnStartBill.Size = new System.Drawing.Size(256, 170);
-            this.btnStartBill.TabIndex = 2;
-            this.btnStartBill.Text = "New Bill - F6";
-            this.btnStartBill.UseVisualStyleBackColor = true;
-            this.btnStartBill.Click += new System.EventHandler(this.btnStartBill_Click);
-            // 
-            // tcPending
-            // 
-            this.tcPending.Controls.Add(this.tpToday);
-            this.tcPending.Controls.Add(this.tpWeek);
-            this.tcPending.Controls.Add(this.tpAll);
-            this.tcPending.Controls.Add(this.tpImportant);
-            this.tcPending.Controls.Add(this.tpAlarm);
-            this.tcPending.Location = new System.Drawing.Point(192, 12);
-            this.tcPending.Name = "tcPending";
-            this.tcPending.SelectedIndex = 0;
-            this.tcPending.Size = new System.Drawing.Size(271, 20);
-            this.tcPending.TabIndex = 1;
-            this.tcPending.SelectedIndexChanged += new System.EventHandler(this.tcPending_SelectedIndexChanged);
-            // 
-            // tpToday
-            // 
-            this.tpToday.Location = new System.Drawing.Point(4, 22);
-            this.tpToday.Name = "tpToday";
-            this.tpToday.Padding = new System.Windows.Forms.Padding(3);
-            this.tpToday.Size = new System.Drawing.Size(263, 0);
-            this.tpToday.TabIndex = 1;
-            this.tpToday.Text = "Today";
-            this.tpToday.UseVisualStyleBackColor = true;
-            // 
-            // tpWeek
-            // 
-            this.tpWeek.Location = new System.Drawing.Point(4, 22);
-            this.tpWeek.Name = "tpWeek";
-            this.tpWeek.Padding = new System.Windows.Forms.Padding(3);
-            this.tpWeek.Size = new System.Drawing.Size(263, 0);
-            this.tpWeek.TabIndex = 2;
-            this.tpWeek.Text = "Week";
-            this.tpWeek.UseVisualStyleBackColor = true;
-            // 
-            // tpAll
-            // 
-            this.tpAll.Location = new System.Drawing.Point(4, 22);
-            this.tpAll.Name = "tpAll";
-            this.tpAll.Padding = new System.Windows.Forms.Padding(3);
-            this.tpAll.Size = new System.Drawing.Size(263, 0);
-            this.tpAll.TabIndex = 3;
-            this.tpAll.Text = "All";
-            this.tpAll.UseVisualStyleBackColor = true;
-            // 
-            // tpImportant
-            // 
-            this.tpImportant.Location = new System.Drawing.Point(4, 22);
-            this.tpImportant.Name = "tpImportant";
-            this.tpImportant.Padding = new System.Windows.Forms.Padding(3);
-            this.tpImportant.Size = new System.Drawing.Size(263, 0);
-            this.tpImportant.TabIndex = 4;
-            this.tpImportant.Text = "Important";
-            this.tpImportant.UseVisualStyleBackColor = true;
-            // 
-            // tpAlarm
-            // 
-            this.tpAlarm.Location = new System.Drawing.Point(4, 22);
-            this.tpAlarm.Name = "tpAlarm";
-            this.tpAlarm.Padding = new System.Windows.Forms.Padding(3);
-            this.tpAlarm.Size = new System.Drawing.Size(263, 0);
-            this.tpAlarm.TabIndex = 5;
-            this.tpAlarm.Text = "Alarms";
-            this.tpAlarm.UseVisualStyleBackColor = true;
-            // 
-            // lblUser
-            // 
-            this.lblUser.Font = new System.Drawing.Font("Microsoft Sans Serif", 48F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.lblUser.ForeColor = System.Drawing.Color.Red;
-            this.lblUser.Location = new System.Drawing.Point(144, 530);
-            this.lblUser.Name = "lblUser";
-            this.lblUser.Size = new System.Drawing.Size(564, 114);
-            this.lblUser.TabIndex = 135;
-            this.lblUser.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
+            this.btnNext.Location = new System.Drawing.Point(890, 596);
+            this.btnNext.Name = "btnNext";
+            this.btnNext.Size = new System.Drawing.Size(80, 80);
+            this.btnNext.TabIndex = 152;
+            this.btnNext.Text = "Next";
+            this.btnNext.UseVisualStyleBackColor = true;
+            this.btnNext.Click += new System.EventHandler(this.btnNext_Click);
             // 
             // SalesForm
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(982, 662);
-            this.Controls.Add(this.pnlWaiting);
+            this.ClientSize = new System.Drawing.Size(982, 688);
             this.Controls.Add(this.pnlBilling);
             this.KeyPreview = true;
             this.MaximizeBox = false;
@@ -894,16 +514,12 @@
                 "unt, F11-Print Bill, F12-Print KOT, ESC-Cancel";
             this.Load += new System.EventHandler(this.SalesForm_Load);
             this.KeyDown += new System.Windows.Forms.KeyEventHandler(this.SalesForm_KeyDown);
-            ((System.ComponentModel.ISupportInitialize)(this.bindingSource)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.bsWaiter)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.bsPending)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.dgvProducts)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.bindingSource)).EndInit();
             this.pnlBilling.ResumeLayout(false);
             this.pnlBilling.PerformLayout();
-            this.pnlWaiting.ResumeLayout(false);
-            this.pnlWaiting.PerformLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.dgvPending)).EndInit();
-            this.tcPending.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)(this.bsWaiter)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.bsPending)).EndInit();
             this.ResumeLayout(false);
             this.PerformLayout();
 
@@ -914,7 +530,6 @@
         private System.Windows.Forms.BindingSource bindingSource;
         private System.Windows.Forms.BindingSource bsWaiter;
         private System.Windows.Forms.BindingSource bsPending;
-        private System.Windows.Forms.Timer tmrPending;
         internal System.Windows.Forms.Label label7;
         internal System.Windows.Forms.TextBox txtDiscount;
         internal System.Windows.Forms.Label Label12;
@@ -922,24 +537,9 @@
         internal System.Windows.Forms.TextBox txtAmount;
         internal System.Windows.Forms.Label label6;
         internal System.Windows.Forms.Label label5;
-        private System.Windows.Forms.TextBox txtNarration;
         internal System.Windows.Forms.TextBox txtGrossTax;
         private System.Windows.Forms.DataGridView dgvProducts;
         private System.Windows.Forms.Panel pnlBilling;
-        private System.Windows.Forms.Panel pnlWaiting;
-        private System.Windows.Forms.Button btnRefresh;
-        private System.Windows.Forms.Button btnPaidCC;
-        private System.Windows.Forms.Button btnPaidCash;
-        private System.Windows.Forms.Button btnBillList;
-        private System.Windows.Forms.Button btnSelectBill;
-        private System.Windows.Forms.Button btnStartBill;
-        private System.Windows.Forms.TabControl tcPending;
-        private System.Windows.Forms.TabPage tpToday;
-        private System.Windows.Forms.TabPage tpWeek;
-        private System.Windows.Forms.TabPage tpAll;
-        private System.Windows.Forms.TabPage tpImportant;
-        private System.Windows.Forms.TabPage tpAlarm;
-        private System.Windows.Forms.DataGridView dgvPending;
         private System.Windows.Forms.Button btnCustomer;
         private System.Windows.Forms.TextBox txtBillID;
         private System.Windows.Forms.TextBox txtKotID;
@@ -951,40 +551,22 @@
         private System.Windows.Forms.TextBox txtDate;
         private System.Windows.Forms.TextBox txtLastEditDate;
         private System.Windows.Forms.TextBox txtCreationDate;
-        private System.Windows.Forms.Label label10;
-        private System.Windows.Forms.TextBox txtUserID;
         private System.Windows.Forms.TextBox txtTableID;
         private System.Windows.Forms.Label label11;
         private System.Windows.Forms.Button btnDiscount;
         private System.Windows.Forms.Button btnQuantity;
-        private System.Windows.Forms.CheckBox chkRefresh;
         private System.Windows.Forms.Button btnPrintKot;
         private System.Windows.Forms.Button btnPrintBill;
         private System.Windows.Forms.Button btnVoid;
-        private System.Windows.Forms.Button btnMultiPrint;
         private System.Windows.Forms.Button btnRate;
         private System.Windows.Forms.Button btnClear;
-        private System.Windows.Forms.Label lblUser;
-        private System.Windows.Forms.Button btnAlarm;
-        private System.Windows.Forms.DataGridViewCheckBoxColumn selectDataGridViewCheckBoxColumn;
-        private System.Windows.Forms.DataGridViewTextBoxColumn billNoDataGridViewTextBoxColumn;
-        private System.Windows.Forms.DataGridViewTextBoxColumn kotDataGridViewTextBoxColumn;
-        private System.Windows.Forms.DataGridViewTextBoxColumn TableID;
-        private System.Windows.Forms.DataGridViewTextBoxColumn amountDataGridViewTextBoxColumn;
-        private System.Windows.Forms.DataGridViewCheckBoxColumn importantDataGridViewCheckBoxColumn;
-        private System.Windows.Forms.DataGridViewCheckBoxColumn alarmDataGridViewCheckBoxColumn;
-        private System.Windows.Forms.DataGridViewTextBoxColumn bookingTimeDataGridViewTextBoxColumn;
-        private System.Windows.Forms.DataGridViewTextBoxColumn lastEditedDataGridViewTextBoxColumn;
-        private System.Windows.Forms.DataGridViewTextBoxColumn waiterDataGridViewTextBoxColumn;
-        private System.Windows.Forms.DataGridViewTextBoxColumn cashierDataGridViewTextBoxColumn;
-        private System.Windows.Forms.DataGridViewCheckBoxColumn printedDataGridViewCheckBoxColumn;
-        private System.Windows.Forms.DataGridViewTextBoxColumn alarmTimeDataGridViewTextBoxColumn;
-        private System.Windows.Forms.Button btnImportant;
         private System.Windows.Forms.TextBox txtCode;
         private System.Windows.Forms.DataGridViewTextBoxColumn Display;
         private System.Windows.Forms.DataGridViewTextBoxColumn printedDataGridViewTextBoxColumn;
         private System.Windows.Forms.DataGridViewTextBoxColumn additionalDataGridViewTextBoxColumn;
         private System.Windows.Forms.Button btnWaiter;
+        private System.Windows.Forms.Button btnNext;
+        private System.Windows.Forms.Button btnPrevious;
     }
 }
 
diff --git a/Tanshu.Accounts.PointOfSale/Sales/SalesForm.cs b/Tanshu.Accounts.PointOfSale/Sales/SalesForm.cs
index 529a451..34e5292 100644
--- a/Tanshu.Accounts.PointOfSale/Sales/SalesForm.cs
+++ b/Tanshu.Accounts.PointOfSale/Sales/SalesForm.cs
@@ -15,12 +15,10 @@ namespace Tanshu.Accounts.PointOfSale
 {
     public partial class SalesForm : Form
     {
-        #region Waiting
-        private List<Guid> selectedBills = new List<Guid>();
-        private List<PendingBillsBO> pendingBills = new List<PendingBillsBO>();
-        private PendingType pendingList = PendingType.Today;
-        #endregion
-        private SaleFormState formState = SaleFormState.Waiting;
+        List<Button> buttonList = new List<Button>();
+        List<Button> buttonHeads = new List<Button>();
+        int page = 0;
+        int pageSize = 6;
         #region Billing
         private Dictionary<BillItemKey, SalesBillItemBO> bill = new Dictionary<BillItemKey, SalesBillItemBO>();
         private CustomerBO customer = new CustomerBI().GetCustomer(new Guid("F016CBAD-206C-42C0-BB1D-6006CE57BAB5"));
@@ -33,7 +31,7 @@ namespace Tanshu.Accounts.PointOfSale
         {
             InitializeComponent();
             btnCustomer.Text = customer.Name;
-            lblUser.Text = Session.User.Name;
+            this.Text = Session.User.Name;
         }
 
         public SalesForm(Guid voucherID)
@@ -44,123 +42,99 @@ namespace Tanshu.Accounts.PointOfSale
 
         private void SalesForm_KeyDown(object sender, KeyEventArgs e)
         {
-            if (formState == SaleFormState.Billing)
+            switch (e.KeyCode)
             {
-                #region Billing KeyDown
-                switch (e.KeyCode)
-                {
-                    case Keys.F2:
+                case Keys.F2:
+                    {
+                        if (dgvProducts.Rows.Count > 0)
+                            SetQuantity(CurrentProduct, 0, false, true);
+                        break;
+                    }
+                case Keys.F3:
+                    {
+                        btnDiscount_Click(sender, new EventArgs());
+                        break;
+                    }
+                case Keys.F4:
+                    {
+                        if (!e.Alt)
+                            ShowCustomerList(false);
+                        break;
+                    }
+                case Keys.F5:
+                    {
+                        btnWaiter_Click(sender, new EventArgs());
+                        break;
+                    }
+                case Keys.F7:
+                    {
+                        using (SelectProduct selectProduct = new SelectProduct(new ProductBI().GetFilteredProducts, true))
                         {
-                            if (dgvProducts.Rows.Count > 0)
-                                SetQuantity(CurrentProduct, 0, false, true);
-                            break;
+                            selectProduct.ShowDialog();
+                            if (selectProduct.SelectedItem != null)
+                                AddProductToGrid(selectProduct.SelectedItem.ProductID);
                         }
-                    case Keys.F3:
-                        {
-                            btnDiscount_Click(sender, new EventArgs());
-                            break;
-                        }
-                    case Keys.F4:
-                        {
-                            if (!e.Alt)
-                                ShowCustomerList(false);
-                            break;
-                        }
-                    case Keys.F5:
-                        {
-                            btnWaiter_Click(sender, new EventArgs());
-                            break;
-                        }
-                    case Keys.F7:
-                        {
-                            using (SelectProduct selectProduct = new SelectProduct(new ProductBI().GetFilteredProducts, true))
-                            {
-                                selectProduct.ShowDialog();
-                                if (selectProduct.SelectedItem != null)
-                                    AddProductToGrid(selectProduct.SelectedItem.ProductID);
-                            }
-                            break;
-                        }
-                    case Keys.F8:
-                        {
-                            LoadBillFromTable();
-                            break;
-                        }
-                    case Keys.F9:
-                        {
-                            if (dgvProducts.Rows.Count > 0)
-                                SetAmount(CurrentProduct, -1);
-                            break;
-                        }
-                    case Keys.F11:
-                        {
-                            btnPrintBill_Click(sender, e);
-                            break;
-                        }
-                    case Keys.F12:
-                        {
-                            btnPrintKot_Click(sender, e);
-                            break;
-                        }
-                    case Keys.Delete:
-                        {
-                            if (dgvProducts.Rows.Count > 0)
-                                ProductRemove(CurrentProduct);
-                            break;
-                        }
-                    case Keys.Add:
-                        {
-                            if (dgvProducts.Rows.Count > 0)
-                                SetQuantity(CurrentProduct, 1, false, false);
-                            break;
-                        }
-                    case Keys.Subtract:
-                        {
-                            if (dgvProducts.Rows.Count > 0)
-                                SetQuantity(CurrentProduct, -1, false, false);
-                            break;
-                        }
-                    case Keys.Up:
-                        {
-                            if ((bindingSource.Position >= 1) && (!dgvProducts.Focused))
-                                bindingSource.Position -= 1;
-                            break;
-                        }
-                    case Keys.Down:
-                        {
-                            if ((bindingSource.Position < bindingSource.Count - 1) && (!dgvProducts.Focused))
-                                bindingSource.Position += 1;
-                            break;
-                        }
-                    case Keys.Escape:
-                        {
-                            if (bill.Count != 0)
-                                if (MessageBox.Show("Cancel current bill?", "Cancel bill", MessageBoxButtons.YesNo, MessageBoxIcon.Question, MessageBoxDefaultButton.Button2) == DialogResult.No)
-                                    return;
-                            ClearBill();
-                            break;
-                        }
-                }
-                #endregion
-            }
-            else
-            {
-                #region Waiting KeyDown
-                switch (e.KeyCode)
-                {
-                    case Keys.F6:
-                        {
-                            ChangeFormState(SaleFormState.Billing);
-                            break;
-                        }
-                    case Keys.F8:
-                        {
-                            LoadBillFromTable();
-                            break;
-                        }
-                }
-
-                #endregion
+                        break;
+                    }
+                case Keys.F8:
+                    {
+                        LoadBillFromTable();
+                        break;
+                    }
+                case Keys.F9:
+                    {
+                        if (dgvProducts.Rows.Count > 0)
+                            SetAmount(CurrentProduct, -1);
+                        break;
+                    }
+                case Keys.F11:
+                    {
+                        btnPrintBill_Click(sender, e);
+                        break;
+                    }
+                case Keys.F12:
+                    {
+                        btnPrintKot_Click(sender, e);
+                        break;
+                    }
+                case Keys.Delete:
+                    {
+                        if (dgvProducts.Rows.Count > 0)
+                            ProductRemove(CurrentProduct);
+                        break;
+                    }
+                case Keys.Add:
+                    {
+                        if (dgvProducts.Rows.Count > 0)
+                            SetQuantity(CurrentProduct, 1, false, false);
+                        break;
+                    }
+                case Keys.Subtract:
+                    {
+                        if (dgvProducts.Rows.Count > 0)
+                            SetQuantity(CurrentProduct, -1, false, false);
+                        break;
+                    }
+                case Keys.Up:
+                    {
+                        if ((bindingSource.Position >= 1) && (!dgvProducts.Focused))
+                            bindingSource.Position -= 1;
+                        break;
+                    }
+                case Keys.Down:
+                    {
+                        if ((bindingSource.Position < bindingSource.Count - 1) && (!dgvProducts.Focused))
+                            bindingSource.Position += 1;
+                        break;
+                    }
+                case Keys.Escape:
+                    {
+                        if (bill.Count != 0)
+                            if (MessageBox.Show("Cancel current bill?", "Cancel bill", MessageBoxButtons.YesNo, MessageBoxIcon.Question, MessageBoxDefaultButton.Button2) == DialogResult.No)
+                                return;
+                        ClearBill();
+                        break;
+                    }
             }
         }
 
@@ -174,8 +148,6 @@ namespace Tanshu.Accounts.PointOfSale
             this.txtCreationDate.Text = "";
             this.txtDate.Text = "";
             this.txtLastEditDate.Text = "";
-            this.txtNarration.Text = "";
-            this.txtUserID.Text = "";
             this.txtTableID.Text = "";
             this.btnWaiter.Text = "Waiter - F5";
             this.btnWaiter.Tag = null;
@@ -238,7 +210,15 @@ namespace Tanshu.Accounts.PointOfSale
         {
         }
 
-        private void button_Click(object sender, EventArgs e)
+        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));
+        }
+        private void productButton_Click(object sender, EventArgs e)
         {
             Button button = sender as Button;
             if (button == null)
@@ -246,6 +226,16 @@ namespace Tanshu.Accounts.PointOfSale
             Guid tag = (Guid)button.Tag;
             AddProductToGrid(tag);
         }
+        private void tableButton_Click(object sender, EventArgs e)
+        {
+            Button button = sender as Button;
+            if (button == null)
+                return;
+            int tag = (int)button.Tag;
+            MessageBox.Show("Table No " + tag.ToString());
+            ChangeFormState(SaleFormState.Billing);
+            //AddProductToGrid(tag);
+        }
         private void calculateAmount()
         {
             txtGrossTax.Text = string.Format("{0:#0.00}", bill.Values.Sum(b => b.TaxAmount));
@@ -306,23 +296,15 @@ namespace Tanshu.Accounts.PointOfSale
                 LoadBill(newBillID.Value);
                 ChangeFormState(SaleFormState.Billing);
             }
-            ControlFactory.GenerateButtons(ref pnlBilling, new Rectangle(489, 94, 481, 385), 6, 6, 2, new ProductBI().GetUnFilteredProducts(), new ButtonClickDelegate(button_Click));
+            //ControlFactory.GenerateButtons(ref pnlBilling, new Rectangle(489, 94, 400, 385), 5, 6, 2, new ProductBI().GetUnFilteredProducts(), new ButtonClickDelegate(productButton_Click));
+            //ControlFactory.GenerateButtons(ref pnlBilling, ref buttonHeads, new Rectangle(889, 0, 80, 688), 1, pageSize, 2, page, new ProductTypeBI().GetProductTypes(), new ButtonClickDelegate(productTypeButton_Click));
+            //ControlFactory.GenerateButtons(ref pnlBilling, ref buttonHeads, new Rectangle(889, 90, 85, 498), 1, pageSize, 2, page, new ProductTypeBI().GetProductTypes(), new ButtonClickDelegate(productTypeButton_Click));
+            ControlFactory.GenerateButtons(ref pnlBilling, ref buttonHeads, new Rectangle(390, 94, 499, 385), 6, 10, 2, new FoodTableBI().GetFoodTables(), new ButtonClickDelegate(tableButton_Click));
         }
 
         private void ChangeFormState(SaleFormState state)
         {
-            formState = state;
-            if (state == SaleFormState.Billing)
-            {
-                pnlWaiting.Visible = false;
-                pnlBilling.Visible = true;
-            }
-            else
-            {
-                pnlWaiting.Visible = true;
-                pnlBilling.Visible = false;
-                ListUnpaidBills();
-            }
+            pnlBilling.Visible = true;
         }
 
         #region Save Bill
@@ -397,7 +379,7 @@ namespace Tanshu.Accounts.PointOfSale
                 Printed = finalBill,
                 Void = false,
                 Date = DateTime.Now,
-                Narration = txtNarration.Text,
+                Narration = "",
                 Ref = "",
                 Type = 'S',
                 UserID = user.UserID
@@ -486,8 +468,6 @@ namespace Tanshu.Accounts.PointOfSale
             this.txtCreationDate.Text = billInfo.CreationDate.ToString("HH:mm dd-MMM-yyyy");
             this.txtDate.Text = billInfo.Date.Value.ToString("HH:mm dd-MMM-yyyy");
             this.txtLastEditDate.Text = billInfo.LastEditDate.ToString("HH:mm dd-MMM-yyyy");
-            this.txtNarration.Text = billInfo.Narration;
-            this.txtUserID.Text = new UserBI().GetUser(billInfo.UserID).Name;
             this.customer = new CustomerBI().GetCustomer(billInfo.CustomerID);
             this.btnCustomer.Text = this.customer.Name;
             this.txtTableID.Text = billInfo.TableID;
@@ -552,35 +532,6 @@ namespace Tanshu.Accounts.PointOfSale
             }
         }
 
-        private void tmrPending_Tick(object sender, EventArgs e)
-        {
-            if (chkRefresh.Checked)
-                ListUnpaidBills();
-        }
-
-        private void ListUnpaidBills()
-        {
-            lock (lockObject)
-            {
-                pendingBills = new SaleVoucherBI().GetPendingBills(pendingList);
-                bsPending.DataSource = pendingBills;
-                List<PendingBillsBO> alarmBills = new SaleVoucherBI().GetPendingBills(PendingType.Alarms).OrderBy(b => b.AlarmTime).ToList();
-                if (alarmBills.Count > 0)
-                {
-                    PendingBillsBO al = alarmBills.First();
-                    double seconds = al.AlarmTime.Value.Subtract(DateTime.Now).TotalSeconds;
-                    if (seconds <= 0)
-                        lblUser.Text = string.Format("Alarm {0:hh:MM}", al.AlarmTime);
-                    else
-                        lblUser.Text = Session.User.Name;
-                }
-                else
-                {
-                    lblUser.Text = Session.User.Name;
-                }
-            }
-        }
-
         private void dgvPending_CellFormatting(object sender, DataGridViewCellFormattingEventArgs e)
         {
             try
@@ -596,44 +547,6 @@ namespace Tanshu.Accounts.PointOfSale
             }
         }
 
-        private void tcPending_SelectedIndexChanged(object sender, EventArgs e)
-        {
-            switch (tcPending.SelectedTab.Text)
-            {
-                case "Today":
-                    pendingList = PendingType.Today;
-                    break;
-                case "Week":
-                    pendingList = PendingType.Week;
-                    break;
-                case "All":
-                    pendingList = PendingType.All;
-                    break;
-                case "Important":
-                    pendingList = PendingType.Important;
-                    break;
-                case "Alarms":
-                    pendingList = PendingType.Alarms;
-                    break;
-            }
-            ListUnpaidBills();
-        }
-
-        private void dgvPending_CellValuePushed(object sender, DataGridViewCellValueEventArgs e)
-        {
-            if (e.ColumnIndex != 0) return;
-            if ((bool)e.Value)
-                selectedBills.Add(pendingBills[e.RowIndex].voucherID);
-            else
-                selectedBills.Remove(pendingBills[e.RowIndex].voucherID);
-        }
-
-        private void dgvPending_CellValueNeeded(object sender, DataGridViewCellValueEventArgs e)
-        {
-            if (e.ColumnIndex != 0) return;
-            if (e.RowIndex > pendingBills.Count - 1) return;
-            e.Value = selectedBills.Contains(pendingBills.ElementAt(e.RowIndex).voucherID);
-        }
         #endregion
 
         #region Billing
@@ -680,20 +593,6 @@ namespace Tanshu.Accounts.PointOfSale
         #endregion
 
 
-        private void dgvPending_CellDoubleClick(object sender, DataGridViewCellEventArgs e)
-        {
-            if ((dgvProducts.Rows.Count > 0) && (dgvPending.CurrentRow != null))
-            {
-                LoadBill(((PendingBillsBO)bsPending.Current).voucherID);
-                ChangeFormState(SaleFormState.Billing);
-            }
-        }
-
-        private void btnRefresh_Click(object sender, EventArgs e)
-        {
-            ListUnpaidBills();
-        }
-
         private void btnVoid_Click(object sender, EventArgs e)
         {
             if (billInfo != null)
@@ -757,20 +656,6 @@ namespace Tanshu.Accounts.PointOfSale
             ClearBill();
         }
 
-        private void btnPaidCash_Click(object sender, EventArgs e)
-        {
-            UserBO user = Session.User;
-            new SaleVoucherBI().DeclareBillsPaid(user.UserID, selectedBills, false);
-            ListUnpaidBills();
-        }
-
-        private void btnPaidCC_Click(object sender, EventArgs e)
-        {
-            UserBO user = Session.User;
-            new SaleVoucherBI().DeclareBillsPaid(user.UserID, selectedBills, true);
-            ListUnpaidBills();
-        }
-
         private void btnAlarm_Click(object sender, EventArgs e)
         {
             if (bsPending.Current != null)
@@ -802,69 +687,6 @@ namespace Tanshu.Accounts.PointOfSale
             }
         }
 
-        private void btnBillList_Click(object sender, EventArgs e)
-        {
-            //if (!Thread.CurrentPrincipal.IsInRole("Security/CreateUser"))
-            //    return;
-            //#region Filters
-            //decimal? minValue = 0, maxValue = 0;
-            //decimal valTemp;
-            //DateTime? fromDate = DateTime.Now, toDate = DateTime.Now; // used in filters
-            //DateTime dateTemp;
-            //bool? showVoided;
-
-            //InputBoxResult result = InputBox.Show("Start Date", "Start Date", string.Format("{0:dd-MMM-yyy}", fromDate), InputBox_Validating);
-            //if ((result.OK) && (DateTime.TryParseExact(result.Text, "dd-MMM-yyyy", new CultureInfo("en-US"), DateTimeStyles.None, out dateTemp)))
-            //{
-            //    fromDate = dateTemp;
-            //}
-            //result = InputBox.Show("Finish Date", "Finish Date", string.Format("{0:dd-MMM-yyy}", toDate), InputBox_Validating);
-            //if ((result.OK) && (DateTime.TryParseExact(result.Text, "dd-MMM-yyyy", new CultureInfo("en-US"), DateTimeStyles.None, out dateTemp)))
-            //{
-            //    toDate = dateTemp;
-            //}
-            //result = InputBox.Show("Minimum Value", "Minimum Value", "0", InputBox_Validating);
-            //if ((result.OK) && (decimal.TryParse(result.Text, out valTemp)))
-            //{
-            //    minValue = valTemp;
-            //}
-            //result = InputBox.Show("Maximum Value", "Maximum Value", "0", InputBox_Validating);
-            //if ((result.OK) && (decimal.TryParse(result.Text, out valTemp)))
-            //{
-            //    maxValue = valTemp;
-            //}
-            //DialogResult dResult = MessageBox.Show("Show Un-Voided Bills only", "Un-Voided", MessageBoxButtons.YesNoCancel, MessageBoxIcon.Question);
-            //if (dResult == DialogResult.Yes)
-            //    showVoided = false;
-            //else if (dResult == DialogResult.No)
-            //    showVoided = true;
-            //else
-            //    showVoided = null;
-            //#endregion
-            //List<PendingBillsBO> billList = ManagementBI.GetBillList(fromDate, toDate, minValue, maxValue, showVoided);
-            //using (SelectBill selectBill = new SelectBill(billList, true))
-            //{
-            //    selectBill.ShowDialog();
-            //    if (selectBill.SelectedItem != null)
-            //    {
-            //        LoadBill(selectBill.SelectedItem.voucherID);
-            //        ChangeFormState(SaleFormState.Billing);
-
-            //    }
-            //}
-        }
-
-        private void btnImportant_Click(object sender, EventArgs e)
-        {
-            if (bsPending.Current == null)
-                return;
-            if (MessageBox.Show("Are you sure?", "Mark / UnMark Important", MessageBoxButtons.YesNo, MessageBoxIcon.Question) != DialogResult.Yes)
-                return;
-            PendingBillsBO billAlarm = (PendingBillsBO)bsPending.Current;
-            new SaleVoucherBI().ToggleImportant(billAlarm.voucherID);
-            ListUnpaidBills();
-        }
-
         private void dgvProducts_CellFormatting(object sender, DataGridViewCellFormattingEventArgs e)
         {
             DataGridView dgv = sender as DataGridView;
@@ -923,11 +745,28 @@ namespace Tanshu.Accounts.PointOfSale
                     throw new ArgumentException();
             }
         }
-
-        private void pnlWaiting_Paint(object sender, PaintEventArgs e)
+        #region Dynamic Buttons
+        private void btnPrevious_Click(object sender, EventArgs e)
         {
+            page--;
+            var list = new ProductTypeBI().GetProductTypes();
+            if (page == -1)
+                page = 0;
 
+            ControlFactory.GenerateButtons(ref pnlBilling, ref buttonHeads, new Rectangle(889, 90, 85, 498), 1, pageSize, 2, page, list, new ButtonClickDelegate(productTypeButton_Click));
         }
+
+        private void btnNext_Click(object sender, EventArgs e)
+        {
+            page++;
+            var list = new ProductTypeBI().GetProductTypes();
+            int pages = Convert.ToInt32(Math.Ceiling(Convert.ToDouble(list.Count) / Convert.ToDouble(pageSize)));
+            if (page == pages)
+                page--;
+
+            ControlFactory.GenerateButtons(ref pnlBilling, ref buttonHeads, new Rectangle(889, 90, 85, 498), 1, pageSize, 2, page, list, new ButtonClickDelegate(productTypeButton_Click));
+        }
+        #endregion
     }
 }
 
diff --git a/Tanshu.Accounts.PointOfSale/Sales/SalesForm.resx b/Tanshu.Accounts.PointOfSale/Sales/SalesForm.resx
index 3409f1d..53e72f3 100644
--- a/Tanshu.Accounts.PointOfSale/Sales/SalesForm.resx
+++ b/Tanshu.Accounts.PointOfSale/Sales/SalesForm.resx
@@ -117,6 +117,15 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
+  <metadata name="Display.UserAddedColumn" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="bindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>17, 17</value>
+  </metadata>
+  <metadata name="Display.UserAddedColumn" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
   <metadata name="bindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>17, 17</value>
   </metadata>
@@ -126,27 +135,6 @@
   <metadata name="bsPending.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>248, 17</value>
   </metadata>
-  <metadata name="tmrPending.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>357, 17</value>
-  </metadata>
-  <metadata name="Display.UserAddedColumn" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="Display.UserAddedColumn" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="selectDataGridViewCheckBoxColumn.UserAddedColumn" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="TableID.UserAddedColumn" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="selectDataGridViewCheckBoxColumn.UserAddedColumn" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="TableID.UserAddedColumn" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
   <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>81</value>
   </metadata>
diff --git a/Tanshu.Accounts.SqlDAO/FoodTableDAO.cs b/Tanshu.Accounts.SqlDAO/FoodTableDAO.cs
new file mode 100644
index 0000000..1557f6d
--- /dev/null
+++ b/Tanshu.Accounts.SqlDAO/FoodTableDAO.cs
@@ -0,0 +1,43 @@
+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 FoodTableDAO : BaseDAO, IFoodTableDAO
+    {
+        public FoodTableDAO(IConnectionDAO connection)
+            : base(connection)
+        { }
+
+        public void Insert(FoodTableBO foodTable)
+        {
+            throw new NotImplementedException();
+        }
+        public void Update(FoodTableBO foodTable)
+        {
+            throw new NotImplementedException();
+        }
+        public bool Delete(int tableID)
+        {
+            throw new NotImplementedException();
+        }
+
+        public FoodTableBO GetFoodTable(int tableID)
+        {
+            SqlCommand cmd = new SqlCommand("SELECT * FROM FoodTables Where TableID = @TableID;");
+            cmd.Parameters.AddWithValue("@TableID", tableID);
+            return BusinessObjectDAO<FoodTableBO>.GetBusinessObject(connection.ExecuteReader(cmd));
+        }
+        public List<FoodTableBO> GetFoodTables()
+        {
+            using (SqlCommand cmd = new SqlCommand("SELECT * FROM FoodTables"))
+            {
+                return BusinessObjectDAO<FoodTableBO>.GetBusinessObjects(connection.ExecuteReader(cmd));
+            }
+        }
+    }
+}
diff --git a/Tanshu.Accounts.SqlDAO/ProductDAO.cs b/Tanshu.Accounts.SqlDAO/ProductDAO.cs
index bde8e2e..8d8ed7b 100644
--- a/Tanshu.Accounts.SqlDAO/ProductDAO.cs
+++ b/Tanshu.Accounts.SqlDAO/ProductDAO.cs
@@ -198,13 +198,6 @@ WHERE pt.IsForSale = 1 AND p.SalePrice > 0 AND p.Discontinued = 0
             return name;
         }
 
-        public List<ProductTypeBO> GetProductTypes()
-        {
-            SqlCommand cmd = new SqlCommand("SELECT * FROM ProductTypes ORDER BY Name");
-            return BusinessObjectDAO<ProductTypeBO>.GetBusinessObjects(connection.ExecuteReader(cmd));
-
-        }
-
         public List<ProductDisplayBO> GetProducts(string name, int skip, int count)
         {
             string query = @"
@@ -216,5 +209,29 @@ SELECT TOP {1} p.*, pt.Name AS Type FROM ProductsRN p INNER JOIN ProductTypes pt
             return BusinessObjectDAO<ProductDisplayBO>.GetBusinessObjects(connection.ExecuteReader(query));
 
         }
+        public List<ProductDisplaySmallBO> GetProducts(Guid productTypeID)
+        {
+            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;";
+            SqlCommand cmd = new SqlCommand(query);
+            cmd.Parameters.AddWithValue("@ProductTypeID", productTypeID);
+            using (IDataReader dr = connection.ExecuteReader(cmd))
+            {
+                while (dr.Read())
+                {
+                    list.Add(new ProductDisplaySmallBO
+                    {
+                        Category = dr.GetString(4),
+                        Code = dr.GetInt32(1),
+                        Name = dr.GetString(2),
+                        Price = dr.GetDecimal(3),
+                        ProductID = dr.GetGuid(0)
+
+                    });
+                }
+                dr.Close();
+            }
+            return list;
+        }
     }
 }
diff --git a/Tanshu.Accounts.SqlDAO/ProductTypeDAO.cs b/Tanshu.Accounts.SqlDAO/ProductTypeDAO.cs
new file mode 100644
index 0000000..19f5826
--- /dev/null
+++ b/Tanshu.Accounts.SqlDAO/ProductTypeDAO.cs
@@ -0,0 +1,86 @@
+    using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Data.SqlClient;
+using Tanshu.Accounts.Contracts;
+using Tanshu.Data.DAO;
+using Tanshu.Accounts.DAOFactory;
+
+namespace Tanshu.Accounts.SqlDAO
+{
+    public class ProductTypeDAO : BaseDAO , IProductTypeDAO
+    {
+        public ProductTypeDAO(IConnectionDAO connection)
+            : base(connection)
+        { }
+
+        public bool Insert(ProductTypeBO productType)
+        {
+            productType.ProductTypeID = 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;
+"))
+            {
+                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;
+                connection.ExecuteNonQuery(cmd);
+                productType.timestamp = (byte[])cmd.Parameters["@timestamp"].Value;
+                return true;
+            }
+        }
+        public ProductTypeBO GetProductType(Guid productTypeID)
+        {
+            SqlCommand cmd = new SqlCommand("SELECT * FROM ProductTypes WHERE ProductTypeID = @ProductTypeID");
+            cmd.Parameters.AddWithValue("@ProductTypeID", productTypeID);
+            return BusinessObjectDAO<ProductTypeBO>.GetBusinessObject(connection.ExecuteReader(cmd));
+        }
+        public ProductTypeBO GetProductType(string name)
+        {
+            SqlCommand cmd = new SqlCommand("SELECT * FROM ProductTypes WHERE Name = @Name");
+            cmd.Parameters.AddWithValue("@Name", name);
+            return BusinessObjectDAO<ProductTypeBO>.GetBusinessObject(connection.ExecuteReader(cmd));
+        }
+        public bool Delete(Guid productTypeID)
+        {
+            using (SqlCommand cmd = new SqlCommand("DELETE FROM ProductTypes WHERE ProductTypeID = @ProductTypeID"))
+            {
+                cmd.Parameters.AddWithValue("@ProductTypeID", productTypeID);
+                connection.ExecuteNonQuery(cmd);
+                return true;
+            }
+        }
+        public bool Update(ProductTypeBO productType)
+        {
+
+            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;
+"))
+            {
+                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;
+                connection.ExecuteNonQuery(cmd);
+                productType.timestamp = (byte[])cmd.Parameters["@timestamp"].Value;
+                return true;
+            }
+        }
+        public List<ProductTypeBO> GetProductTypes()
+        {
+            string query = "SELECT * from ProductTypes";
+            return BusinessObjectDAO<ProductTypeBO>.GetBusinessObjects(connection.ExecuteReader(query));
+        }
+
+    }
+}
diff --git a/Tanshu.Accounts.SqlDAO/Tanshu.Accounts.SqlDAO.csproj b/Tanshu.Accounts.SqlDAO/Tanshu.Accounts.SqlDAO.csproj
index a42afa7..b475909 100644
--- a/Tanshu.Accounts.SqlDAO/Tanshu.Accounts.SqlDAO.csproj
+++ b/Tanshu.Accounts.SqlDAO/Tanshu.Accounts.SqlDAO.csproj
@@ -61,6 +61,8 @@
     <Compile Include="AdvanceDAO.cs" />
     <Compile Include="BaseDAO.cs" />
     <Compile Include="CheckoutDAO.cs" />
+    <Compile Include="FoodTableDAO.cs" />
+    <Compile Include="ProductTypeDAO.cs" />
     <Compile Include="SqlConnectionDAO.cs" />
     <Compile Include="CustomerDAO.cs" />
     <Compile Include="Database.cs" />