Merge branch 'master' of http://github.com/blasto333/PHP-Point-Of-Sale

Conflicts:
	application/language/spanish/employees_lang.php
	application/language/spanish/reports_lang.php

Author: daN4cat

WHATS_NEW.txt

@@ -1,6 +1 @@
-* Added item kits feature
-* Can now filter reports by all/sales/returns
-* Added pagination throughout program
-* Improved importing for items and added importing for customers
-* Added location field for items
-* Bug fixes
+* Can now delete items from item kit

application/language/english/customers_lang.php

@@ -13,4 +13,4 @@
 $lang['customers_basic_information']='Customer Information';
 $lang['customers_account_number']='Account #';
 $lang['customers_taxable']='Taxable';
-?>
+?>

application/language/english/employees_lang.php

@@ -24,4 +24,4 @@
 $lang['employees_permission_desc']='Check the boxes below to grant access to modules';
 $lang['employees_error_updating_demo_admin'] = 'You can not change the demo admin user';
 $lang['employees_error_deleting_demo_admin'] = 'You can not delete the demo admin user';
-?>
+?>

application/language/english/error_lang.php

@@ -1,4 +1,4 @@
 <?php
 $lang['error_no_permission_module']='You do not have permission to access the module named';
 $lang['error_unknown']='unknown';
-?>
+?>

application/language/english/giftcards_lang.php

@@ -7,7 +7,6 @@
 $lang['giftcards_number']='Giftcard Number must be a number';
 $lang['giftcards_value']='Giftcard Value must be a number';
 
-
 $lang['giftcards_retrive_giftcard_info']='Retrive Giftcard Info';
 $lang['giftcards_description']='Description';
 $lang['giftcards_amazon']='Amazon';
@@ -30,7 +29,6 @@
 $lang['giftcards_tax_percents']='Tax Percent(s)';
 $lang['giftcards_reorder_level']='Reorder Level';
 $lang['giftcards_quantity']='Quantity';
-$lang['giftcards_reorder_level']='Reorder Level';
 $lang['giftcards_no_giftcards_to_display']='No Giftcards to display';
 $lang['giftcards_bulk_edit']='Bulk Edit';
 $lang['giftcards_confirm_delete']='Are you sure you want to delete the selected giftcards?';
@@ -64,8 +62,8 @@
 $lang['giftcards_do_nothing'] = 'Do Nothing';
 $lang['giftcards_change_all_to_serialized'] = 'Change All To Serialized';
 $lang['giftcards_change_all_to_unserialized'] = 'Change All To Unserialized';
-$lang['giftcards_change_all_to_allow_alt_desc'] = ' Allow Alt Desc For All';
+$lang['giftcards_change_all_to_allow_alt_desc'] = 'Allow Alt Desc For All';
 $lang['giftcards_change_all_to_not_allow_allow_desc'] = 'Not Allow Alt Desc For All';
 $lang['giftcards_use_inventory_menu'] = 'Use Inv. Menu';
 $lang['giftcards_manually_editing_of_quantity'] = 'Manual Edit of Quantity';
-?>
+?>

application/language/english/index.html

@@ -7,4 +7,4 @@
 <p>Directory access is forbidden.</p>
 
 </body>
-</html>
+</html>

application/language/english/item_kits_lang.php

@@ -17,4 +17,4 @@
 $lang['item_kits_items'] = 'Items';
 $lang['item_kits_item'] = 'Item';
 $lang['item_kits_quantity'] = 'Quantity';
-?>
+?>

application/language/english/items_lang.php

@@ -76,4 +76,4 @@
 $lang['items_manually_editing_of_quantity'] = 'Manual Edit of Quantity';
 $lang['items_inventory'] = 'Inventory';
 $lang['items_location'] = 'Location';
-?>
+?>

application/language/english/login_lang.php

@@ -5,4 +5,4 @@
 $lang['login_go']='Go';
 $lang['login_invalid_username_and_password']='Invalid username/password';
 $lang['login_welcome_message']='Welcome to the PHP Point Of Sale System. To continue, please login using your username and password below.';
-?>
+?>

application/language/english/module_lang.php

@@ -31,4 +31,4 @@
 $lang['module_item_kits']='Item Kits';
 $lang['module_item_kits_desc']='Add, Update, Delete and Search Item Kits';
 
-?>
+?>