diff --git a/application/language/en-GB/config_lang.php b/application/language/en-GB/config_lang.php
index e500d2423..e1902e15e 100644
--- a/application/language/en-GB/config_lang.php
+++ b/application/language/en-GB/config_lang.php
@@ -142,6 +142,7 @@ $lang["config_jsprintsetup_required"] = "Warning! This disabled functionality wi
 $lang["config_language"] = "Language";
 $lang["config_last_used_invoice_number"] = "Last Used Invoice Number";
 $lang["config_last_used_quote_number"] = "Last Used Quote Number";
+$lang["config_last_used_work_order_number"] = "Last Used W/O Number";
 $lang["config_left"] = "Left";
 $lang["config_license"] = "License";
 $lang["config_license_configuration"] = "License Statement";
@@ -225,6 +226,7 @@ $lang["config_sales_invoice_format"] = "Sales Invoice Format";
 $lang["config_sales_quote_format"] = "Sales Quote Format";
 $lang["config_saved_successfully"] = "Configuration saved successfully";
 $lang["config_saved_unsuccessfully"] = "Configuration saved unsuccessfully";
+$lang["config_show_office_group"] = "Show office icon";
 $lang["config_statistics"] = "Send Statistics";
 $lang["config_statistics_tooltip"] = "Send statistics for development and feature improvement purposes";
 $lang["config_stock_location"] = "Stock location";
@@ -245,3 +247,5 @@ $lang["config_thousands_separator"] = "Thousands Separator";
 $lang["config_timezone"] = "Timezone";
 $lang["config_top"] = "Top";
 $lang["config_website"] = "Website";
+$lang["config_work_order_enable"] = "Work Order Support";
+$lang["config_work_order_format"] = "Work Order Format";
diff --git a/application/language/en-GB/module_lang.php b/application/language/en-GB/module_lang.php
index fc6b555f7..8ef821048 100644
--- a/application/language/en-GB/module_lang.php
+++ b/application/language/en-GB/module_lang.php
@@ -1,5 +1,6 @@
 <?php 
 
+$lang["module_both"] = "Both";
 $lang["module_config"] = "Configuration";
 $lang["module_config_desc"] = "Change the OSPOS's Configuration";
 $lang["module_customers"] = "Customers";
@@ -9,6 +10,7 @@ $lang["module_employees_desc"] = "Add, Update, Delete, and Search Employees";
 $lang["module_giftcards"] = "Gift Cards";
 $lang["module_giftcards_desc"] = "Add, Update, Delete and Search Gift Cards";
 $lang["module_home"] = "Home";
+$lang["module_home_desc"] = "List home menu modules";
 $lang["module_item_kits"] = "Item Kits";
 $lang["module_item_kits_desc"] = "Add, Update, Delete and Search Item Kits";
 $lang["module_items"] = "Items";
@@ -17,6 +19,8 @@ $lang["module_messages"] = "Messages";
 $lang["module_messages_desc"] = "Send Messages to Customers, Suppliers and Employees";
 $lang["module_migrate"] = "Migrate";
 $lang["module_migrate_desc"] = "Update the OSPOS Database";
+$lang["module_office"] = "Office";
+$lang["module_office_desc"] = "List office menu modules";
 $lang["module_receivings"] = "Receivings";
 $lang["module_receivings_desc"] = "Process Purchase Orders";
 $lang["module_reports"] = "Reports";
diff --git a/application/language/en-GB/sales_lang.php b/application/language/en-GB/sales_lang.php
index ce8a80fa9..c352678ed 100644
--- a/application/language/en-GB/sales_lang.php
+++ b/application/language/en-GB/sales_lang.php
@@ -8,6 +8,7 @@ $lang["sales_amount_due"] = "Amount Due";
 $lang["sales_amount_tendered"] = "Amount Tendered";
 $lang["sales_cancel_sale"] = "Cancel";
 $lang["sales_cash"] = "Cash";
+$lang["sales_cash_deposit"] = "Cash Deposit";
 $lang["sales_cash_filter"] = "Cash";
 $lang["sales_change_due"] = "Change Due";
 $lang["sales_check"] = "Check";
@@ -19,6 +20,7 @@ $lang["sales_complete_sale"] = "Complete";
 $lang["sales_confirm_cancel_sale"] = "Are you sure you want to clear this sale? All items will be cleared.";
 $lang["sales_confirm_delete"] = "Are you sure you want to delete the selected Sale(s)?";
 $lang["sales_credit"] = "Credit Card";
+$lang["sales_credit_deposit"] = "Credit Deposit";
 $lang["sales_customer"] = "Name";
 $lang["sales_customer_address"] = "Address";
 $lang["sales_customer_discount"] = "Discount";
@@ -36,7 +38,7 @@ $lang["sales_delete_entire_sale"] = "Delete Entire Sale";
 $lang["sales_delete_successful"] = "Sale delete successful";
 $lang["sales_delete_unsuccessful"] = "Sale delete failed";
 $lang["sales_description_abbrv"] = "Desc";
-$lang["sales_discard_quote"] = "Discard";
+$lang["sales_discard"] = "Discard";
 $lang["sales_discount"] = "Disc %";
 $lang["sales_discount_included"] = "% Discount";
 $lang["sales_discount_short"] = "%";
@@ -57,6 +59,7 @@ $lang["sales_giftcard_number"] = "Gift Card Number";
 $lang["sales_group_by_category"] = "Group by Category";
 $lang["sales_group_by_type"] = "Group by Type";
 $lang["sales_id"] = "Sale ID";
+$lang["sales_include_prices"] = "Include Prices?";
 $lang["sales_invoice"] = "Invoice";
 $lang["sales_invoice_confirm"] = "This invoice will be sent to";
 $lang["sales_invoice_enable"] = "Create Invoice";
@@ -94,6 +97,7 @@ $lang["sales_quantity_less_than_reorder_level"] = "Warning: Desired Quantity is
 $lang["sales_quantity_less_than_zero"] = "Warning: Desired Quantity is insufficient. You can still process the sale, but audit your inventory";
 $lang["sales_quote"] = "Quote";
 $lang["sales_quote_number"] = "Quote Number";
+$lang["sales_quote_number_duplicate"] = "Quote Number must be unique";
 $lang["sales_quote_sent"] = "Quote sent to";
 $lang["sales_quote_unsent"] = "Quote failed to be sent to";
 $lang["sales_receipt"] = "Sales Receipt";
@@ -114,6 +118,7 @@ $lang["sales_select_customer"] = "Select Customer (Optional)";
 $lang["sales_send_invoice"] = "Send Invoice";
 $lang["sales_send_quote"] = "Send Quote";
 $lang["sales_send_receipt"] = "Send Receipt";
+$lang["sales_send_work_order"] = "Send Work Order";
 $lang["sales_serial"] = "Serial";
 $lang["sales_show_invoice"] = "Show Invoice";
 $lang["sales_show_receipt"] = "Show Receipt";
@@ -125,6 +130,7 @@ $lang["sales_successfully_deleted"] = "You have successfully deleted sale";
 $lang["sales_successfully_suspended_sale"] = "Sale suspend successful";
 $lang["sales_successfully_updated"] = "Sale update successful";
 $lang["sales_suspend_sale"] = "Suspend";
+$lang["sales_suspended_doc_id"] = "Document";
 $lang["sales_suspended_sale_id"] = "ID";
 $lang["sales_suspended_sales"] = "Suspended";
 $lang["sales_table"] = "Table";
@@ -141,3 +147,8 @@ $lang["sales_unsuccessfully_updated"] = "Sale update failed";
 $lang["sales_unsuspend"] = "Unsuspend";
 $lang["sales_unsuspend_and_delete"] = "Action";
 $lang["sales_update"] = "Update";
+$lang["sales_work_order"] = "Work Order";
+$lang["sales_work_order_number"] = "Work Order Number";
+$lang["sales_work_order_number_duplicate"] = "The Work Order Number is a duplicate";
+$lang["sales_work_order_sent"] = "Work Order sent to";
+$lang["sales_work_order_unsent"] = "Work Order failed to be sent to";
diff --git a/database/database.sql b/database/database.sql
index 92268bbd6..13dab3e87 100644
--- a/database/database.sql
+++ b/database/database.sql
@@ -115,6 +115,9 @@ INSERT INTO `ospos_app_config` (`key`, `value`) VALUES
 ('work_order_enable', '0'),
 ('work_order_format', 'W%y{WSEQ:6}'),
 ('last_used_work_order_number', '0');
+
+
+
 -- --------------------------------------------------------
 
 --
@@ -444,6 +447,8 @@ INSERT INTO `ospos_permissions` (`permission_id`, `module_id`) VALUES
 ('suppliers', 'suppliers'),
 ('taxes', 'taxes');
 
+
+
 INSERT INTO `ospos_permissions` (`permission_id`, `module_id`, `location_id`) VALUES
 ('items_stock', 'items', 1),
 ('sales_stock', 'sales', 1),
diff --git a/database/migrate_phppos_dist.sql b/database/migrate_phppos_dist.sql
index 5c782e9ba..f13cffe1a 100644
--- a/database/migrate_phppos_dist.sql
+++ b/database/migrate_phppos_dist.sql
@@ -111,7 +111,11 @@ INSERT INTO `ospos_app_config` (`key`, `value`) VALUES
 ('gcaptcha_enable', '0'),
 ('gcaptcha_secret_key', ''),
 ('gcaptcha_site_key', ''),
-('receiving_calculate_average_price', '0');
+('receiving_calculate_average_price', '0'),
+('work_order_enable', '0'),
+('work_order_format', 'W%y{WSEQ:6}'),
+('last_used_work_order_number', '0');
+
 
 
 -- --------------------------------------------------------
@@ -354,10 +358,12 @@ INSERT INTO `ospos_modules` (`name_lang_key`, `desc_lang_key`, `sort`, `module_i
 ('module_customers', 'module_customers_desc', 10, 'customers'),
 ('module_employees', 'module_employees_desc', 80, 'employees'),
 ('module_giftcards', 'module_giftcards_desc', 90, 'giftcards'),
+('module_home', 'module_home_desc', 1, 'home'),
 ('module_items', 'module_items_desc', 20, 'items'),
 ('module_item_kits', 'module_item_kits_desc', 30, 'item_kits'),
 ('module_messages', 'module_messages_desc', 100, 'messages'),
 ('module_migrate', 'module_migrate_desc', 120, 'migrate'),
+('module_office', 'module_office_desc', 1, 'office'),
 ('module_receivings', 'module_receivings_desc', 60, 'receivings'),
 ('module_reports', 'module_reports_desc', 50, 'reports'),
 ('module_sales', 'module_sales_desc', 70, 'sales'),
@@ -428,10 +434,12 @@ INSERT INTO `ospos_permissions` (`permission_id`, `module_id`) VALUES
 ('customers', 'customers'),
 ('employees', 'employees'),
 ('giftcards', 'giftcards'),
+('home', 'home'),
 ('items', 'items'),
 ('item_kits', 'item_kits'),
 ('messages', 'messages'),
 ('migrate', 'migrate'),
+('office', 'office'),
 ('receivings', 'receivings'),
 ('reports', 'reports'),
 ('sales', 'sales'),
@@ -439,6 +447,8 @@ INSERT INTO `ospos_permissions` (`permission_id`, `module_id`) VALUES
 ('suppliers', 'suppliers'),
 ('taxes', 'taxes');
 
+
+
 INSERT INTO `ospos_permissions` (`permission_id`, `module_id`, `location_id`) VALUES
 ('items_stock', 'items', 1),
 ('sales_stock', 'sales', 1),
@@ -453,6 +463,7 @@ INSERT INTO `ospos_permissions` (`permission_id`, `module_id`, `location_id`) VA
 CREATE TABLE `ospos_grants` (
   `permission_id` varchar(255) NOT NULL,
   `person_id` int(10) NOT NULL,
+  `menu_group` varchar(32) DEFAULT 'home',
   PRIMARY KEY (`permission_id`,`person_id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
@@ -461,34 +472,36 @@ CREATE TABLE `ospos_grants` (
 --
 -- --------------------------------------------------------
 
-INSERT INTO `ospos_grants` (`permission_id`, `person_id`) VALUES
-('reports_customers', 1),
-('reports_receivings', 1), 
-('reports_items', 1),
-('reports_inventory', 1),
-('reports_employees', 1),
-('reports_suppliers', 1),
-('reports_sales', 1),
-('reports_discounts', 1),
-('reports_taxes', 1),
-('reports_categories', 1),
-('reports_payments', 1),    
-('customers', 1),
-('employees', 1),
-('giftcards', 1),
-('items', 1),
-('item_kits', 1),
-('messages', 1),
-('migrate', 1),
-('receivings', 1),
-('reports', 1),
-('sales', 1),
-('config', 1),
-('items_stock', 1),
-('sales_stock', 1),
-('receivings_stock', 1),
-('suppliers', 1),
-('taxes', 1);
+INSERT INTO `ospos_grants` (`permission_id`, `person_id`, `menu_group`) VALUES
+('reports_customers', 1, 'home'),
+('reports_receivings', 1, 'home'),
+('reports_items', 1, 'home'),
+('reports_inventory', 1, 'home'),
+('reports_employees', 1, 'home'),
+('reports_suppliers', 1, 'home'),
+('reports_sales', 1, 'home'),
+('reports_discounts', 1, 'home'),
+('reports_taxes', 1, 'home'),
+('reports_categories', 1, 'home'),
+('reports_payments', 1, 'home'),
+('customers', 1, 'home'),
+('employees', 1, 'office'),
+('giftcards', 1, 'home'),
+('items', 1, 'home'),
+('item_kits', 1, 'home'),
+('messages', 1, 'home'),
+('migrate', 1, 'office'),
+('receivings', 1, 'home'),
+('reports', 1, 'home'),
+('sales', 1, 'home'),
+('config', 1, 'office'),
+('items_stock', 1, 'home'),
+('sales_stock', 1, 'home'),
+('receivings_stock', 1, 'home'),
+('suppliers', 1, 'home'),
+('taxes', 1, 'office'),
+('office', 1, 'home'),
+('home', 1, 'office');
 
 --
 -- Table structure for table `ospos_receivings`
@@ -556,6 +569,8 @@ CREATE TABLE `ospos_sales` (
   `sale_id` int(10) NOT NULL AUTO_INCREMENT,
   `sale_status` tinyint(2) NOT NULL DEFAULT 0,
   `dinner_table_id` int(11) NULL,
+  `work_order_number` varchar(32) DEFAULT NULL,
+  `sale_type` tinyint(2) NOT NULL DEFAULT 0,
   PRIMARY KEY (`sale_id`),
   KEY `customer_id` (`customer_id`),
   KEY `employee_id` (`employee_id`),