Merge branch 'master' of https://github.com/jekkos/opensourcepos

WHATS_NEW.txt

@@ -1,3 +1,18 @@
+Version 2.3.1
+-------------
+
++ Extra report permissions (this includes a refactoring of the database model - new grants table)
++ Tax inclusive/exclusive pricing
++ Receivings amount multiplication (can be configured in items section)
++ Customizable sale and receiving numbering
++ Giftcard improvements
++ Fix item import through csv
++ Bug fixes for reports
+
+Version 2.3
+-----------
++ Support for multiple stock locations
+
 Version 2.2.2
 -------------
 + French language added

application/config/config.php

@@ -262,7 +262,7 @@ $config['sess_expiration']		= 0;
 $config['sess_expire_on_close']	= FALSE;
 $config['sess_encrypt_cookie']	= FALSE;
 $config['sess_use_database']	= TRUE;
-$config['sess_table_name']		= 'ospos_sessions';
+$config['sess_table_name']		= 'sessions';
 $config['sess_match_ip']		= FALSE;
 $config['sess_match_useragent']	= FAlSE;
 $config['sess_time_to_update']	= 0;