mirror/opensourcepos
1
0
Fork 0
mirror of https://github.com/opensourcepos/opensourcepos.git synced 2026-04-12 02:48:48 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into merge/padungsak

Browse Source 
Conflicts:
	application/views/config.php
This commit is contained in:
jekkos-t520
2014-06-30 11:30:08 +02:00
parent d020b53215 75bb5595c0
commit 4f367eb168
138 changed files with 1387 additions and 1668 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
database/database.sql
View File

@@ -599,7 +599,7 @@ CREATE TABLE `ospos_sales_suspended_payments` (
CREATE TABLE `ospos_sessions` (
`session_id` varchar(40) NOT NULL DEFAULT '0',
`ip_address` varchar(16) NOT NULL DEFAULT '0',
`ip_address` varchar(45) NOT NULL DEFAULT '0',
`user_agent` varchar(120) NOT NULL,
`last_activity` int(10) unsigned NOT NULL DEFAULT '0',
`user_data` text,