diff --git a/README.md b/README.md new file mode 100644 index 000000000..374e89cf2 --- /dev/null +++ b/README.md @@ -0,0 +1,4 @@ +ospos +===== + +Open Source Point of Sale diff --git a/application/config/config.php b/application/config/config.php index 470cbf463..e775d29e2 100644 --- a/application/config/config.php +++ b/application/config/config.php @@ -264,7 +264,7 @@ $config['sess_encrypt_cookie'] = FALSE; $config['sess_use_database'] = TRUE; $config['sess_table_name'] = 'ospos_sessions'; $config['sess_match_ip'] = FALSE; -$config['sess_match_useragent'] = FALSE; +$config['sess_match_useragent'] = TRUE; $config['sess_time_to_update'] = 300; /* diff --git a/application/controllers/reports.php b/application/controllers/reports.php index 4e1e0fc1f..560f16c76 100644 --- a/application/controllers/reports.php +++ b/application/controllers/reports.php @@ -787,7 +787,7 @@ class Reports extends Secure_area $this->load->view("reports/tabular_details",$data); } - + function detailed_receivings($start_date, $end_date, $sale_type, $export_excel=0) { $this->load->model('reports/Detailed_receivings'); diff --git a/application/language/en/reports_lang.php b/application/language/en/reports_lang.php index 4a228da09..3f92d44bb 100644 --- a/application/language/en/reports_lang.php +++ b/application/language/en/reports_lang.php @@ -28,7 +28,9 @@ $lang['reports_total'] = 'Total'; $lang['reports_tax'] = 'Tax'; $lang['reports_profit'] = 'Profit'; $lang['reports_report_input'] = 'Report Input'; +$lang['reports_discount'] = 'Discount'; $lang['reports_type'] = 'Type'; +$lang['reports_discount'] = 'A discount greater than '; $lang['reports_date_range'] = 'Date Range'; $lang['reports_today'] = 'Today'; $lang['reports_yesterday'] = 'Yesterday';