Merge branch 'master' into pic_filename

.travis.yml

@@ -12,10 +12,8 @@ before_install:
     - sudo mv docker-compose /usr/local/bin
 script:
     - docker-compose build
-    - docker-compose up -d
 env: 
     - TAG=$(echo ${TRAVIS_BRANCH} | sed s/feature\\///)
 after_success:
-    - 
     - '[ -n ${DOCKER_USERNAME} ] && docker login -u="$DOCKER_USERNAME" -p="$DOCKER_PASSWORD" && docker tag opensourcepos_php "jekkos/opensourcepos:$TAG" && docker tag opensourcepos_sqlscript jekkos/opensourcepos:sqlscript && docker push "jekkos/opensourcepos:$TAG" &&  docker push jekkos/opensourcepos:sqlscript'
 

Dockerfile

@@ -14,7 +14,7 @@ RUN echo -e “$(hostname -i)\t$(hostname) $(hostname).localhost” >> /etc/host
 WORKDIR /app
 COPY . /app
 RUN ln -s /app/*[^public] /var/www && rm -rf /var/www/html && ln -nsf /app/public /var/www/html
-RUN chmod 775 /app/public/uploads
+RUN chmod 755 /app/public/uploads && chown -R www-data:www-data /app/public/uploads
 
 RUN cp application/config/database.php.tmpl application/config/database.php && \
     sed -i -e "s/\(localhost\)/web/g" test/ospos.js && \

LICENSE

@@ -5,12 +5,13 @@ Copyright (c) 2012 Alain
 Copyright (c) 2013 Rob Garrison
 Copyright (c) 2013 Parq
 Copyright (c) 2013 Ramel
-Copyright (c) 2014-2016 jekkos
-Copyright (c) 2015-2016 FrancescoUK (aka daN4cat)
+Copyright (c) 2013-2017 jekkos
+Copyright (c) 2015-2017 FrancescoUK (aka daN4cat)
 Copyright (c) 2015 Aamir Shahzad (aka asakpke), RoshanTech.com
 Copyright (c) 2015 Toni Haryanto (aka yllumi)
-Copyright (c) 2016 Ramkrishna Mondal (aka RamkrishnaMondal)
+Copyright (c) 2016-2017 Ramkrishna Mondal (aka RamkrishnaMondal)
 Copyright (c) 2016 Rinaldy@dbarber (aka rnld26)
+Copyright (c) 2016 Jorge Colmenarez (aka jlctmaster), frontuari.com
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of
 this software and associated documentation files (the "Software"), to deal in
@@ -33,4 +34,4 @@ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
 FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
 COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
 IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

WHATS_NEW.txt

@@ -1,9 +1,11 @@
 Version 3.0.2
 -----------
-+ 
-+ Protect Employee privacy printing just the first letter of family name
++ Fixed error when performing scans multiple times in a row
++ Fixed summary reports
++ Protect Employee privacy printing just the first letter of the family name
 + Updates to language translations
-
++ Various Dockers support improvements
++ Minor bugfixes
 
 Version 3.0.1
 -----------

application/config/config.php

@@ -8,7 +8,7 @@
 | 
 | 
 */ 
-$config['application_version'] = '3.0.2';
+$config['application_version'] = '3.1.0';
 
 /* 
 |-------------------------------------------------------------------------- 
@@ -554,4 +554,4 @@ $config['rewrite_short_tags'] = FALSE;
 | Comma-separated:	'10.0.1.200,192.168.5.0/24'
 | Array:		array('10.0.1.200', '192.168.5.0/24')
 */
-$config['proxy_ips'] = '';
+$config['proxy_ips'] = '';

application/controllers/Config.php

@@ -304,7 +304,8 @@ class Config extends Secure_Controller
 			'tax_decimals' => $this->input->post('tax_decimals'),
 			'quantity_decimals' => $this->input->post('quantity_decimals'),
 			'country_codes' => $this->input->post('country_codes'),
-			'payment_options_order' => $this->input->post('payment_options_order')
+			'payment_options_order' => $this->input->post('payment_options_order'),
+			'date_or_time_format' => $this->input->post('date_or_time_format')
 		);
 	
 		$result = $this->Appconfig->batch_save($batch_save_data);

application/controllers/Items.php

@@ -224,7 +224,6 @@ class Items extends Secure_Controller
 			$images = glob('./uploads/item_pics/' . $item_info->pic_filename);
 		}
 		$data['image_path'] = sizeof($images) > 0 ? base_url($images[0]) : '';
-
 		$stock_locations = $this->Stock_location->get_undeleted_all()->result_array();
         foreach($stock_locations as $location)
         {

application/controllers/Login.php

@@ -40,6 +40,7 @@ class Login extends CI_Controller
 					$this->tracking_lib->track_event('Stats', 'Tax Decimals', $this->config->item('tax_decimals'));
 					$this->tracking_lib->track_event('Stats', 'Quantity Decimals', $this->config->item('quantity_decimals'));
 					$this->tracking_lib->track_event('Stats', 'Invoice Enable', $this->config->item('invoice_enable'));
+					$this->tracking_lib->track_event('Stats', 'Date or Time Format', $this->config->item('date_or_time_format'));
 				}
 
 				redirect('home');

application/controllers/Reports.php

@@ -64,7 +64,7 @@ class Reports extends Secure_Controller
 
 		$data = array(
 			'title' => $this->lang->line('reports_sales_summary_report'),
-			'subtitle' => date($this->config->item('dateformat'), strtotime($start_date)) . '-' . date($this->config->item('dateformat'), strtotime($end_date)),
+			'subtitle' => $this->_get_subtitle_report(array('start_date' => $start_date, 'end_date' => $end_date)),
 			'headers' => $this->xss_clean($model->getDataColumns()),
 			'data' => $tabular_data,
 			'summary_data' => $summary
@@ -100,7 +100,7 @@ class Reports extends Secure_Controller
 
 		$data = array(
 			'title' => $this->lang->line('reports_categories_summary_report'),
-			'subtitle' => date($this->config->item('dateformat'), strtotime($start_date)) . '-' . date($this->config->item('dateformat'), strtotime($end_date)),
+			'subtitle' => $this->_get_subtitle_report(array('start_date' => $start_date, 'end_date' => $end_date)),
 			'headers' => $this->xss_clean($model->getDataColumns()),
 			'data' => $tabular_data,
 			'summary_data' => $summary
@@ -136,7 +136,7 @@ class Reports extends Secure_Controller
 
 		$data = array(
 			'title' => $this->lang->line('reports_customers_summary_report'),
-			'subtitle' => date($this->config->item('dateformat'), strtotime($start_date)) . '-' . date($this->config->item('dateformat'), strtotime($end_date)),
+			'subtitle' => $this->_get_subtitle_report(array('start_date' => $start_date, 'end_date' => $end_date)),
 			'headers' => $this->xss_clean($model->getDataColumns()),
 			'data' => $tabular_data,
 			'summary_data' => $summary
@@ -172,7 +172,7 @@ class Reports extends Secure_Controller
 
 		$data = array(
 			'title' => $this->lang->line('reports_suppliers_summary_report'),
-			'subtitle' => date($this->config->item('dateformat'), strtotime($start_date)) . '-' . date($this->config->item('dateformat'), strtotime($end_date)),
+			'subtitle' => $this->_get_subtitle_report(array('start_date' => $start_date, 'end_date' => $end_date)),
 			'headers' => $this->xss_clean($model->getDataColumns()),
 			'data' => $tabular_data,
 			'summary_data' => $summary
@@ -208,7 +208,7 @@ class Reports extends Secure_Controller
 
 		$data = array(
 			'title' => $this->lang->line('reports_items_summary_report'),
-			'subtitle' => date($this->config->item('dateformat'), strtotime($start_date)) . '-' . date($this->config->item('dateformat'), strtotime($end_date)),
+			'subtitle' => $this->_get_subtitle_report(array('start_date' => $start_date, 'end_date' => $end_date)),
 			'headers' => $this->xss_clean($model->getDataColumns()),
 			'data' => $tabular_data,
 			'summary_data' => $summary
@@ -244,7 +244,7 @@ class Reports extends Secure_Controller
 
 		$data = array(
 			'title' => $this->lang->line('reports_employees_summary_report'),
-			'subtitle' => date($this->config->item('dateformat'), strtotime($start_date)) . '-' . date($this->config->item('dateformat'), strtotime($end_date)),
+			'subtitle' => $this->_get_subtitle_report(array('start_date' => $start_date, 'end_date' => $end_date)),
 			'headers' => $this->xss_clean($model->getDataColumns()),
 			'data' => $tabular_data,
 			'summary_data' => $summary
@@ -278,7 +278,7 @@ class Reports extends Secure_Controller
 
 		$data = array(
 			'title' => $this->lang->line('reports_taxes_summary_report'),
-			'subtitle' => date($this->config->item('dateformat'), strtotime($start_date)) . '-' . date($this->config->item('dateformat'), strtotime($end_date)),
+			'subtitle' => $this->_get_subtitle_report(array('start_date' => $start_date, 'end_date' => $end_date)),
 			'headers' => $this->xss_clean($model->getDataColumns()),
 			'data' => $tabular_data,
 			'summary_data' => $summary
@@ -309,7 +309,7 @@ class Reports extends Secure_Controller
 
 		$data = array(
 			'title' => $this->lang->line('reports_discounts_summary_report'),
-			'subtitle' => date($this->config->item('dateformat'), strtotime($start_date)) . '-' . date($this->config->item('dateformat'), strtotime($end_date)),
+			'subtitle' => $this->_get_subtitle_report(array('start_date' => $start_date, 'end_date' => $end_date)),
 			'headers' => $this->xss_clean($model->getDataColumns()),
 			'data' => $tabular_data,
 			'summary_data' => $summary
@@ -341,7 +341,7 @@ class Reports extends Secure_Controller
 
 		$data = array(
 			'title' => $this->lang->line('reports_payments_summary_report'),
-			'subtitle' => date($this->config->item('dateformat'), strtotime($start_date)) . '-' . date($this->config->item('dateformat'), strtotime($end_date)),
+			'subtitle' => $this->_get_subtitle_report(array('start_date' => $start_date, 'end_date' => $end_date)),
 			'headers' => $this->xss_clean($model->getDataColumns()),
 			'data' => $tabular_data,
 			'summary_data' => $summary
@@ -409,7 +409,7 @@ class Reports extends Secure_Controller
 
 		$data = array(
 			'title' => $this->lang->line('reports_sales_summary_report'),
-			'subtitle' => date($this->config->item('dateformat'), strtotime($start_date)) . '-' . date($this->config->item('dateformat'), strtotime($end_date)),
+			'subtitle' => $this->_get_subtitle_report(array('start_date' => $start_date, 'end_date' => $end_date)),
 			'chart_type' => 'reports/graphs/line',
 			'labels_1' => $labels,
 			'series_data_1' => $series,
@@ -445,7 +445,7 @@ class Reports extends Secure_Controller
 
 		$data = array(
 			'title' => $this->lang->line('reports_items_summary_report'),
-			'subtitle' => date($this->config->item('dateformat'), strtotime($start_date)) . '-' . date($this->config->item('dateformat'), strtotime($end_date)),
+			'subtitle' => $this->_get_subtitle_report(array('start_date' => $start_date, 'end_date' => $end_date)),
 			'chart_type' => 'reports/graphs/hbar',
 			'labels_1' => $labels,
 			'series_data_1' => $series,
@@ -481,7 +481,7 @@ class Reports extends Secure_Controller
 
 		$data = array(
 			'title' => $this->lang->line('reports_categories_summary_report'),
-			'subtitle' => date($this->config->item('dateformat'), strtotime($start_date)) . '-' . date($this->config->item('dateformat'), strtotime($end_date)),
+			'subtitle' => $this->_get_subtitle_report(array('start_date' => $start_date, 'end_date' => $end_date)),
 			'chart_type' => 'reports/graphs/pie',
 			'labels_1' => $labels,
 			'series_data_1' => $series,
@@ -515,7 +515,7 @@ class Reports extends Secure_Controller
 
 		$data = array(
 			'title' => $this->lang->line('reports_suppliers_summary_report'),
-			'subtitle' => date($this->config->item('dateformat'), strtotime($start_date)) . '-' . date($this->config->item('dateformat'), strtotime($end_date)),
+			'subtitle' => $this->_get_subtitle_report(array('start_date' => $start_date, 'end_date' => $end_date)),
 			'chart_type' => 'reports/graphs/pie',
 			'labels_1' => $labels,
 			'series_data_1' => $series,
@@ -549,7 +549,7 @@ class Reports extends Secure_Controller
 
 		$data = array(
 			'title' => $this->lang->line('reports_employees_summary_report'),
-			'subtitle' => date($this->config->item('dateformat'), strtotime($start_date)) . '-' . date($this->config->item('dateformat'), strtotime($end_date)),
+			'subtitle' => $this->_get_subtitle_report(array('start_date' => $start_date, 'end_date' => $end_date)),
 			'chart_type' => 'reports/graphs/pie',
 			'labels_1' => $labels,
 			'series_data_1' => $series,
@@ -583,7 +583,7 @@ class Reports extends Secure_Controller
 
 		$data = array(
 			'title' => $this->lang->line('reports_taxes_summary_report'),
-			'subtitle' => date($this->config->item('dateformat'), strtotime($start_date)) . '-' . date($this->config->item('dateformat'), strtotime($end_date)),
+			'subtitle' => $this->_get_subtitle_report(array('start_date' => $start_date, 'end_date' => $end_date)),
 			'chart_type' => 'reports/graphs/pie',
 			'labels_1' => $labels,
 			'series_data_1' => $series,
@@ -617,7 +617,7 @@ class Reports extends Secure_Controller
 
 		$data = array(
 			'title' => $this->lang->line('reports_customers_summary_report'),
-			'subtitle' => date($this->config->item('dateformat'), strtotime($start_date)) . '-' . date($this->config->item('dateformat'), strtotime($end_date)),
+			'subtitle' => $this->_get_subtitle_report(array('start_date' => $start_date, 'end_date' => $end_date)),
 			'chart_type' => 'reports/graphs/hbar',
 			'labels_1' => $labels,
 			'series_data_1' => $series,
@@ -653,7 +653,7 @@ class Reports extends Secure_Controller
 
 		$data = array(
 			'title' => $this->lang->line('reports_discounts_summary_report'),
-			'subtitle' => date($this->config->item('dateformat'), strtotime($start_date)) . '-' . date($this->config->item('dateformat'), strtotime($end_date)),
+			'subtitle' => $this->_get_subtitle_report(array('start_date' => $start_date, 'end_date' => $end_date)),
 			'chart_type' => 'reports/graphs/bar',
 			'labels_1' => $labels,
 			'series_data_1' => $series,
@@ -689,7 +689,7 @@ class Reports extends Secure_Controller
 
 		$data = array(
 			'title' => $this->lang->line('reports_payments_summary_report'),
-			'subtitle' => date($this->config->item('dateformat'), strtotime($start_date)) . '-' . date($this->config->item('dateformat'), strtotime($end_date)),
+			'subtitle' => $this->_get_subtitle_report(array('start_date' => $start_date, 'end_date' => $end_date)),
 			'chart_type' => 'reports/graphs/pie',
 			'labels_1' => $labels,
 			'series_data_1' => $series,
@@ -754,7 +754,7 @@ class Reports extends Secure_Controller
 		$customer_info = $this->Customer->get_info($customer_id);
 		$data = array(
 			'title' => $this->xss_clean($customer_info->first_name . ' ' . $customer_info->last_name . ' ' . $this->lang->line('reports_report')),
-			'subtitle' => date($this->config->item('dateformat'), strtotime($start_date)) . '-' . date($this->config->item('dateformat'), strtotime($end_date)),
+			'subtitle' => $this->_get_subtitle_report(array('start_date' => $start_date, 'end_date' => $end_date)),
 			'headers' => $headers,
 			'summary_data' => $summary_data,
 			'details_data' => $details_data,
@@ -818,7 +818,7 @@ class Reports extends Secure_Controller
 		$employee_info = $this->Employee->get_info($employee_id);
 		$data = array(
 			'title' => $this->xss_clean($employee_info->first_name . ' ' . $employee_info->last_name . ' ' . $this->lang->line('reports_report')),
-			'subtitle' => date($this->config->item('dateformat'), strtotime($start_date)) . '-' . date($this->config->item('dateformat'), strtotime($end_date)),
+			'subtitle' => $this->_get_subtitle_report(array('start_date' => $start_date, 'end_date' => $end_date)),
 			'headers' => $headers,
 			'summary_data' => $summary_data,
 			'details_data' => $details_data,
@@ -883,7 +883,7 @@ class Reports extends Secure_Controller
 
 		$data = array(
 			'title' => $discount . '% ' . $this->lang->line('reports_discount') . ' ' . $this->lang->line('reports_report'),
-			'subtitle' => date($this->config->item('dateformat'), strtotime($start_date)) . '-' . date($this->config->item('dateformat'), strtotime($end_date)),
+			'subtitle' => $this->_get_subtitle_report(array('start_date' => $start_date, 'end_date' => $end_date)),
 			'headers' => $headers,
 			'summary_data' => $summary_data,
 			'details_data' => $details_data,
@@ -975,7 +975,7 @@ class Reports extends Secure_Controller
 
 		$data = array(
 			'title' => $this->lang->line('reports_detailed_sales_report'),
-			'subtitle' => date($this->config->item('dateformat'), strtotime($start_date)) . '-' . date($this->config->item('dateformat'), strtotime($end_date)),
+			'subtitle' => $this->_get_subtitle_report(array('start_date' => $start_date, 'end_date' => $end_date)),
 			'headers' => $headers,
 			'editable' => 'sales',
 			'summary_data' => $summary_data,
@@ -1062,7 +1062,7 @@ class Reports extends Secure_Controller
 
 		$data = array(
 			'title' => $this->lang->line('reports_detailed_receivings_report'),
-			'subtitle' => date($this->config->item('dateformat'), strtotime($start_date)) . '-' . date($this->config->item('dateformat'), strtotime($end_date)),
+			'subtitle' => $this->_get_subtitle_report(array('start_date' => $start_date, 'end_date' => $end_date)),
 			'headers' => $headers,
 			'editable' => 'receivings',
 			'summary_data' => $summary_data,
@@ -1154,5 +1154,21 @@ class Reports extends Secure_Controller
 
 		$this->load->view('reports/tabular', $data);
 	}
+	//	Returns subtitle for the reports
+	private function _get_subtitle_report($inputs)
+	{
+		$subtitle = '';
+
+		if(empty($this->config->item('date_or_time_format')))
+		{
+			$subtitle .= date($this->config->item('dateformat'), strtotime($inputs['start_date'])) . ' - ' .date($this->config->item('dateformat'), strtotime($inputs['end_date']));
+		}
+		else
+		{
+			$subtitle .= date($this->config->item('dateformat').' '.$this->config->item('timeformat'), strtotime(rawurldecode($inputs['start_date']))) . ' - ' . date($this->config->item('dateformat').' '.$this->config->item('timeformat'), strtotime(rawurldecode($inputs['end_date'])));
+		}
+		
+		return $subtitle;
+	}
 }
 ?>

application/helpers/table_helper.php

@@ -137,6 +137,7 @@ function transform_headers($array, $readonly = FALSE, $editable = TRUE)
 
 	foreach($array as $element)
 	{
+		reset($element);
 		$result[] = array('field' => key($element),
 			'title' => current($element),
 			'switchable' => isset($element['switchable']) ?

application/language/en/config_lang.php

@@ -37,6 +37,7 @@ $lang["config_company_remove_image"] = "Remove Image";
 $lang["config_company_required"] = "Company name is a required field";
 $lang["config_company_website_url"] = "Company website is not a valid URL (http://...)";
 $lang["config_comma"] = "comma";
+$lang["config_date_or_time_format"] = "Date and Time";
 $lang["config_country_codes"] = "Country Codes";
 $lang["config_country_codes_tooltip"] = "Comma separated list of country codes for nominatim address lookup.";
 $lang["config_currency_symbol"] = "Currency Symbol";
@@ -55,9 +56,9 @@ $lang["config_datetimeformat"] = "Date and Time format";
 $lang["config_decimal_point"] = "Decimal Point";
 $lang["config_default_barcode_font_size_number"] = "The default barcode font size must be a number";
 $lang["config_default_barcode_font_size_required"] = "The default barcode font size is a required field";
-$lang["config_default_barcode_height_number"] = "The default barcode height  must be a number";
+$lang["config_default_barcode_height_number"] = "The default barcode height must be a number";
 $lang["config_default_barcode_height_required"] = "The default barcode height is a required field";
-$lang["config_default_barcode_num_in_row_number"] = "The default barcode num in row must be a number";
+$lang["config_default_barcode_num_in_row_number"] = "The default barcode number in row must be a number";
 $lang["config_default_barcode_num_in_row_required"] = "The default barcode num in row is a required field";
 $lang["config_default_barcode_page_cellspacing_number"] = "The default barcode page cellspacing must be a number";
 $lang["config_default_barcode_page_cellspacing_required"] = "The default barcode page cellspacing is a required field";

application/language/en/items_lang.php

@@ -10,7 +10,7 @@ $lang["items_cannot_be_deleted"] = "Could not deleted selected items, one or mor
 $lang["items_cannot_find_item"] = "Cannot find any information about item";
 $lang["items_category"] = "Category";
 $lang["items_category_required"] = "Category is a required field";
-$lang["items_change_all_to_allow_alt_desc"] = " Allow Alt Desc For All";
+$lang["items_change_all_to_allow_alt_desc"] = "Allow Alt Desc For All";
 $lang["items_change_all_to_not_allow_allow_desc"] = "Not Allow Alt Desc For All";
 $lang["items_change_all_to_serialized"] = "Change All To Serialized";
 $lang["items_change_all_to_unserialized"] = "Change All To Unserialized";

application/language/nl-BE/common_lang.php

@@ -36,7 +36,7 @@ $lang["common_or"] = "Of";
 $lang["common_phone_number"] = "Telefoon";
 $lang["common_phone_number_required"] = "";
 $lang["common_please_visit_my"] = "Bezoek mijn";
-$lang["common_powered_by"] = "Powered by";
+$lang["common_powered_by"] = "Mogelijk gemaakt door";
 $lang["common_price"] = "Prijs";
 $lang["common_remove"] = "Verwijder";
 $lang["common_return_policy"] = "Retourvoorwaarden";

application/language/nl-BE/config_lang.php

@@ -2,7 +2,7 @@
 
 $lang["config_address"] = "Adres";
 $lang["config_address_required"] = "Het adres van het bedrijf moet ingevuld worden";
-$lang["config_apostrophe"] = "apostrophe";
+$lang["config_apostrophe"] = "apostrof";
 $lang["config_backup_button"] = "Backup";
 $lang["config_backup_database"] = "Backup Database";
 $lang["config_barcode"] = "Barcode";
@@ -36,11 +36,11 @@ $lang["config_company_change_image"] = "Selecteer Afbeelding";
 $lang["config_company_remove_image"] = "Verwijder Afbeelding";
 $lang["config_company_required"] = "De bedrijfsnaam moet ingevuld worden";
 $lang["config_company_website_url"] = "De website van het bedrijf is geen geldige URL (http://...)";
-$lang["config_comma"] = "comma";
-$lang["config_country_codes"] = "Country Codes";
-$lang["config_country_codes_tooltip"] = "Comma separated list of country codes for nominatim address lookup.";
+$lang["config_comma"] = "komma";
+$lang["config_country_codes"] = "Land Codes";
+$lang["config_country_codes_tooltip"] = "Komma's gescheiden lijst van landencodes voor het op naam opzoeken van het adres opzoeken.";
 $lang["config_currency_symbol"] = "Valuta";
-$lang["config_currency_decimals"] = "Currency Decimals";
+$lang["config_currency_decimals"] = "Valuta decimalen";
 $lang["config_custom1"] = "Custom Veld 1";
 $lang["config_custom2"] = "Custom Veld 2";
 $lang["config_custom3"] = "Custom Veld 3";
@@ -51,42 +51,42 @@ $lang["config_custom7"] = "Custom Veld 7";
 $lang["config_custom8"] = "Custom Veld 8";
 $lang["config_custom9"] = "Custom Veld 9";
 $lang["config_custom10"] = "Custom Veld 10";
-$lang["config_datetimeformat"] = "Date and Time format";
-$lang["config_decimal_point"] = "Decimal Point";
-$lang["config_default_barcode_font_size_number"] = "The default barcode font size must be a number";
-$lang["config_default_barcode_font_size_required"] = "The default barcode font size is a required field";
-$lang["config_default_barcode_height_number"] = "The default barcode height  must be a number";
-$lang["config_default_barcode_height_required"] = "The default barcode height is a required field";
-$lang["config_default_barcode_num_in_row_number"] = "The default barcode num in row must be a number";
-$lang["config_default_barcode_num_in_row_required"] = "The default barcode num in row is a required field";
-$lang["config_default_barcode_page_cellspacing_number"] = "The default barcode page cellspacing must be a number";
-$lang["config_default_barcode_page_cellspacing_required"] = "The default barcode page cellspacing is a required field";
-$lang["config_default_barcode_page_width_number"] = "The default barcode page width must be a number";
-$lang["config_default_barcode_page_width_required"] = "The default barcode page width is a required field";
-$lang["config_default_barcode_quality_number"] = "The default barcode quality must be a number";
-$lang["config_default_barcode_quality_required"] = "The default barcode quality is a required field";
-$lang["config_default_barcode_width_number"] = "The default barcode width must be a number";
-$lang["config_default_barcode_width_required"] = "The default barcode width is a required field";
+$lang["config_datetimeformat"] = "Datum en tijd formaat";
+$lang["config_decimal_point"] = "Decimale punt";
+$lang["config_default_barcode_font_size_number"] = "Het standaard barcode lettergrootte moet een getal zijn";
+$lang["config_default_barcode_font_size_required"] = "Het standaard barcode tekengroote is een verplicht veld";
+$lang["config_default_barcode_height_number"] = "De standaard barcode hoogte moet een getal zijn";
+$lang["config_default_barcode_height_required"] = "De standaard barcode hoogte is een verplicht veld";
+$lang["config_default_barcode_num_in_row_number"] = "Het standaard barcode nummer in de rij moet een getal zijn";
+$lang["config_default_barcode_num_in_row_required"] = "Het standaard barcode nummer in een rij is een verplicht veld";
+$lang["config_default_barcode_page_cellspacing_number"] = "De standaard barcode pagina cellspacing moet een getal zijn";
+$lang["config_default_barcode_page_cellspacing_required"] = "De standaard barcode pagina cellspacing is een verplicht veld";
+$lang["config_default_barcode_page_width_number"] = "De standaard barcode pagina breedte moet een getal zijn";
+$lang["config_default_barcode_page_width_required"] = "De standaard barcode pagina breedte is een verplicht veld";
+$lang["config_default_barcode_quality_number"] = "De standaard barcode kwaliteit moet een getal zijn";
+$lang["config_default_barcode_quality_required"] = "De standaard barcode kwaliteit is een verplicht veld";
+$lang["config_default_barcode_width_number"] = "De standaard breedte van de barcode moet een getal zijn";
+$lang["config_default_barcode_width_required"] = "De standaard breedte van de barcode is een verplicht veld";
 $lang["config_default_sales_discount"] = "Standaard Korting %";
-$lang["config_default_sales_discount_number"] = "The default sales discount must be a number";
-$lang["config_default_sales_discount_required"] = "The default sales discount is a required field";
+$lang["config_default_sales_discount_number"] = "De standaard korting moet een getal zijn";
+$lang["config_default_sales_discount_required"] = "De standaard korting is een verplicht veld";
 $lang["config_default_tax_rate"] = "Standaard VAT %";
 $lang["config_default_tax_rate_1"] = "VAT 1 %";
 $lang["config_default_tax_rate_2"] = "VAT 2 %";
 $lang["config_default_tax_rate_number"] = "Het percentage VAT moet een nummer zijn";
 $lang["config_default_tax_rate_required"] = "Het percentage VAT moet ingevuld worden";
 $lang["config_default_tax_name_required"] = "De naam van de VAT moet ingevuld worden";
-$lang["config_dot"] = "dot";
+$lang["config_dot"] = "punt";
 $lang["config_email"] = "Email";
 $lang["config_email_configuration"] = "Email Configuration";
 $lang["config_email_protocol"] = "Protocol";
-$lang["config_email_mailpath"] = "Path to Sendmail";
+$lang["config_email_mailpath"] = "Pad naar Sendmail";
 $lang["config_email_smtp_host"] = "SMTP Server";
-$lang["config_email_smtp_port"] = "SMTP Port";
-$lang["config_email_smtp_crypto"] = "SMTP Encryption";
-$lang["config_email_smtp_timeout"] = "SMTP Timeout (s)";
-$lang["config_email_smtp_user"] = "SMTP Username";
-$lang["config_email_smtp_pass"] = "SMTP Password";
+$lang["config_email_smtp_port"] = "SMTP Poort";
+$lang["config_email_smtp_crypto"] = "SMTP Encryptie";
+$lang["config_email_smtp_timeout"] = "SMTP Time-out (s)";
+$lang["config_email_smtp_user"] = "SMTP Gebruikersnaam";
+$lang["config_email_smtp_pass"] = "SMTP Wachtwoord";
 $lang["config_fax"] = "Fax";
 $lang["config_general"] = "Algemene";
 $lang["config_general_configuration"] = "Algemene Instellingen";
@@ -95,71 +95,71 @@ $lang["config_info_configuration"] = "Instellingen";
 $lang["config_invoice"] = "Factuur";
 $lang["config_invoice_configuration"] = "Print Instellingen";
 $lang["config_invoice_default_comments"] = "Factuur Mededeling";
-$lang["config_invoice_enable"] = "Enable Invoicing";
-$lang["config_invoice_email_message"] = "Invoice Email Template";
+$lang["config_invoice_enable"] = "Factureren inschakelen";
+$lang["config_invoice_email_message"] = "Factuur Email Sjabloon";
 $lang["config_invoice_printer"] = "Factuur Printer";
 $lang["config_jsprintsetup_required"] = "Opgelet! De uitgeschakelde functionaliteit werkt enkel met de jsPrintSetup addon in Firefox.";
 $lang["config_language"] = "Taal";
-$lang["config_left"] = "Left";
-$lang["config_license"] = "License";
-$lang["config_license_configuration"] = "License Statement";
+$lang["config_left"] = "Links";
+$lang["config_license"] = "Licentie";
+$lang["config_license_configuration"] = "Licentie Verklaring";
 $lang["config_lines_per_page"] = "Lijnen Per Pagina";
 $lang["config_lines_per_page_number"] = "The lines per page must be a number";
-$lang["config_lines_per_page_required"] = "The lines per page is a required field";
-$lang["config_locale"] = "Localisation";
-$lang["config_locale_configuration"] = "Localisation Configuration";
-$lang["config_locale_info"] = "Localisation Configuration Information";
-$lang["config_location"] = "Stock";
+$lang["config_lines_per_page_required"] = "De regels per pagina is een verplicht veld";
+$lang["config_locale"] = "Locatie";
+$lang["config_locale_configuration"] = "Locatie Configuratie";
+$lang["config_locale_info"] = "Locatie Configuratie Informatie";
+$lang["config_location"] = "Voorraad";
 $lang["config_location_configuration"] = "Stock Locaties";
 $lang["config_location_info"] = "Instellingen Locatie";
 $lang["config_logout"] = "Wilt u een backup maken alvorens uit te loggen?";
 $lang["config_message"] = "Message";
 $lang["config_message_configuration"] = "Message Configuration";
-$lang["config_msg_msg"] = "Saved Text Message";
-$lang["config_msg_msg_placeholder"] = "If you wish to use a SMS template save your message here. Otherwise leave the box blank.";
-$lang["config_msg_uid"] = "SMS-API Username";
-$lang["config_msg_uid_required"] = "SMS-API Username is a required field";
+$lang["config_msg_msg"] = "Opgeslagen SMS-bericht";
+$lang["config_msg_msg_placeholder"] = "Wilt u gebruik maken van een SMS-sjabloon? sla hier uw bericht op. Laat ander het vak leeg.";
+$lang["config_msg_uid"] = "SMS-API Gebruikersnaam";
+$lang["config_msg_uid_required"] = "SMS-API Gebruikersnaam is een verplicht veld";
 $lang["config_msg_pwd"] = "SMS-API Password";
-$lang["config_msg_pwd_required"] = "SMS-API Password is a required field";
-$lang["config_msg_src"] = "SMS-API Sender ID";
-$lang["config_msg_src_required"] = "SMS-API Sender ID is a required field";
+$lang["config_msg_pwd_required"] = "SMS-API Wachtwoord is een verplicht veld";
+$lang["config_msg_src"] = "SMS-API Verzender ID";
+$lang["config_msg_src_required"] = "SMS-API Verzender ID is een verplicht veld";
 $lang["config_none"] = "none";
-$lang["config_notify_alignment"] = "Notification Popup Position";
+$lang["config_notify_alignment"] = "Notificatie Pop-up positie";
 $lang["config_number_format"] = "Number Format";
-$lang["config_payment_options_order"] = "Payment Options Order";
+$lang["config_payment_options_order"] = "Betaal opties volgorde";
 $lang["config_phone"] = "Telefoon";
 $lang["config_phone_required"] = "De telefoonnummer van het bedrijf moet ingevuld worden";
 $lang["config_print_bottom_margin"] = "Marge Beneden";
-$lang["config_print_bottom_margin_number"] = "The default bottom margin must be a number";
-$lang["config_print_bottom_margin_required"] = "The default bottom margin is a required field";
+$lang["config_print_bottom_margin_number"] = "De standaard ondermarge moet een getal zijn";
+$lang["config_print_bottom_margin_required"] = "De standaard ondermarge is een verplicht veld";
 $lang["config_print_footer"] = "Print Browser Footer";
 $lang["config_print_header"] = "Print Browser Header";
 $lang["config_print_left_margin"] = "Marge Links";
-$lang["config_print_left_margin_number"] = "The default left margin must be a number";
-$lang["config_print_left_margin_required"] = "The default left margin is a required field";
+$lang["config_print_left_margin_number"] = "De standaard linkermarge moet een getal zijn";
+$lang["config_print_left_margin_required"] = "De standaard linkermarge is een verplicht veld";
 $lang["config_print_right_margin"] = "Marge Rechts";
-$lang["config_print_right_margin_number"] = "The default right margin must be a number";
-$lang["config_print_right_margin_required"] = "The default right margin is a required field";
+$lang["config_print_right_margin_number"] = "De standaard rechtermarge moet een getal zijn";
+$lang["config_print_right_margin_required"] = "De standaard rechtermarge is een verplicht veld";
 $lang["config_print_silently"] = "Toon Printvenster";
 $lang["config_print_top_margin"] = "Marge Boven";
-$lang["config_print_top_margin_number"] = "The default top margin must be a number";
-$lang["config_print_top_margin_required"] = "The default top margin is a required field";
-$lang["config_quantity_decimals"] = "Quantity Decimals";
+$lang["config_print_top_margin_number"] = "De standaard bovenmarge moet een getal zijn";
+$lang["config_print_top_margin_required"] = "De standaard bovenmarge is een verplicht veld";
+$lang["config_quantity_decimals"] = "Kwantiteit Decimalen";
 $lang["config_receipt"] = "Ontvangst";
 $lang["config_receipt_configuration"] = "Print Instellingen";
 $lang["config_receipt_info"] = "Ticket Instellingen";
-$lang["config_receipt_printer"] = "Ticket Printer";
+$lang["config_receipt_printer"] = "Bon Printer";
 $lang["config_receipt_show_taxes"] = "Toon VAT";
 $lang["config_receipt_show_total_discount"] = "Toon Totale Korting";
-$lang["config_receipt_show_description"] = "Show Description";
-$lang["config_receipt_show_serialnumber"] = "Show Serial Number";
-$lang["config_receipt_template"] = "Receipt Template";
+$lang["config_receipt_show_description"] = "Laat beschrijving zien";
+$lang["config_receipt_show_serialnumber"] = "Toon Serienummer";
+$lang["config_receipt_template"] = "Bon sjabloon";
 $lang["config_receipt_default"] = "Default";
-$lang["config_receipt_short"] = "Short";
-$lang["config_receiving_calculate_average_price"] = "Calc avg. Price (Receiving)";
+$lang["config_receipt_short"] = "Kort";
+$lang["config_receiving_calculate_average_price"] = "Bereken gem. Prijs (Ontvangen)";
 $lang["config_recv_invoice_format"] = "Formattering Order #";
 $lang["config_return_policy_required"] = "De retourvoorwaarden moeten ingevuld worden";
-$lang["config_right"] = "Right";
+$lang["config_right"] = "Rechts";
 $lang["config_sales_invoice_format"] = "Formattering Aankoop #";
 $lang["config_saved_successfully"] = "Configuratie werd bewaard";
 $lang["config_saved_unsuccessfully"] = "Configuratie kon niet worden bewaard";
@@ -169,16 +169,16 @@ $lang["config_stock_location"] = "Stock locatie";
 $lang["config_stock_location_duplicate"] = "Vul een unieke naam in";
 $lang["config_stock_location_invalid_chars"] = "De bedrijfsnaam moet ingevuld worden";
 $lang["config_stock_location_required"] = "Naam van de stock locatie is een verplicht veld";
-$lang["config_takings_printer"] = "Takings Printer";
-$lang["config_tax_decimals"] = "Tax Decimals";
+$lang["config_takings_printer"] = "Ontvangst Printer";
+$lang["config_tax_decimals"] = "Belasting Decimalen";
 $lang["config_tax_included"] = "VAT Inbegrepen";
-$lang["config_thousands_separator"] = "Thousands Separator";
+$lang["config_thousands_separator"] = "duizenden Separator";
 $lang["config_timezone"] = "Tijdzone";
 $lang["config_top"] = "Top";
 $lang["config_website"] = "Website";
 $lang["config_number_locale"] = "Localisation";
 $lang["config_return_policy_required"] = "De retourvoorwaarden moeten ingevuld worden";
-$lang["config_number_locale_required"] = "Number Locale is a required field";
-$lang["config_number_locale_invalid"] = "The entered locale is invalid. Check the link in the tooltip to find a sensible value";
-$lang["config_number_locale_tooltip"] = "Find a suitable locale through this link";
+$lang["config_number_locale_required"] = "Nummer Locale is een verplicht veld";
+$lang["config_number_locale_invalid"] = "De ingevoerde locatie is ongeldig. Controleer de link in de tooltip om een geldige waarde te vinden";
+$lang["config_number_locale_tooltip"] = "Vind een geldige locatie doormiddel van deze link";
 $lang["config_theme"] = "Theme";

application/language/nl-BE/customers_lang.php

@@ -6,7 +6,7 @@ $lang["customers_cannot_be_deleted"] = "De geselecteerde klanten konden niet wor
 $lang["customers_company_name"] = "Bedrijfsnaam";
 $lang["customers_confirm_delete"] = "Bent u zeker dat u de geselecteerde klanten wil verwijderen?";
 $lang["customers_customer"] = "Klant";
-$lang["customers_discount"] = "Discount";
+$lang["customers_discount"] = "Korting";
 $lang["customers_error_adding_updating"] = "Fout bij het toevoegen/bewerken van een klant";
 $lang["customers_new"] = "Nieuwe Klant";
 $lang["customers_none_selected"] = "U hebt geen klanten geselecteerd";
@@ -15,10 +15,10 @@ $lang["customers_successful_adding"] = "Klant succesvol aangemaakt";
 $lang["customers_successful_deleted"] = "Er werd(en)";
 $lang["customers_successful_updating"] = "Wijzigingen klantgegevens bewaard voor ";
 $lang["customers_taxable"] = "Belastbaar";
-$lang["customers_total"] = "Total";
+$lang["customers_total"] = "Totaal";
 $lang["customers_update"] = "Bewerk Klant";
-$lang["customers_import_items_excel"] = "Import customers from Excel sheet";
+$lang["customers_import_items_excel"] = "Importeer klanten vanuit een Excel bestand";
 $lang["customers_excel_import_failed"] = "Excel import mislukt";
-$lang["customers_excel_import_nodata_wrongformat"] = "Your uploaded file has no data or wrong format";
-$lang["customers_excel_import_success"] = "Import of Customers successful";
-$lang["customers_excel_import_partially_failed"] = "Most Customers imported. But some were not, here is the list";
+$lang["customers_excel_import_nodata_wrongformat"] = "Je geüploade bestand heeft geen gegevens of een verkeerd formaat";
+$lang["customers_excel_import_success"] = "Klanten met succes geïmporteerd";
+$lang["customers_excel_import_partially_failed"] = "De meeste klanten zijn geïmporteerd. Maar sommige niet, hier is de lijst";

application/language/nl-BE/datepicker_lang.php

@@ -8,14 +8,14 @@ $lang["datepicker_last_30"] = "Vorige 30 Dagen";
 $lang["datepicker_last_month"] = "Vorige Maand";
 $lang["datepicker_last_year"] = "Vorig Jaar";
 $lang["datepicker_this_month"] = "Deze Maand";
-$lang["datepicker_this_month_last_year"] = "Same Month Last Year";
-$lang["datepicker_same_month_to_today"] = "This Month To Today";
-$lang["datepicker_same_month_to_same_day_last_year"] = "Same Month To Same Day Last Year";
+$lang["datepicker_this_month_last_year"] = "Dezelfde maand vorig jaar";
+$lang["datepicker_same_month_to_today"] = "Deze maand tot vandaag";
+$lang["datepicker_same_month_to_same_day_last_year"] = "Dezelfde maand op dezelfde dag vorig jaar";
 $lang["datepicker_this_year"] = "Dit Jaar";
-$lang["datepicker_today_last_year"] = "Today Last Year";
+$lang["datepicker_today_last_year"] = "Vandaag vorig jaar";
 $lang["datepicker_yesterday"] = "Gisteren";
-$lang["datepicker_apply"] = "Apply";
-$lang["datepicker_cancel"] = "Cancel";
-$lang["datepicker_from"] = "From";
+$lang["datepicker_apply"] = "Toepassen";
+$lang["datepicker_cancel"] = "Annuleren";
+$lang["datepicker_from"] = "Van";
 $lang["datepicker_to"] = "To";
-$lang["datepicker_custom"] = "Custom";
+$lang["datepicker_custom"] = "Aangepaste";

application/language/nl-BE/employees_lang.php

@@ -1,12 +1,13 @@
 <?php 
 
-$lang["employees_basic_information"] = "Information";
-$lang["employees_cannot_be_deleted"] = "Could not deleted selected employees, one or more of the employees has processed sales or you are trying to delete yourself :)";
+$lang["employees_basic_information"] = "Informatie";
+$lang["employees_cannot_be_deleted"] = "Kan geselecteerde medewerker niet verwijderen, de medewerker heeft een of meerdere verkopen afgehandeld of je probeerd je zelf te verwijderen :)
+Could not deleted selected employees, one or more of the employees has processed sales or you are trying to delete yourself :)";
 $lang["employees_confirm_delete"] = "Bent u zeker dat u de geselecteerde werknemers wil verwijderen?";
 $lang["employees_employee"] = "Werknemer";
-$lang["employees_error_adding_updating"] = "Error adding/updating employee";
-$lang["employees_error_deleting_demo_admin"] = "You can not delete the demo admin user";
-$lang["employees_error_updating_demo_admin"] = "You can not change the demo admin user";
+$lang["employees_error_adding_updating"] = "Fout tijden toevoegen/aanpassen medewerker";
+$lang["employees_error_deleting_demo_admin"] = "Je kan de demo admin niet verwijderen";
+$lang["employees_error_updating_demo_admin"] = "Jij kan de demo admin gebruiker niet veranderen";
 $lang["employees_login_info"] = "Login";
 $lang["employees_new"] = "N. Werknemer";
 $lang["employees_none_selected"] = "U hebt geen werknemers geselecteerd";
@@ -15,12 +16,12 @@ $lang["employees_password"] = "Paswoord";
 $lang["employees_password_minlength"] = "Paswoord moet minstens 8 characters lang zijn";
 $lang["employees_password_must_match"] = "Paswoorden komen niet overeen";
 $lang["employees_password_required"] = "Paswoord moet ingevuld worden";
-$lang["employees_permission_desc"] = "Check the boxes below to grant access to modules";
-$lang["employees_permission_info"] = "Permissions";
+$lang["employees_permission_desc"] = "Vink de vierkantjes hieronder aan om toegang te verlenen tot de modules";
+$lang["employees_permission_info"] = "Rechten";
 $lang["employees_repeat_password"] = "Herhaal Paswoord";
-$lang["employees_successful_adding"] = "You have successfully added employee";
+$lang["employees_successful_adding"] = "Je hebt met succes een medewerker toegevoegd";
 $lang["employees_successful_deleted"] = "Er werd(en)";
-$lang["employees_successful_updating"] = "You have successfully updated employee";
+$lang["employees_successful_updating"] = "Je hebt met succes de medewerker gewijzigd";
 $lang["employees_update"] = "Update Werknemer";
 $lang["employees_username"] = "Gebruikersnaam";
 $lang["employees_username_minlength"] = "Gebruikersnaam moet minstens 5 characters lang zijn";

application/language/nl-BE/giftcards_lang.php

@@ -47,7 +47,7 @@ $lang["giftcards_one_or_multiple"] = "cadeaubon(s) verwijderd";
 $lang["giftcards_person_id"] = "Klant";
 $lang["giftcards_quantity"] = "In stock";
 $lang["giftcards_quantity_required"] = "Hoeveelheid moet ingevuld worden. Druk Sluit ( X ) om te annuleren";
-$lang["giftcards_reorder_level"] = "Reorder Level";
+$lang["giftcards_reorder_level"] = "Bestel niveau";
 $lang["giftcards_retrive_giftcard_info"] = "Haal Info Op";
 $lang["giftcards_sales_tax_1"] = "VAT";
 $lang["giftcards_sales_tax_2"] = "VAT 2";
@@ -64,6 +64,6 @@ $lang["giftcards_tax_percents"] = "VAT Percentages";
 $lang["giftcards_unit_price"] = "Verkoopsprijs";
 $lang["giftcards_upc_database"] = "UPC Database";
 $lang["giftcards_update"] = "Bewaar Cadeaubon";
-$lang["giftcards_use_inventory_menu"] = "Use Inv. Menu";
+$lang["giftcards_use_inventory_menu"] = "Gebruik inventaris menu";
 $lang["giftcards_value"] = "Cadeaubon Waarde moet een getal zijn";
 $lang["giftcards_value_required"] = "Cadeaubon Waarde is een verplicht veld";

application/language/nl-BE/items_lang.php

@@ -30,12 +30,12 @@ $lang["items_edit_multiple_items"] = "Meerdere Producten Bewerken";
 $lang["items_error_adding_updating"] = "Fout bij het toevoegen/aanpassen van een product";
 $lang["items_error_updating_multiple"] = "Fout bij het bewaren van producten";
 $lang["items_excel_import_failed"] = "Excel import mislukt";
-$lang["items_excel_import_nodata_wrongformat"] = "Your uploaded file has no data or wrong format";
-$lang["items_excel_import_success"] = "Import of Items successful";
-$lang["items_excel_import_partially_failed"] = "Most Items imported. But some were not, here is the list";
+$lang["items_excel_import_nodata_wrongformat"] = "Je geüploade bestand heeft geen gegevens of een verkeerd formaat";
+$lang["items_excel_import_success"] = "Import van Artikelen met succes afgerond";
+$lang["items_excel_import_partially_failed"] = "Meesten Artikelen geïmporteerd. Maar niet alles, Hier is een lijst";
 $lang["items_generate_barcodes"] = "Genereer Barcodes";
 $lang["items_image"] = "Afbeelding";
-$lang["items_info_provided_by"] = "Info provided by";
+$lang["items_info_provided_by"] = "Info afgeleverd door";
 $lang["items_inventory"] = "Stock";
 $lang["items_inventory_comments"] = "Commentaar";
 $lang["items_is_deleted"] = "Verwijderd";
@@ -61,14 +61,14 @@ $lang["items_quantity"] = "Stock";
 $lang["items_quantity_number"] = "Hoeveelheid moet een cijfer zijn";
 $lang["items_quantity_required"] = "Hoeveelheid moet ingevuld worden";
 $lang["items_receiving_quantity"] = "Aantal per lijn";
-$lang["items_reorder_level"] = "Reorder Level";
+$lang["items_reorder_level"] = "Bestel niveau";
 $lang["items_reorder_level_number"] = "Reorder level moet een cijfer zijn";
 $lang["items_reorder_level_required"] = "Reorder level moet ingevuld worden";
 $lang["items_retrive_item_info"] = "Haal productinformatie op";
 $lang["items_sales_tax_1"] = "VAT";
 $lang["items_sales_tax_2"] = "VAT 2";
 $lang["items_search_custom_items"] = "Doorzoek Tags";
-$lang["items_serialized_items"] = "Serialized Items";
+$lang["items_serialized_items"] = "Artikelen met serienummer";
 $lang["items_stock_location"] = "Stock locatie";
 $lang["items_successful_adding"] = "Product succesvol toegevoegd";
 $lang["items_successful_bulk_edit"] = "Producten werden succesvol bewaard";
@@ -85,8 +85,8 @@ $lang["items_unit_price_number"] = "Verkoopprijs moet een cijfer zijn";
 $lang["items_unit_price_required"] = "Verkoopprijs moet ingevuld worden";
 $lang["items_upc_database"] = "UPC Database";
 $lang["items_update"] = "Bewerk Product";
-$lang["items_use_inventory_menu"] = "Use Inv. Menu";
-$lang["items_import_items_excel"] = "Import items from Excel sheet";
+$lang["items_use_inventory_menu"] = "Gebruik inventaris menu";
+$lang["items_import_items_excel"] = "Importeer artikelen van een Excel sheet";
 $lang["items_select_image"] = "Selecteer Afbeelding";
 $lang["items_change_image"] = "Selecteer Afbeelding";
 $lang["items_remove_image"] = "Verwijder Afbeelding";

application/language/nl-BE/messages_lang.php

@@ -1,14 +1,14 @@
 <?php 
 
 $lang["messages_sms_send"] = "Send SMS";
-$lang["messages_first_name"] = "First name";
-$lang["messages_last_name"] = "Last name";
-$lang["messages_phone"] = "Phone number";
-$lang["messages_phone_placeholder"] = "Mobile Number(s) here...";
-$lang["messages_phone_number_required"] = "Phone number required";
+$lang["messages_first_name"] = "Voornaam";
+$lang["messages_last_name"] = "Achternaam";
+$lang["messages_phone"] = "Telefoonnummer";
+$lang["messages_phone_placeholder"] = "Mobiele nummer(s) hier...";
+$lang["messages_phone_number_required"] = "Telefoonnummer verplicht";
 $lang["messages_message"] = "Message";
-$lang["messages_message_placeholder"] = "Your Message here...";
-$lang["messages_message_required"] = "Message required";
-$lang["messages_multiple_phones"] = "(In case of multiple recipients, enter mobile numbers separated by commas)";
-$lang["messages_successfully_sent"] = "Message successfully sent to: ";
-$lang["messages_unsuccessfully_sent"] = "Message unsuccessfully sent to: ";
+$lang["messages_message_placeholder"] = "Jou bericht hier..";
+$lang["messages_message_required"] = "Bericht verplicht";
+$lang["messages_multiple_phones"] = "(In het geval van meerdere ontvangers, voer de mobiele nummers gescheiden door komma's in)";
+$lang["messages_successfully_sent"] = "Bericht met succes verzonden naar: ";
+$lang["messages_unsuccessfully_sent"] = "Bericht zonder succes verzonden naar: ";

application/language/nl-BE/receivings_lang.php

@@ -22,7 +22,7 @@ $lang["receivings_error_requisition"] = "Kon de stock transfer niet vervolledige
 $lang["receivings_find_or_scan_item"] = "Zoek/Scan Product";
 $lang["receivings_find_or_scan_item_or_receipt"] = "Zoek/Scan Product OF Tickets";
 $lang["receivings_id"] = "Ordernummer";
-$lang["receivings_reference"] = "Reference";
+$lang["receivings_reference"] = "Referentie";
 $lang["receivings_item_name"] = "Productnaam";
 $lang["receivings_mode"] = "Order type";
 $lang["receivings_new_supplier"] = "N. Leverancier";
@@ -48,5 +48,5 @@ $lang["receivings_supplier_address"] = "Leverancier Address";
 $lang["receivings_supplier_location"] = "Leverancier Location";
 $lang["receivings_total"] = "Totaal";
 $lang["receivings_unable_to_add_item"] = "Onmogelijk om product aan order toe te voegen";
-$lang["receivings_unsuccessfully_updated"] = "Receiving unsuccessfully updated";
+$lang["receivings_unsuccessfully_updated"] = "Ontvangst niet succesvol bijgewerkt";
 $lang["receivings_update"] = "Bewerk";

application/language/nl-BE/reports_lang.php

@@ -44,14 +44,14 @@ $lang["reports_payment_type"] = "Betaald";
 $lang["reports_payments"] = "Betalingen";
 $lang["reports_payments_summary_report"] = "Overzicht Betalingen";
 $lang["reports_profit"] = "Winst";
-$lang["reports_cost"] = "Cost";
+$lang["reports_cost"] = "Kosten";
 $lang["reports_quantity"] = "Stock";
 $lang["reports_quantity_purchased"] = "Aangekochte Hoeveelheid";
 $lang["reports_received_by"] = "Ontvangen door";
 $lang["reports_receiving_id"] = "";
 $lang["reports_receiving_type"] = "";
 $lang["reports_receivings"] = "Orders";
-$lang["reports_reorder_level"] = "Reorder Level";
+$lang["reports_reorder_level"] = "Bestel niveau";
 $lang["reports_report"] = "Rapport";
 $lang["reports_report_input"] = "Input Rapport";
 $lang["reports_reports"] = "Rapporten";
@@ -69,7 +69,7 @@ $lang["reports_revenue"] = "Inkomsten";
 $lang["reports_sale_id"] = "Ticket°";
 $lang["reports_sale_type"] = "Type";
 $lang["reports_sales"] = "Verkoop";
-$lang["reports_sales_amount"] = "Sales amount";
+$lang["reports_sales_amount"] = "Verkoopbedrag";
 $lang["reports_sales_summary_report"] = "Overzicht Verkoop";
 $lang["reports_serial_number"] = "Nummer";
 $lang["reports_sold_by"] = "Werknemer";
@@ -87,7 +87,7 @@ $lang["reports_taxes"] = "Belastingen";
 $lang["reports_taxes_summary_report"] = "Rapport Overzicht Belastingen";
 $lang["reports_total"] = "Totaal";
 $lang["reports_type"] = "Type";
-$lang["reports_item_count"] = "Filter Item Count";
+$lang["reports_item_count"] = "Filter product aantal";
 $lang["reports_cost_price"] = "Aankoopprijs";
 $lang["reports_unit_price"] = "Verkoopprijs";
 $lang["reports_sub_total_value"] = "Subtotaal";

application/language/nl-BE/sales_lang.php

@@ -18,8 +18,8 @@ $lang["sales_customer"] = "Klant";
 $lang["sales_customer_email"] = "Customer Email";
 $lang["sales_customer_address"] = "Customer Address";
 $lang["sales_customer_location"] = "Customer Location";
-$lang["sales_customer_discount"] = "Discount";
-$lang["sales_customer_total"] = "Total";
+$lang["sales_customer_discount"] = "Korting";
+$lang["sales_customer_total"] = "Totaal";
 $lang["sales_date"] = "Datum";
 $lang["sales_date_required"] = "Gelieve een correcte datum in te vullen";
 $lang["sales_date_type"] = "Er moet een correcte datum ingevuld worden";

application/language/tr/common_lang.php

@@ -49,7 +49,7 @@ $lang["common_view_recent_sales"] = "Yeni satışları göster";
 $lang["common_website"] = "website";
 $lang["common_welcome"] = "Hoşgeldiniz";
 $lang["common_welcome_message"] = "Hoşgeldiniz, devam etmek için aşağıdan bir modül seçiniz!";
-$lang["common_you_are_using_ospos"] = "You are using Open Source Point Of Sale Version";
+$lang["common_you_are_using_ospos"] = "Kullandığınız Open Source Point Of Sale sürümü";
 $lang["common_zip"] = "Şehir Kodu";
 $lang["common_import"] = "Aktar";
 $lang["common_download_import_template"] = "Download Import Excel Template (CSV)";

application/language/tr/config_lang.php

@@ -2,42 +2,42 @@
 
 $lang["config_address"] = "Şirket Adresi";
 $lang["config_address_required"] = "Şirket Adresi zorunlu alandır";
-$lang["config_apostrophe"] = "apostrophe";
-$lang["config_backup_button"] = "Backup";
-$lang["config_backup_database"] = "Backup Database";
-$lang["config_barcode"] = "Barcode";
+$lang["config_apostrophe"] = "kesme imi";
+$lang["config_backup_button"] = "Yedekle";
+$lang["config_backup_database"] = "Veri Tabanını Yedekle";
+$lang["config_barcode"] = "Barkod";
 $lang["config_barcode_company"] = "Şirket Adı";
-$lang["config_barcode_configuration"] = "Barcode Configuration";
-$lang["config_barcode_content"] = "Barcode Content";
-$lang["config_barcode_first_row"] = "Row 1";
-$lang["config_barcode_font"] = "Font";
-$lang["config_barcode_height"] = "Height (px)";
-$lang["config_barcode_id"] = "Item Id/Name";
-$lang["config_barcode_info"] = "Barcode Configuration Information";
-$lang["config_barcode_layout"] = "Barcode Layout";
-$lang["config_barcode_name"] = "Name";
+$lang["config_barcode_configuration"] = "Barkod Yapılandırması";
+$lang["config_barcode_content"] = "Barkod İçeriği";
+$lang["config_barcode_first_row"] = "Satır 1";
+$lang["config_barcode_font"] = "Yazı Tipi";
+$lang["config_barcode_height"] = "Yükseklik (pk)";
+$lang["config_barcode_id"] = "Ürün Id/Adı";
+$lang["config_barcode_info"] = "Barkod Yapılandırma Bilgisi";
+$lang["config_barcode_layout"] = "Barkod Yerleşimi";
+$lang["config_barcode_name"] = "Ad";
 $lang["config_barcode_number"] = "UPC/EAN/ISBN";
 $lang["config_barcode_number_in_row"] = "Number in row";
 $lang["config_barcode_page_cellspacing"] = "Display page cellspacing";
 $lang["config_barcode_page_width"] = "Display page width";
-$lang["config_barcode_price"] = "Price";
-$lang["config_barcode_quality"] = "Quality (1-100)";
+$lang["config_barcode_price"] = "Fiyat";
+$lang["config_barcode_quality"] = "Kalite (1-100)";
 $lang["config_barcode_second_row"] = "Row 7";
 $lang["config_barcode_third_row"] = "Row 8";
-$lang["config_barcode_type"] = "Barcode Type";
-$lang["config_barcode_width"] = "Width (px)";
-$lang["config_barcode_generate_if_empty"] = "Generate if empty";
-$lang["config_bottom"] = "Bottom";
-$lang["config_center"] = "Center";
+$lang["config_barcode_type"] = "Barkod Türü";
+$lang["config_barcode_width"] = "Genişlik (pk)";
+$lang["config_barcode_generate_if_empty"] = "Boş ise oluştur";
+$lang["config_bottom"] = "Dip";
+$lang["config_center"] = "Orta";
 $lang["config_company"] = "Şirket Adı";
-$lang["config_company_logo"] = "Company Logo";
-$lang["config_company_select_image"] = "Select Image";
-$lang["config_company_change_image"] = "Change Image";
-$lang["config_company_remove_image"] = "Remove Image";
+$lang["config_company_logo"] = "Şirket Logosu";
+$lang["config_company_select_image"] = "Görüntü Seç";
+$lang["config_company_change_image"] = "Görüntüyü Değiştir";
+$lang["config_company_remove_image"] = "Görüntüyü Kaldır";
 $lang["config_company_required"] = "Şirket Adı zorunlu alandır";
 $lang["config_company_website_url"] = "website adresi yanlış (http://...)";
-$lang["config_comma"] = "comma";
-$lang["config_country_codes"] = "Country Codes";
+$lang["config_comma"] = "virgül";
+$lang["config_country_codes"] = "Ülke Kodları";
 $lang["config_country_codes_tooltip"] = "Comma separated list of country codes for nominatim address lookup.";
 $lang["config_currency_symbol"] = "Para Birimi";
 $lang["config_currency_decimals"] = "Currency Decimals";
@@ -51,82 +51,82 @@ $lang["config_custom7"] = "Özel Alan 7";
 $lang["config_custom8"] = "Özel Alan 8";
 $lang["config_custom9"] = "Özel Alan 9";
 $lang["config_custom10"] = "Özel Alan 10";
-$lang["config_datetimeformat"] = "Date and Time format";
+$lang["config_datetimeformat"] = "Tarih ve Zaman biçimi";
 $lang["config_decimal_point"] = " Decimal Point";
-$lang["config_default_barcode_font_size_number"] = "The default barcode font size must be a number";
-$lang["config_default_barcode_font_size_required"] = "The default barcode font size is a required field";
-$lang["config_default_barcode_height_number"] = "The default barcode height  must be a number";
-$lang["config_default_barcode_height_required"] = "The default barcode height is a required field";
+$lang["config_default_barcode_font_size_number"] = "Ön tanımlı barkod yazı tipi boyutu bir numara olmalıdır";
+$lang["config_default_barcode_font_size_required"] = "Ön tanımlı barkod yazı tipi boyutu alanı gereklidir";
+$lang["config_default_barcode_height_number"] = "Ön tanımlı barkod yüksekliği bir sayı olmalıdır";
+$lang["config_default_barcode_height_required"] = "Ön tanımlı barkod yüksekliği zorunlu bir alandır";
 $lang["config_default_barcode_num_in_row_number"] = "The default barcode num in row must be a number";
 $lang["config_default_barcode_num_in_row_required"] = "The default barcode num in row is a required field";
 $lang["config_default_barcode_page_cellspacing_number"] = "The default barcode page cellspacing must be a number";
 $lang["config_default_barcode_page_cellspacing_required"] = "The default barcode page cellspacing is a required field";
-$lang["config_default_barcode_page_width_number"] = "The default barcode page width must be a number";
-$lang["config_default_barcode_page_width_required"] = "The default barcode page width is a required field";
-$lang["config_default_barcode_quality_number"] = "The default barcode quality must be a number";
-$lang["config_default_barcode_quality_required"] = "The default barcode quality is a required field";
-$lang["config_default_barcode_width_number"] = "The default barcode width must be a number";
-$lang["config_default_barcode_width_required"] = "The default barcode width is a required field";
-$lang["config_default_sales_discount"] = "Default Sales Discount %";
-$lang["config_default_sales_discount_number"] = "The default sales discount must be a number";
-$lang["config_default_sales_discount_required"] = "The default sales discount is a required field";
+$lang["config_default_barcode_page_width_number"] = "Ön tanımlı barkod sayfası genişliği bir sayı olmalıdır";
+$lang["config_default_barcode_page_width_required"] = "Ön tanımlı barkod sayfası genişliği zorunlu bir alandır";
+$lang["config_default_barcode_quality_number"] = "Ön tanımlı barkod kalitesi bir sayı olmalıdır";
+$lang["config_default_barcode_quality_required"] = "Ön tanımlı barkod kalitesi zorunlu bir alandır";
+$lang["config_default_barcode_width_number"] = "Ön tanımlı barkod genişliği bir sayı olmalıdır";
+$lang["config_default_barcode_width_required"] = "Ön tanımlı barkod genişliği zorunlu bir alandır.";
+$lang["config_default_sales_discount"] = "Ön Tanımlı Satış İskontosu %";
+$lang["config_default_sales_discount_number"] = "Ön tanımlı satış iskontosu bir sayı olmalıdır";
+$lang["config_default_sales_discount_required"] = "Ön tanımlı satış iskontosu zorunlu bir alandır";
 $lang["config_default_tax_rate"] = "Varsayılan Vergi Oranı %";
 $lang["config_default_tax_rate_1"] = "Vergi Oranı 1";
 $lang["config_default_tax_rate_2"] = "Vergi Oranı 2";
 $lang["config_default_tax_rate_number"] = "Varsayılan Vergi Oranı sayı olmalıdır";
 $lang["config_default_tax_rate_required"] = "Varsayılan Vergi Oranı zorunlu alandır";
-$lang["config_default_tax_name_required"] = "The default tax name is a required field";
-$lang["config_dot"] = "dot";
-$lang["config_email"] = "Email";
+$lang["config_default_tax_name_required"] = "Ön tanımlı vergi adı zorunlu bir alandır";
+$lang["config_dot"] = "nokta";
+$lang["config_email"] = "E-posta";
 $lang["config_email_configuration"] = "Email Configuration";
 $lang["config_email_protocol"] = "Protocol";
-$lang["config_email_mailpath"] = "Path to Sendmail";
-$lang["config_email_smtp_host"] = "SMTP Server";
-$lang["config_email_smtp_port"] = "SMTP Port";
-$lang["config_email_smtp_crypto"] = "SMTP Encryption";
-$lang["config_email_smtp_timeout"] = "SMTP Timeout (s)";
-$lang["config_email_smtp_user"] = "SMTP Username";
-$lang["config_email_smtp_pass"] = "SMTP Password";
+$lang["config_email_mailpath"] = "Sendmail yolu";
+$lang["config_email_smtp_host"] = "SMTP Sunucusu";
+$lang["config_email_smtp_port"] = "SMTP Bağlantı Noktası";
+$lang["config_email_smtp_crypto"] = "SMTP Şifreleme";
+$lang["config_email_smtp_timeout"] = "SMTP Zaman Aşım(lar)ı";
+$lang["config_email_smtp_user"] = "SMTP Kullanıcı Adı";
+$lang["config_email_smtp_pass"] = "SMTP Parola";
 $lang["config_fax"] = "Faks";
 $lang["config_general"] = "General";
 $lang["config_general_configuration"] = "General Configuration";
 $lang["config_info"] = "Mağaza yapılandırma bilgisi";
 $lang["config_info_configuration"] = "Mağaza yapılandırma bilgisi";
-$lang["config_invoice"] = "Invoice";
-$lang["config_invoice_configuration"] = "Invoice Print Settings";
-$lang["config_invoice_default_comments"] = "Default Invoice Comments";
-$lang["config_invoice_enable"] = "Enable Invoicing";
-$lang["config_invoice_email_message"] = "Invoice Email Template";
-$lang["config_invoice_printer"] = "Invoice Printer";
-$lang["config_jsprintsetup_required"] = "Warning! This disabled functionality will only work if you have the FireFox jsPrintSetup addon installed. Save anyway?";
+$lang["config_invoice"] = "Fatura";
+$lang["config_invoice_configuration"] = "Fatura Yazdırma Ayarları";
+$lang["config_invoice_default_comments"] = "Ön Tanımlı Fatura Yorumları";
+$lang["config_invoice_enable"] = "Faturalandırmayı Etkinleştir";
+$lang["config_invoice_email_message"] = "Fatura E-Posta Şablonu";
+$lang["config_invoice_printer"] = "Fatura Yazıcısı";
+$lang["config_jsprintsetup_required"] = "Uyarı! Bu devre dışı işlev yalnızca FireFox jsPrintSetup eklentisi yüklü ise çalışacaktır. Yine de kaydet?";
 $lang["config_language"] = "Dil";
-$lang["config_left"] = "Left";
-$lang["config_license"] = "License";
-$lang["config_license_configuration"] = "License Statement";
-$lang["config_lines_per_page"] = "Lines Per Page";
+$lang["config_left"] = "Sol";
+$lang["config_license"] = "Lisans";
+$lang["config_license_configuration"] = "Lisans Beyanı";
+$lang["config_lines_per_page"] = "Sayfa Başı Satır";
 $lang["config_lines_per_page_number"] = "The lines per page must be a number";
-$lang["config_lines_per_page_required"] = "The lines per page is a required field";
-$lang["config_locale"] = "Localisation";
-$lang["config_locale_configuration"] = "Localisation Configuration";
-$lang["config_locale_info"] = "Localisation Configuration Information";
-$lang["config_location"] = "Stock";
-$lang["config_location_configuration"] = "Stock Locations";
-$lang["config_location_info"] = "Location Configuration Information";
+$lang["config_lines_per_page_required"] = "Sayfa başı satır zorunlu bir alandır";
+$lang["config_locale"] = "Yerelleştirme";
+$lang["config_locale_configuration"] = "Yerelleştirme Yapılandırması";
+$lang["config_locale_info"] = "Yerelleştirme Yapılandırması Bilgisi";
+$lang["config_location"] = "Stok";
+$lang["config_location_configuration"] = "Stok Konumları";
+$lang["config_location_info"] = "Konum Yapılandırma Bilgisi";
 $lang["config_logout"] = "Don't you want to make a backup before logging out?";
-$lang["config_message"] = "Message";
+$lang["config_message"] = "Mesaj";
 $lang["config_message_configuration"] = "Message Configuration";
-$lang["config_msg_msg"] = "Saved Text Message";
-$lang["config_msg_msg_placeholder"] = "If you wish to use a SMS template save your message here. Otherwise leave the box blank.";
-$lang["config_msg_uid"] = "SMS-API Username";
-$lang["config_msg_uid_required"] = "SMS-API Username is a required field";
+$lang["config_msg_msg"] = "Kaydedilen Metin İletisi";
+$lang["config_msg_msg_placeholder"] = "Eğer bir SMS şablonu kullanmak isterseniz iletinizi buraya kaydediniz. Ya da kutuyu boş bırakınız.";
+$lang["config_msg_uid"] = "SMS-API Kullanıcı Adı";
+$lang["config_msg_uid_required"] = "SMS-API Kullanıcı Adı zorunlu bir alandır";
 $lang["config_msg_pwd"] = "SMS-API Password";
-$lang["config_msg_pwd_required"] = "SMS-API Password is a required field";
-$lang["config_msg_src"] = "SMS-API Sender ID";
-$lang["config_msg_src_required"] = "SMS-API Sender ID is a required field";
+$lang["config_msg_pwd_required"] = "SMS-API Parola zorunlu bir alandır";
+$lang["config_msg_src"] = "SMS-API Gönderici Kimliği";
+$lang["config_msg_src_required"] = "SMS-API Gönderici Kimliği zorunlu bir alandır";
 $lang["config_none"] = "none";
-$lang["config_notify_alignment"] = "Notification Popup Position";
+$lang["config_notify_alignment"] = "Bildirim Balonu Konumu";
 $lang["config_number_format"] = "Number Format";
-$lang["config_payment_options_order"] = "Payment Options Order";
+$lang["config_payment_options_order"] = "Ödeme Seçenekleri Sırası";
 $lang["config_phone"] = "Şirket Telefonu";
 $lang["config_phone_required"] = "Şirket Telefonu zorunlu alandır";
 $lang["config_print_bottom_margin"] = "Margin Bottom";
@@ -145,40 +145,40 @@ $lang["config_print_top_margin"] = "Margin Top";
 $lang["config_print_top_margin_number"] = "The default top margin must be a number";
 $lang["config_print_top_margin_required"] = "The default top margin is a required field";
 $lang["config_quantity_decimals"] = "Quantity Decimals";
-$lang["config_receipt"] = "Receipt";
-$lang["config_receipt_configuration"] = "Receipt Print Settings";
-$lang["config_receipt_info"] = "Receipt Configuration Information";
-$lang["config_receipt_printer"] = "Ticket Printer";
-$lang["config_receipt_show_taxes"] = "Show Taxes";
-$lang["config_receipt_show_total_discount"] = "Show Total Discount";
-$lang["config_receipt_show_description"] = "Show Description";
-$lang["config_receipt_show_serialnumber"] = "Show Serial Number";
-$lang["config_receipt_template"] = "Receipt Template";
+$lang["config_receipt"] = "Fiş";
+$lang["config_receipt_configuration"] = "Fiş Yazdırma Ayarları";
+$lang["config_receipt_info"] = "Fiş Yapılandırma Bilgisi";
+$lang["config_receipt_printer"] = "Fiş Yazıcısı";
+$lang["config_receipt_show_taxes"] = "Vergileri Göster";
+$lang["config_receipt_show_total_discount"] = "Toplam İskontoyu Göster";
+$lang["config_receipt_show_description"] = "Açıklamayı Göster";
+$lang["config_receipt_show_serialnumber"] = "Seri Numarasını Göster";
+$lang["config_receipt_template"] = "Fiş Şablonu";
 $lang["config_receipt_default"] = "Default";
-$lang["config_receipt_short"] = "Short";
+$lang["config_receipt_short"] = "Kısa";
 $lang["config_receiving_calculate_average_price"] = "Calc avg. Price (Receiving)";
 $lang["config_recv_invoice_format"] = "Receivings Invoice Format";
 $lang["config_return_policy_required"] = "İade Politikası zorunlu alandır";
-$lang["config_right"] = "Right";
+$lang["config_right"] = "Sağ";
 $lang["config_sales_invoice_format"] = "Sales Invoice Format";
 $lang["config_saved_successfully"] = "Yapılandırma kaydedildi";
 $lang["config_saved_unsuccessfully"] = "Yapılandırma kaydedilemedi";
-$lang["config_statistics"] = "Send statistics";
-$lang["config_statistics_tooltip"] = "Send statistics for development and feature improvement purposes";
+$lang["config_statistics"] = "İstatistik gönder";
+$lang["config_statistics_tooltip"] = "Geliştirme ve özellik iyileştirme amaçları için istatistik gönder";
 $lang["config_stock_location"] = "Mağaza Yeri";
-$lang["config_stock_location_duplicate"] = "Please use an unique location name";
-$lang["config_stock_location_invalid_chars"] = "The stock location name can not contain '_'";
+$lang["config_stock_location_duplicate"] = "Lütfen benzersiz bir yer adı kullan";
+$lang["config_stock_location_invalid_chars"] = "Mağaza yeri adı '_' içeremez";
 $lang["config_stock_location_required"] = "Mağaza Yeri numarası zorunlu alandır";
-$lang["config_takings_printer"] = "Takings Printer";
+$lang["config_takings_printer"] = "Hasılat Yazıcısı";
 $lang["config_tax_decimals"] = "Tax Decimals";
-$lang["config_tax_included"] = "Tax Included";
+$lang["config_tax_included"] = "Vergi Dahil";
 $lang["config_thousands_separator"] = "Thousands Separator";
 $lang["config_timezone"] = "Saat Dilimi";
-$lang["config_top"] = "Top";
+$lang["config_top"] = "Üst";
 $lang["config_website"] = "Website";
 $lang["config_number_locale"] = "Localisation";
 $lang["config_return_policy_required"] = "İade Politikası zorunlu alandır";
 $lang["config_number_locale_required"] = "Number Locale is a required field";
-$lang["config_number_locale_invalid"] = "The entered locale is invalid. Check the link in the tooltip to find a sensible value";
-$lang["config_number_locale_tooltip"] = "Find a suitable locale through this link";
-$lang["config_theme"] = "Theme";
+$lang["config_number_locale_invalid"] = "Girilen yerel ayar kodu geçersiz. Makul bir değer bulmak için araç ipucunda bulunan bağlantıya bakın";
+$lang["config_number_locale_tooltip"] = "Bu bağlantı üzerinden yerel ayar kodunu bul";
+$lang["config_theme"] = "Gövde";

application/language/tr/customers_lang.php

@@ -21,4 +21,4 @@ $lang["customers_import_items_excel"] = "Müşterileri Excel sayfasından aktar"
 $lang["customers_excel_import_failed"] = "Excel aktarım hatası";
 $lang["customers_excel_import_nodata_wrongformat"] = "Yüklenen dosya herhangi bir veri içermiyor veya hatalı formatta";
 $lang["customers_excel_import_success"] = "Müşteri aktarımı başarılı";
-$lang["customers_excel_import_partially_failed"] = "Most Customers imported. But some were not, here is the list";
+$lang["customers_excel_import_partially_failed"] = "Birçok Müşteri içe aktarıldı. Ama bazıları değil, listesi burada";

application/language/tr/datepicker_lang.php

@@ -8,14 +8,14 @@ $lang["datepicker_last_30"] = "Son 30 Gün";
 $lang["datepicker_last_month"] = "Geçen Ay";
 $lang["datepicker_last_year"] = "Geçen Yıl";
 $lang["datepicker_this_month"] = "Bu Ay";
-$lang["datepicker_this_month_last_year"] = "Same Month Last Year";
-$lang["datepicker_same_month_to_today"] = "This Month To Today";
-$lang["datepicker_same_month_to_same_day_last_year"] = "Same Month To Same Day Last Year";
+$lang["datepicker_this_month_last_year"] = "Geçen Sene Aynı Ay";
+$lang["datepicker_same_month_to_today"] = "Bu Aydan Bugüne";
+$lang["datepicker_same_month_to_same_day_last_year"] = "Geçen Sene Aynı Aydan Aynı Güne";
 $lang["datepicker_this_year"] = "Bu Yıl";
-$lang["datepicker_today_last_year"] = "Today Last Year";
+$lang["datepicker_today_last_year"] = "Geçen Yıl Bugün";
 $lang["datepicker_yesterday"] = "Dün";
-$lang["datepicker_apply"] = "Apply";
-$lang["datepicker_cancel"] = "Cancel";
+$lang["datepicker_apply"] = "Uygula";
+$lang["datepicker_cancel"] = "İptal Et";
 $lang["datepicker_from"] = "From";
 $lang["datepicker_to"] = "To";
-$lang["datepicker_custom"] = "Custom";
+$lang["datepicker_custom"] = "Özel";

application/language/tr/giftcards_lang.php

@@ -18,52 +18,52 @@ $lang["giftcards_confirm_delete"] = "Seçili Hediye Çeklerini silmek istediğin
 $lang["giftcards_cost_price"] = "Maliyet Fiyatı";
 $lang["giftcards_count"] = "Stoğu Güncelle";
 $lang["giftcards_current_quantity"] = "Mevcut Miktar";
-$lang["giftcards_description"] = "Description";
-$lang["giftcards_details_count"] = "Inventory Count Details";
-$lang["giftcards_do_nothing"] = "Do Nothing";
-$lang["giftcards_edit_fields_you_want_to_update"] = "Edit the fields you want to edit for ALL selected giftcards";
-$lang["giftcards_edit_multiple_giftcards"] = "Editing Multiple Giftcards";
-$lang["giftcards_error_adding_updating"] = "Error adding/updating giftcard";
-$lang["giftcards_error_updating_multiple"] = "Error updating giftcards";
-$lang["giftcards_excel_import_failed"] = "Excel import failed";
-$lang["giftcards_generate_barcodes"] = "Generate Barcodes";
-$lang["giftcards_giftcard"] = "Giftcard";
-$lang["giftcards_giftcard_number"] = "Giftcard Number";
-$lang["giftcards_info_provided_by"] = "Info provided by";
-$lang["giftcards_inventory_comments"] = "Comments";
-$lang["giftcards_is_serialized"] = "Giftcard has Serial Number";
+$lang["giftcards_description"] = "Tanım";
+$lang["giftcards_details_count"] = "Stok Sayım Ayrıntıları";
+$lang["giftcards_do_nothing"] = "Bir Şey Yapma";
+$lang["giftcards_edit_fields_you_want_to_update"] = "TÜM seçili hediye çekleri için düzenlemek istediğiniz alanları düzenleyin";
+$lang["giftcards_edit_multiple_giftcards"] = "Çoklu Hediye Çeki Düzenleme";
+$lang["giftcards_error_adding_updating"] = "Hediye çeki ekleme/güncelleme hatası";
+$lang["giftcards_error_updating_multiple"] = "Hediye çeki güncellemesinde hata";
+$lang["giftcards_excel_import_failed"] = "Excel içe aktarma başarısız";
+$lang["giftcards_generate_barcodes"] = "Barkod Oluştur";
+$lang["giftcards_giftcard"] = "Hediye Çeki";
+$lang["giftcards_giftcard_number"] = "Hediye Çeki Numarası";
+$lang["giftcards_info_provided_by"] = "Bilgi sağlayan";
+$lang["giftcards_inventory_comments"] = "Yorumlar";
+$lang["giftcards_is_serialized"] = "Hediye Çekinin Seri Numarası var";
 $lang["giftcards_low_inventory_giftcards"] = "Low Inventory Giftcards";
-$lang["giftcards_manually_editing_of_quantity"] = "Manual Edit of Quantity";
-$lang["giftcards_must_select_giftcard_for_barcode"] = "You must select at least 1 giftcard to generate barcodes";
-$lang["giftcards_new"] = "New Giftcard";
+$lang["giftcards_manually_editing_of_quantity"] = "Elle Adet Düzeltme";
+$lang["giftcards_must_select_giftcard_for_barcode"] = "Barkod oluşturmak için en az 1 hediye çeki seçmelisiniz";
+$lang["giftcards_new"] = "Yeni Hediye Çeki";
 $lang["giftcards_no_description_giftcards"] = "No Description Giftcards";
-$lang["giftcards_no_giftcards_to_display"] = "No Giftcards to display";
-$lang["giftcards_none"] = "None";
-$lang["giftcards_none_selected"] = "You have not selected any giftcards to edit";
-$lang["giftcards_number"] = "Giftcard Number must be a number";
+$lang["giftcards_no_giftcards_to_display"] = "Gösterilecek Hediye Çeki yok";
+$lang["giftcards_none"] = "Hiçbiri";
+$lang["giftcards_none_selected"] = "Düzenlemek için herhangi bir hediye çeki seçmediniz";
+$lang["giftcards_number"] = "Hediye Çekşi Numarası bir numara olmalıdır";
 $lang["giftcards_number_information"] = "Giftcard Number";
-$lang["giftcards_number_required"] = "Giftcard Number is a required field";
-$lang["giftcards_one_or_multiple"] = "giftcard(s)";
-$lang["giftcards_person_id"] = "Customer";
-$lang["giftcards_quantity"] = "Quantity";
-$lang["giftcards_quantity_required"] = "Quantity is a required field. Please Close ( X ) to cancel";
-$lang["giftcards_reorder_level"] = "Reorder Level";
-$lang["giftcards_retrive_giftcard_info"] = "Retrieve Giftcard Info";
-$lang["giftcards_sales_tax_1"] = "Sales Tax";
-$lang["giftcards_sales_tax_2"] = "Sales Tax 2";
-$lang["giftcards_serialized_giftcards"] = "Serialized Giftcards";
-$lang["giftcards_successful_adding"] = "You have successfully added giftcard";
-$lang["giftcards_successful_bulk_edit"] = "You have successfully updated the selected giftcards";
-$lang["giftcards_successful_deleted"] = "You have successfully deleted";
-$lang["giftcards_successful_updating"] = "You have successfully updated giftcard";
-$lang["giftcards_supplier"] = "Supplier";
-$lang["giftcards_tax_1"] = "Tax 1";
-$lang["giftcards_tax_2"] = "Tax 2";
-$lang["giftcards_tax_percent"] = "Tax Percent";
-$lang["giftcards_tax_percents"] = "Tax Percent(s)";
-$lang["giftcards_unit_price"] = "Unit Price";
-$lang["giftcards_upc_database"] = "UPC Database";
-$lang["giftcards_update"] = "Update Giftcard";
-$lang["giftcards_use_inventory_menu"] = "Use Inv. Menu";
-$lang["giftcards_value"] = "Giftcard Value must be a number";
-$lang["giftcards_value_required"] = "Giftcard Value is a required field";
+$lang["giftcards_number_required"] = "Hediye Çeki Numarası zorunlu bir alandır";
+$lang["giftcards_one_or_multiple"] = "hediye çek(ler)i";
+$lang["giftcards_person_id"] = "Müşteri";
+$lang["giftcards_quantity"] = "Adet";
+$lang["giftcards_quantity_required"] = "Miktar zorunlu alandır. İptal etmek için Kapat'a ( X ) bas";
+$lang["giftcards_reorder_level"] = "Düşük Stok Düzeyi";
+$lang["giftcards_retrive_giftcard_info"] = "Hediye Çeki Bilgisi Al";
+$lang["giftcards_sales_tax_1"] = "Satış Vergisi";
+$lang["giftcards_sales_tax_2"] = "Satış Vergisi 2";
+$lang["giftcards_serialized_giftcards"] = "Serileştirilmiş Hediye Çekleri";
+$lang["giftcards_successful_adding"] = "Hediye çekini başarıyla eklediniz";
+$lang["giftcards_successful_bulk_edit"] = "Seçili hediye çeklerini başarıyla güncellediniz";
+$lang["giftcards_successful_deleted"] = "Başarıyla sildiniz";
+$lang["giftcards_successful_updating"] = "Hediye çekini başarıyla güncellediniz";
+$lang["giftcards_supplier"] = "Sağlayıcı";
+$lang["giftcards_tax_1"] = "Vergi 1";
+$lang["giftcards_tax_2"] = "Vergi 2";
+$lang["giftcards_tax_percent"] = "Vergi Yüzdesi";
+$lang["giftcards_tax_percents"] = "Vergi Yüzdesi";
+$lang["giftcards_unit_price"] = "Birim Fiyat";
+$lang["giftcards_upc_database"] = "UPC Veri tabanı";
+$lang["giftcards_update"] = "Hediye Çeki Güncelle";
+$lang["giftcards_use_inventory_menu"] = "Stok Menüsünü Kullan";
+$lang["giftcards_value"] = "Hediye Çeki Değeri rakam olmalıdır";
+$lang["giftcards_value_required"] = "Hediye Çeki Değeri zorunlu bir alandır";

application/language/tr/receivings_lang.php

@@ -12,17 +12,17 @@ $lang["receivings_date"] = "";
 $lang["receivings_date_required"] = "";
 $lang["receivings_date_type"] = "";
 $lang["receivings_confirm_delete"] = "";
-$lang["receivings_delete_entire_sale"] = "Delete entire sale";
+$lang["receivings_delete_entire_sale"] = "Satışın tamamını sil";
 $lang["receivings_discount"] = "İndirim %";
 $lang["receivings_edit"] = "Düzenle";
-$lang["receivings_edit_sale"] = "Edit Receiving";
-$lang["receivings_employee"] = "Employee";
+$lang["receivings_edit_sale"] = "Alımı Düzenle";
+$lang["receivings_employee"] = "Personel";
 $lang["receivings_error_editing_item"] = "Ürün düzenleme hatası";
 $lang["receivings_error_requisition"] = "Ürün aynı yere taşınamaz";
 $lang["receivings_find_or_scan_item"] = "Ürün Bul/Oku";
 $lang["receivings_find_or_scan_item_or_receipt"] = "Ürün yada Fatura Bul/Oku";
 $lang["receivings_id"] = "Alım No";
-$lang["receivings_reference"] = "Reference";
+$lang["receivings_reference"] = "Referans";
 $lang["receivings_item_name"] = "Ürün Adı";
 $lang["receivings_mode"] = "Alım Türü";
 $lang["receivings_new_supplier"] = "Yeni Sağlayıcı";
@@ -40,13 +40,13 @@ $lang["receivings_start_typing_supplier_name"] = "Sağlayıcı Adı...";
 $lang["receivings_stock_destination"] = "Stok hedefi";
 $lang["receivings_stock_locaiton"] = "Stok yeri";
 $lang["receivings_stock_source"] = "Stok kaynağı";
-$lang["receivings_successfully_deleted"] = "You have successfully deleted";
-$lang["receivings_successfully_updated"] = "Receiving successfully updated";
+$lang["receivings_successfully_deleted"] = "Başarıyla sildiniz";
+$lang["receivings_successfully_updated"] = "Alım başarıyla güncellendi";
 $lang["receivings_supplier"] = "Sağlayıcı";
-$lang["receivings_supplier_email"] = "Email";
-$lang["receivings_supplier_address"] = "Address";
-$lang["receivings_supplier_location"] = "Location";
+$lang["receivings_supplier_email"] = "E-posta";
+$lang["receivings_supplier_address"] = "Adres";
+$lang["receivings_supplier_location"] = "Yer";
 $lang["receivings_total"] = "Toplam";
 $lang["receivings_unable_to_add_item"] = "Ürünler alıma eklenemedi";
-$lang["receivings_unsuccessfully_updated"] = "Receiving unsuccessfully updated";
+$lang["receivings_unsuccessfully_updated"] = "Alım güncellenemedi";
 $lang["receivings_update"] = "Düzenle";

application/language/tr/reports_lang.php

@@ -91,7 +91,7 @@ $lang["reports_item_count"] = "Filter Stok Habis/Belum Habis/Minus";
 $lang["reports_cost_price"] = "Maliyet Fiyatı";
 $lang["reports_unit_price"] = "Satış Fiyatı";
 $lang["reports_sub_total_value"] = "Ara Toplam";
-$lang["reports_total_inventory_value"] = "Total Inventory Value";
-$lang["reports_zero_and_less"] = "Zero and less";
-$lang["reports_more_than_zero"] = "More than zero";
+$lang["reports_total_inventory_value"] = "Toplam Stok Değeri";
+$lang["reports_zero_and_less"] = "Sıfır ve sıfırdan az";
+$lang["reports_more_than_zero"] = "Sıfırdan fazla";
 $lang["reports_no_reports_to_display"] = "Gösterecek Ürün Yok";

application/language/tr/sales_lang.php

@@ -12,17 +12,17 @@ $lang["sales_comment"] = "Yorum";
 $lang["sales_comments"] = "Yorumlar";
 $lang["sales_complete_sale"] = "Satışı Tamamla";
 $lang["sales_confirm_cancel_sale"] = "Bu satışı iptal etmek istiyor musunuz? Tüm ürünler çıkarılacak.";
-$lang["sales_confirm_delete"] = "Are you sure you want to delete the selected sales?";
+$lang["sales_confirm_delete"] = "Seçilen satışları silmek istediğinize emin misiniz?";
 $lang["sales_credit"] = "Kredi Kartı";
 $lang["sales_customer"] = "Müşteri";
 $lang["sales_customer_email"] = "Customer Email";
 $lang["sales_customer_address"] = "Customer Address";
 $lang["sales_customer_location"] = "Customer Location";
-$lang["sales_customer_discount"] = "Discount";
+$lang["sales_customer_discount"] = "İskonto";
 $lang["sales_customer_total"] = "Total";
 $lang["sales_date"] = "Satış Tarihi";
-$lang["sales_date_required"] = "A correct date needs to be filled in";
-$lang["sales_date_type"] = "Date field is required";
+$lang["sales_date_required"] = "Doğru tarih girilmelidir";
+$lang["sales_date_type"] = "Tarih alanı zorunludur";
 $lang["sales_debit"] = "Banka Kartı";
 $lang["sales_delete_confirmation"] = "Satışı silmek istediğinize emin misiniz, bu işlem geri alınamaz";
 $lang["sales_delete_entire_sale"] = "Satışın tamamını sil";
@@ -30,7 +30,7 @@ $lang["sales_delete_successful"] = "Satışı sildiniz";
 $lang["sales_delete_unsuccessful"] = "Satışı silemediniz";
 $lang["sales_description_abbrv"] = "Tanım";
 $lang["sales_discount"] = "İndirim %";
-$lang["sales_discount_included"] = "% Discount";
+$lang["sales_discount_included"] = "% İskonto";
 $lang["sales_discount"] = "Discount";
 $lang["sales_discount_short"] = "%";
 $lang["sales_edit"] = "Düzenle";
@@ -42,17 +42,17 @@ $lang["sales_error_editing_item"] = "Ürün düzenleme hatası";
 $lang["sales_find_or_scan_item"] = "Ürün Bul/Oku";
 $lang["sales_find_or_scan_item_or_receipt"] = "Ürün yada Fatura Bul/Oku";
 $lang["sales_giftcard"] = "Hediye Çeki";
-$lang["sales_giftcard_balance"] = "Giftcard Balance";
+$lang["sales_giftcard_balance"] = "Hediye Çeki Bakiyesi";
 $lang["sales_giftcard_number"] = "Hediye Çeki No";
 $lang["sales_id"] = "Satış No";
-$lang["sales_invoice"] = "Invoice";
+$lang["sales_invoice"] = "Fatura";
 $lang["sales_invoice_confirm"] = "This invoice will be sent to";
-$lang["sales_invoice_enable"] = "Create Invoice";
-$lang["sales_invoice_filter"] = "Invoices";
-$lang["sales_cash_filter"] = "Cash";
-$lang["sales_invoice_no_email"] = "This customer does not have a valid email address";
-$lang["sales_invoice_number"] = "Invoice #";
-$lang["sales_invoice_number_duplicate"] = "Please enter an unique invoice number";
+$lang["sales_invoice_enable"] = "Fatura Oluştur";
+$lang["sales_invoice_filter"] = "Faturalar";
+$lang["sales_cash_filter"] = "Nakit";
+$lang["sales_invoice_no_email"] = "Bu müşteri geçerli bir e-posta adresine sahip değil";
+$lang["sales_invoice_number"] = "Fatura #";
+$lang["sales_invoice_number_duplicate"] = "Lütfen benzersiz bir fatura numarası giriniz";
 $lang["sales_invoice_sent"] = "Invoice sent to";
 $lang["sales_invoice_unsent"] = "Invoice failed to be sent to";
 $lang["sales_invoice_update"] = "Recount";
@@ -65,12 +65,12 @@ $lang["sales_must_enter_numeric"] = "Ödenen tutar sayı olmalıdır";
 $lang["sales_must_enter_numeric_giftcard"] = "Hediye çeki numarası için sayı girmelisiniz";
 $lang["sales_new_customer"] = "Yeni Müşteri";
 $lang["sales_new_item"] = "Yeni Ürün";
-$lang["sales_no_description"] = "None";
+$lang["sales_no_description"] = "Hiçbiri";
 $lang["sales_no_filter"] = "Tümü";
 $lang["sales_no_items_in_cart"] = "Sepette Ürün Yok";
-$lang["sales_no_sales_to_display"] = "No sales to display";
+$lang["sales_no_sales_to_display"] = "Gösterilecek satış yok";
 $lang["sales_one_or_multiple"] = "";
-$lang["sales_takings"] = "Takings";
+$lang["sales_takings"] = "Hasılat";
 $lang["sales_payment"] = "Ödeme Türü";
 $lang["sales_payment_amount"] = "Tutar";
 $lang["sales_payment_not_cover_total"] = "Ödemeler toplam tutarı karşılamıyor";
@@ -92,11 +92,11 @@ $lang["sales_sale"] = "Satış";
 $lang["sales_sale_for_customer"] = "Müşteri:";
 $lang["sales_sale_time"] = "Saat";
 $lang["sales_select_customer"] = "Müşteri Seç (İsteğe Bağlı)";
-$lang["sales_send_invoice"] = "Send Invoice";
-$lang["sales_send_receipt"] = "Send Receipt";
+$lang["sales_send_invoice"] = "Fatura Gönder";
+$lang["sales_send_receipt"] = "Fiş Gönder";
 $lang["sales_serial"] = "Seri";
-$lang["sales_show_invoice"] = "Show Invoice";
-$lang["sales_show_receipt"] = "Show Receipt";
+$lang["sales_show_invoice"] = "Faturayı Göster";
+$lang["sales_show_receipt"] = "Makbuzu Göster";
 $lang["sales_start_typing_customer_name"] = "Müşteri Adı...";
 $lang["sales_start_typing_item_name"] = "Ürün adı yazın yada barkod okutun...";
 $lang["sales_stock_location"] = "Stok yeri";
@@ -110,7 +110,7 @@ $lang["sales_suspended_sales"] = "Askıdaki Satışlar";
 $lang["sales_tax"] = "Vergi";
 $lang["sales_tax_percent"] = "Vergi %";
 $lang["sales_total"] = "Toplam";
-$lang["sales_total_tax_exclusive"] = "Tax excluded";
+$lang["sales_total_tax_exclusive"] = "Vergi hariç";
 $lang["sales_transaction_failed"] = "Satış işlemi hatası";
 $lang["sales_unable_to_add_item"] = "Ürün satışa eklenemedi";
 $lang["sales_unsuccessfully_deleted"] = "Satış silinemedi";

application/models/Item.php

@@ -70,7 +70,14 @@ class Item extends CI_Model
 			$this->db->where('location_id', $filters['stock_location_id']);
 		}
 
-		$this->db->where('DATE_FORMAT(trans_date, "%Y-%m-%d") BETWEEN ' . $this->db->escape($filters['start_date']) . ' AND ' . $this->db->escape($filters['end_date']));
+		if(empty($this->config->item('date_or_time_format')))
+		{
+			$this->db->where('DATE_FORMAT(trans_date, "%Y-%m-%d") BETWEEN ' . $this->db->escape($filters['start_date']) . ' AND ' . $this->db->escape($filters['end_date']));
+		}
+		else
+		{
+			$this->db->where('trans_date BETWEEN ' . $this->db->escape(rawurldecode($filters['start_date'])) . ' AND ' . $this->db->escape(rawurldecode($filters['end_date'])));
+		}
 
 		if(!empty($search))
 		{

application/models/Receiving.php

@@ -227,7 +227,14 @@ class Receiving extends CI_Model
 	{
 		if(empty($inputs['receiving_id']))
 		{
-			$where = 'WHERE DATE(receiving_time) BETWEEN ' . $this->db->escape($inputs['start_date']) . ' AND ' . $this->db->escape($inputs['end_date']);
+			if(empty($this->config->item('date_or_time_format')))
+			{
+				$where = 'WHERE DATE(receiving_time) BETWEEN ' . $this->db->escape($inputs['start_date']) . ' AND ' . $this->db->escape($inputs['end_date']);
+			}
+			else
+			{
+				$where = 'WHERE receiving_time BETWEEN ' . $this->db->escape(rawurldecode($inputs['start_date'])) . ' AND ' . $this->db->escape(rawurldecode($inputs['end_date']));
+			}
 		}
 		else
 		{
@@ -235,7 +242,7 @@ class Receiving extends CI_Model
 		}
 		
 		$this->db->query('CREATE TEMPORARY TABLE IF NOT EXISTS ' . $this->db->dbprefix('receivings_items_temp') . 
-			' (INDEX(receiving_date), INDEX(receiving_id))
+			' (INDEX(receiving_date), INDEX(receiving_time), INDEX(receiving_id))
 			(
 				SELECT 
 					DATE(receiving_time) AS receiving_date,

application/models/Sale.php

@@ -98,6 +98,15 @@ class Sale extends CI_Model
 	*/
 	public function search($search, $filters, $rows = 0, $limit_from = 0, $sort = 'sale_date', $order = 'desc')
 	{
+		$where = '';
+		if (empty($this->config->item('date_or_time_format')))
+		{
+			$where .= 'WHERE DATE(sales.sale_time) BETWEEN ' . $this->db->escape($filters['start_date']) . ' AND ' . $this->db->escape($filters['end_date']) . ' ';
+		}
+		else
+		{
+			$where .= 'WHERE sales.sale_time BETWEEN ' . $this->db->escape(rawurldecode($filters['start_date'])) . ' AND ' . $this->db->escape(rawurldecode($filters['end_date'])) . ' ';
+		}
 		// NOTE: temporary tables are created to speed up searches due to the fact that are ortogonal to the main query
 		// create a temporary table to contain all the payments per sale item
 		$this->db->query('CREATE TEMPORARY TABLE IF NOT EXISTS ' . $this->db->dbprefix('sales_payments_temp') . 
@@ -109,7 +118,7 @@ class Sale extends CI_Model
 				FROM ' . $this->db->dbprefix('sales_payments') . ' AS payments
 				INNER JOIN ' . $this->db->dbprefix('sales') . ' AS sales
 					ON sales.sale_id = payments.sale_id
-				WHERE DATE(sales.sale_time) BETWEEN ' . $this->db->escape($filters['start_date']) . ' AND ' . $this->db->escape($filters['end_date']) . '
+				' . $where . '
 				GROUP BY sale_id
 			)'
 		);
@@ -126,7 +135,7 @@ class Sale extends CI_Model
 					ON sales.sale_id = sales_items_taxes.sale_id
 				INNER JOIN ' . $this->db->dbprefix('sales_items') . ' AS sales_items
 					ON sales_items.sale_id = sales_items_taxes.sale_id AND sales_items.line = sales_items_taxes.line
-				WHERE DATE(sales.sale_time) BETWEEN ' . $this->db->escape($filters['start_date']) . ' AND ' . $this->db->escape($filters['end_date']) . '
+				' . $where . '
 				GROUP BY sales_items_taxes.sale_id, sales_items_taxes.item_id
 			)'
 		);
@@ -176,7 +185,14 @@ class Sale extends CI_Model
 		$this->db->join('sales_payments_temp AS payments', 'sales.sale_id = payments.sale_id', 'left outer');
 		$this->db->join('sales_items_taxes_temp AS sales_items_taxes', 'sales_items.sale_id = sales_items_taxes.sale_id AND sales_items.item_id = sales_items_taxes.item_id', 'left outer');
 
-		$this->db->where('DATE(sales.sale_time) BETWEEN ' . $this->db->escape($filters['start_date']) . ' AND ' . $this->db->escape($filters['end_date']));
+		if (empty($this->config->item('date_or_time_format')))
+		{
+			$this->db->where('DATE(sales.sale_time) BETWEEN ' . $this->db->escape($filters['start_date']) . ' AND ' . $this->db->escape($filters['end_date']));
+		}
+		else
+		{
+			$this->db->where('sales.sale_time BETWEEN ' . $this->db->escape(rawurldecode($filters['start_date'])) . ' AND ' . $this->db->escape(rawurldecode($filters['end_date'])));
+		}
 
 		if(!empty($search))
 		{
@@ -245,12 +261,19 @@ class Sale extends CI_Model
 	{
 		// get payment summary
 		$this->db->select('payment_type, count(*) AS count, SUM(payment_amount) AS payment_amount');
-		$this->db->from('sales');
+		$this->db->from('sales AS sales');
 		$this->db->join('sales_payments', 'sales_payments.sale_id = sales.sale_id');
 		$this->db->join('people AS customer_p', 'sales.customer_id = customer_p.person_id', 'left');
 		$this->db->join('customers AS customer', 'sales.customer_id = customer.person_id', 'left');
 
-		$this->db->where('DATE(sale_time) BETWEEN ' . $this->db->escape($filters['start_date']) . ' AND ' . $this->db->escape($filters['end_date']));
+		if (empty($this->config->item('date_or_time_format')))
+		{
+			$this->db->where('DATE(sales.sale_time) BETWEEN ' . $this->db->escape($filters['start_date']) . ' AND ' . $this->db->escape($filters['end_date']));
+		}
+		else
+		{
+			$this->db->where('sales.sale_time BETWEEN ' . $this->db->escape(rawurldecode($filters['start_date'])) . ' AND ' . $this->db->escape(rawurldecode($filters['end_date'])));
+		}
 
 		if(!empty($search))
 		{
@@ -735,7 +758,14 @@ class Sale extends CI_Model
 
 		if(empty($inputs['sale_id']))
 		{
-			$where = 'WHERE DATE(sales.sale_time) BETWEEN ' . $this->db->escape($inputs['start_date']) . ' AND ' . $this->db->escape($inputs['end_date']);
+			if(empty($this->config->item('date_or_time_format')))
+			{
+				$where = 'WHERE DATE(sales.sale_time) BETWEEN ' . $this->db->escape($inputs['start_date']) . ' AND ' . $this->db->escape($inputs['end_date']);
+			}
+			else
+			{
+				$where = 'WHERE sales.sale_time BETWEEN ' . $this->db->escape(rawurldecode($inputs['start_date'])) . ' AND ' . $this->db->escape(rawurldecode($inputs['end_date']));
+			}
 		}
 		else
 		{
@@ -760,7 +790,7 @@ class Sale extends CI_Model
 		);
 
 		$this->db->query('CREATE TEMPORARY TABLE IF NOT EXISTS ' . $this->db->dbprefix('sales_items_temp') . 
-			' (INDEX(sale_date), INDEX(sale_id))
+			' (INDEX(sale_date), INDEX(sale_time), INDEX(sale_id))
 			(
 				SELECT
 					DATE(sales.sale_time) AS sale_date,

application/models/reports/Detailed_receivings.php

@@ -23,7 +23,7 @@ class Detailed_receivings extends Report
 				array('receiving_date' => $this->lang->line('reports_date')),
 				array('quantity' => $this->lang->line('reports_quantity')),
 				array('employee_name' => $this->lang->line('reports_received_by')),
-				array('supplier' => $this->lang->line('reports_supplied_by')),
+				array('supplier_name' => $this->lang->line('reports_supplied_by')),
 				array('total' => $this->lang->line('reports_total'), 'sorter' => 'number_sorter'),
 				array('payment_type' => $this->lang->line('reports_payment_type')),
 				array('reference' => $this->lang->line('receivings_reference')),
@@ -118,4 +118,4 @@ class Detailed_receivings extends Report
 		return $this->db->get()->row_array();
 	}
 }
-?>
+?>

application/models/reports/Detailed_sales.php

@@ -66,13 +66,13 @@ class Detailed_sales extends Report
 		}
 
 		if($inputs['sale_type'] == 'sales')
-        {
-            $this->db->where('quantity_purchased > 0');
-        }
-        elseif($inputs['sale_type'] == 'returns')
-        {
-            $this->db->where('quantity_purchased < 0');
-        }
+		{
+			$this->db->where('quantity_purchased > 0');
+		}
+		elseif($inputs['sale_type'] == 'returns')
+		{
+			$this->db->where('quantity_purchased < 0');
+		}
 
 		$this->db->group_by('sale_id');
 		$this->db->order_by('sale_date');
@@ -103,15 +103,15 @@ class Detailed_sales extends Report
 		}
 
 		if($inputs['sale_type'] == 'sales')
-        {
-            $this->db->where('quantity_purchased > 0');
-        }
-        elseif($inputs['sale_type'] == 'returns')
-        {
-            $this->db->where('quantity_purchased < 0');
-        }
+		{
+			$this->db->where('quantity_purchased > 0');
+		}
+		elseif($inputs['sale_type'] == 'returns')
+		{
+			$this->db->where('quantity_purchased < 0');
+		}
 
 		return $this->db->get()->row_array();
 	}
 }
-?>
+?>

application/models/reports/Inventory_low.php

@@ -19,23 +19,23 @@ class Inventory_low extends Report
 			array('location_name' => $this->lang->line('reports_stock_location')));
 	}
 	
-    public function getData(array $inputs)
-    {
-        $this->db->select('items.name, items.item_number, item_quantities.quantity, items.reorder_level, stock_locations.location_name');
-        $this->db->from('items');
-        $this->db->join('item_quantities', 'items.item_id = item_quantities.item_id');
-        $this->db->join('stock_locations', 'item_quantities.location_id = stock_locations.location_id');
-        $this->db->where('items.deleted', 0);
-        $this->db->where('stock_locations.deleted', 0);
-        $this->db->where('item_quantities.quantity <= items.reorder_level');
-        $this->db->order_by('items.name');				
+	public function getData(array $inputs)
+	{
+		$this->db->select('items.name, items.item_number, item_quantities.quantity, items.reorder_level, stock_locations.location_name');
+		$this->db->from('items');
+		$this->db->join('item_quantities', 'items.item_id = item_quantities.item_id');
+		$this->db->join('stock_locations', 'item_quantities.location_id = stock_locations.location_id');
+		$this->db->where('items.deleted', 0);
+		$this->db->where('stock_locations.deleted', 0);
+		$this->db->where('item_quantities.quantity <= items.reorder_level');
+		$this->db->order_by('items.name');				
 
-        return $this->db->get()->result_array();
-    }
+		return $this->db->get()->result_array();
+	}
 	
 	public function getSummaryData(array $inputs)
 	{
 		return array();
 	}
 }
-?>
+?>

application/models/reports/Inventory_summary.php

@@ -23,12 +23,12 @@ class Inventory_summary extends Report
 
 	public function getData(array $inputs)
 	{	
-        $this->db->select('items.name, items.item_number, item_quantities.quantity, items.reorder_level, stock_locations.location_name, items.cost_price, items.unit_price, (items.cost_price * item_quantities.quantity) AS sub_total_value');
-        $this->db->from('items AS items');
-        $this->db->join('item_quantities AS item_quantities', 'items.item_id = item_quantities.item_id');
-        $this->db->join('stock_locations AS stock_locations', 'item_quantities.location_id = stock_locations.location_id');
-        $this->db->where('items.deleted', 0);
-        $this->db->where('stock_locations.deleted', 0);
+		$this->db->select('items.name, items.item_number, item_quantities.quantity, items.reorder_level, stock_locations.location_name, items.cost_price, items.unit_price, (items.cost_price * item_quantities.quantity) AS sub_total_value');
+		$this->db->from('items AS items');
+		$this->db->join('item_quantities AS item_quantities', 'items.item_id = item_quantities.item_id');
+		$this->db->join('stock_locations AS stock_locations', 'item_quantities.location_id = stock_locations.location_id');
+		$this->db->where('items.deleted', 0);
+		$this->db->where('stock_locations.deleted', 0);
 
 		// should be corresponding to values Inventory_summary::getItemCountDropdownArray() returns...
 		if($inputs['item_count'] == 'zero_and_less')
@@ -80,4 +80,4 @@ class Inventory_summary extends Report
 					'more_than_zero' => $this->lang->line('reports_more_than_zero'));
 	}
 }
-?>
+?>

application/models/reports/Specific_customer.php

@@ -52,13 +52,13 @@ class Specific_customer extends Report
 		$this->db->where('customer_id', $inputs['customer_id']);
 
 		if ($inputs['sale_type'] == 'sales')
-        {
-            $this->db->where('quantity_purchased > 0');
-        }
-        elseif ($inputs['sale_type'] == 'returns')
-        {
-            $this->db->where('quantity_purchased < 0');
-        }
+		{
+			$this->db->where('quantity_purchased > 0');
+		}
+		elseif ($inputs['sale_type'] == 'returns')
+		{
+			$this->db->where('quantity_purchased < 0');
+		}
 
 		$this->db->group_by('sale_id');
 		$this->db->order_by('sale_date');
@@ -85,15 +85,15 @@ class Specific_customer extends Report
 		$this->db->where('customer_id', $inputs['customer_id']);
 
 		if ($inputs['sale_type'] == 'sales')
-        {
-            $this->db->where('quantity_purchased > 0');
-        }
-        elseif ($inputs['sale_type'] == 'returns')
-        {
-            $this->db->where('quantity_purchased < 0');
-        }
+		{
+			$this->db->where('quantity_purchased > 0');
+		}
+		elseif ($inputs['sale_type'] == 'returns')
+		{
+			$this->db->where('quantity_purchased < 0');
+		}
 
 		return $this->db->get()->row_array();
 	}
 }
-?>
+?>

application/models/reports/Specific_employee.php

@@ -52,13 +52,13 @@ class Specific_employee extends Report
 		$this->db->where('employee_id', $inputs['employee_id']);
 		
 		if ($inputs['sale_type'] == 'sales')
-        {
-            $this->db->where('quantity_purchased > 0');
-        }
-        elseif ($inputs['sale_type'] == 'returns')
-        {
-            $this->db->where('quantity_purchased < 0');
-        }     
+		{
+			$this->db->where('quantity_purchased > 0');
+		}
+		elseif ($inputs['sale_type'] == 'returns')
+		{
+			$this->db->where('quantity_purchased < 0');
+		}     
 		
 		$this->db->group_by('sale_id');
 		$this->db->order_by('sale_date');
@@ -85,15 +85,15 @@ class Specific_employee extends Report
 		$this->db->where('employee_id', $inputs['employee_id']);
 
 		if ($inputs['sale_type'] == 'sales')
-        {
-            $this->db->where('quantity_purchased > 0');
-        }
-        elseif ($inputs['sale_type'] == 'returns')
-        {
-            $this->db->where('quantity_purchased < 0');
-        }
+		{
+			$this->db->where('quantity_purchased > 0');
+		}
+		elseif ($inputs['sale_type'] == 'returns')
+		{
+			$this->db->where('quantity_purchased < 0');
+		}
 
 		return $this->db->get()->row_array();
 	}
 }
-?>
+?>

application/models/reports/Summary_categories.php

@@ -44,4 +44,4 @@ class Summary_categories extends Summary_report
 		$this->db->order_by('category');
 	}
 }
-?>
+?>

application/models/reports/Summary_customers.php

@@ -44,4 +44,4 @@ class Summary_customers extends Summary_report
 		$this->db->order_by('customer_p.last_name');
 	}
 }
-?>
+?>

application/models/reports/Summary_discounts.php

@@ -32,4 +32,4 @@ class Summary_discounts extends Summary_report
 		return $this->db->get()->result_array();		
 	}
 }
-?>
+?>

application/models/reports/Summary_employees.php

@@ -44,4 +44,4 @@ class Summary_employees extends Summary_report
 		$this->db->order_by('employee_p.last_name');
 	}
 }
-?>
+?>

application/models/reports/Summary_items.php

@@ -44,4 +44,4 @@ class Summary_items extends Summary_report
 		$this->db->order_by('items.name');
 	}
 }
-?>
+?>

application/models/reports/Summary_payments.php

@@ -16,25 +16,37 @@ class Summary_payments extends Summary_report
 			array('report_count' => $this->lang->line('reports_count')),
 			array('amount_tendered' => $this->lang->line('sales_amount_tendered'), 'sorter' => 'number_sorter'));
 	}
-	
+
+	protected function _where(array $inputs)
+	{
+		if(empty($this->config->item('date_or_time_format')))
+		{
+			$this->db->where('DATE(sales.sale_time) BETWEEN ' . $this->db->escape($inputs['start_date']) . ' AND ' . $this->db->escape($inputs['end_date']));
+		}
+		else
+		{
+			$this->db->where('sales.sale_time BETWEEN ' . $this->db->escape(rawurldecode($inputs['start_date'])) . ' AND ' . $this->db->escape(rawurldecode($inputs['end_date'])));
+		}
+	}
+
 	public function getData(array $inputs)
 	{
-		$this->db->select('sales_payments.payment_type, count(*) AS count, SUM(payment_amount) AS payment_amount');
-		$this->db->from('sales_payments');
+		$this->db->select('sales_payments.payment_type, count(*) AS count, SUM(sales_payments.payment_amount) AS payment_amount');
+		$this->db->from('sales_payments AS sales_payments');
 		$this->db->join('sales AS sales', 'sales.sale_id = sales_payments.sale_id');
 
 		$this->_where($inputs);
 
 		$this->db->group_by("payment_type");
-		
+
 		$payments = $this->db->get()->result_array();
-		
+
 		// consider Gift Card as only one type of payment and do not show "Gift Card: 1, Gift Card: 2, etc." in the total
 		$gift_card_count = 0;
 		$gift_card_amount = 0;
 		foreach($payments as $key=>$payment)
-		{		
-			if( strstr($payment['payment_type'], $this->lang->line('sales_giftcard')) != FALSE )
+		{
+			if(strstr($payment['payment_type'], $this->lang->line('sales_giftcard')) != FALSE)
 			{
 				$gift_card_count  += $payment['count'];
 				$gift_card_amount += $payment['payment_amount'];
@@ -48,8 +60,8 @@ class Summary_payments extends Summary_report
 		{
 			$payments[] = array('payment_type' => $this->lang->line('sales_giftcard'), 'count' => $gift_card_count, 'payment_amount' => $gift_card_amount);
 		}
-		
+
 		return $payments;
 	}
 }
-?>
+?>

application/models/reports/Summary_report.php

@@ -17,6 +17,17 @@ abstract class Summary_report extends Report
 
 	private function _common_select(array $inputs)
 	{
+		$where = '';
+
+		if(empty($this->config->item('date_or_time_format')))
+		{
+			$where .= 'WHERE DATE(sale_time) BETWEEN ' . $this->db->escape($inputs['start_date']) . ' AND ' . $this->db->escape($inputs['end_date']);
+		}
+		else
+		{
+			$where .= 'WHERE sale_time BETWEEN ' . $this->db->escape(rawurldecode($inputs['start_date'])) . ' AND ' . $this->db->escape(rawurldecode($inputs['end_date']));
+		}
+
 		// create a temporary table to contain all the sum of taxes per sale item
 		$this->db->query('CREATE TEMPORARY TABLE IF NOT EXISTS ' . $this->db->dbprefix('sales_items_taxes_temp') . 
 			' (INDEX(sale_id), INDEX(item_id))
@@ -29,7 +40,7 @@ abstract class Summary_report extends Report
 					ON sales.sale_id = sales_items_taxes.sale_id
 				INNER JOIN ' . $this->db->dbprefix('sales_items') . ' AS sales_items
 					ON sales_items.sale_id = sales_items_taxes.sale_id AND sales_items.line = sales_items_taxes.line
-				WHERE DATE(sale_time) BETWEEN ' . $this->db->escape($inputs['start_date']) . ' AND ' . $this->db->escape($inputs['end_date']) . '
+				' . $where . '
 				GROUP BY sales_items_taxes.sale_id, sales_items_taxes.item_id
 			)'
 		);
@@ -69,21 +80,28 @@ abstract class Summary_report extends Report
 
 	private function _common_where(array $inputs)
 	{
-		$this->db->where('DATE(sales.sale_time) BETWEEN ' . $this->db->escape($inputs['start_date']) . ' AND ' . $this->db->escape($inputs['end_date']));
+		if(empty($this->config->item('date_or_time_format')))
+		{
+			$this->db->where('DATE(sales.sale_time) BETWEEN ' . $this->db->escape($inputs['start_date']) . ' AND ' . $this->db->escape($inputs['end_date']));
+		}
+		else
+		{
+			$this->db->where('sales.sale_time BETWEEN ' . $this->db->escape(rawurldecode($inputs['start_date'])) . ' AND ' . $this->db->escape(rawurldecode($inputs['end_date'])));
+		}
 
 		if($inputs['location_id'] != 'all')
 		{
-			$this->db->where('item_location', $inputs['location_id']);
+			$this->db->where('sales_items.item_location', $inputs['location_id']);
 		}
 
 		if($inputs['sale_type'] == 'sales')
-        {
-            $this->db->where('quantity_purchased > 0');
-        }
-        elseif($inputs['sale_type'] == 'returns')
-        {
-            $this->db->where('quantity_purchased < 0');
-        }
+		{
+			$this->db->where('sales_items.quantity_purchased >= 0');
+		}
+		elseif($inputs['sale_type'] == 'returns')
+		{
+			$this->db->where('sales_items.quantity_purchased < 0');
+		}
 	}
 
 	/*
@@ -129,9 +147,9 @@ abstract class Summary_report extends Report
 
 		$this->_common_from();
 
-		$this->_common_where($inputs);
+		$this->_where($inputs);
 
 		return $this->db->get()->row_array();		
 	}
 }
-?>
+?>

application/models/reports/Summary_sales.php

@@ -26,7 +26,7 @@ class Summary_sales extends Summary_report
 		parent::_select($inputs);
 
 		$this->db->select('
-				DATE(sales.sale_time) AS sale_date, 
+				DATE(sales.sale_time) AS sale_date,
 				SUM(sales_items.quantity_purchased) AS quantity_purchased
 		');
 	}
@@ -37,4 +37,4 @@ class Summary_sales extends Summary_report
 		$this->db->order_by('sale_date');
 	}
 }
-?>
+?>

application/models/reports/Summary_suppliers.php

@@ -46,4 +46,4 @@ class Summary_suppliers extends Summary_report
 		$this->db->order_by('supplier_p.last_name');
 	}
 }
-?>
+?>

application/models/reports/Summary_taxes.php

@@ -19,22 +19,29 @@ class Summary_taxes extends Summary_report
 			array('total' => $this->lang->line('reports_total'), 'sorter' => 'number_sorter'));
 	}
 
+	protected function _where(array $inputs)
+	{
+		if(empty($this->config->item('date_or_time_format')))
+		{
+			$this->db->where('DATE(sales.sale_time) BETWEEN ' . $this->db->escape($inputs['start_date']) . ' AND ' . $this->db->escape($inputs['end_date']));
+		}
+		else
+		{
+			$this->db->where('sales.sale_time BETWEEN ' . $this->db->escape(rawurldecode($inputs['start_date'])) . ' AND ' . $this->db->escape(rawurldecode($inputs['end_date'])));
+		}
+	}
+
 	public function getData(array $inputs)
 	{
-		$quantity_cond = '';
+		$where = '';
 
-		if($inputs['sale_type'] == 'sales')
+		if(empty($this->config->item('date_or_time_format')))
 		{
-			$quantity_cond = 'AND quantity_purchased > 0';
+			$where .= 'WHERE DATE(sale_time) BETWEEN ' . $this->db->escape($inputs['start_date']) . ' AND ' . $this->db->escape($inputs['end_date']);
 		}
-		elseif($inputs['sale_type'] == 'returns')
+		else
 		{
-			$quantity_cond = 'AND quantity_purchased < 0';
-		}
-
-		if($inputs['location_id'] != 'all')
-		{
-			$quantity_cond .= 'AND item_location = '. $this->db->escape($inputs['location_id']);
+			$where .= 'WHERE sale_time BETWEEN ' . $this->db->escape(rawurldecode($inputs['start_date'])) . ' AND ' . $this->db->escape(rawurldecode($inputs['end_date']));
 		}
 
 		if($this->config->item('tax_included'))
@@ -64,12 +71,12 @@ class Summary_taxes extends Summary_report
 						ON sales_items.sale_id = sales.sale_id
 					LEFT OUTER JOIN ' . $this->db->dbprefix('sales_items_taxes') . ' AS sales_items_taxes
 						ON sales_items.sale_id = sales_items_taxes.sale_id AND sales_items.item_id = sales_items_taxes.item_id AND sales_items.line = sales_items_taxes.line
-					WHERE DATE(sale_time) BETWEEN ' . $this->db->escape($inputs['start_date']) . ' AND ' . $this->db->escape($inputs['end_date']) . " $quantity_cond
+					' . $where . '
 				) AS temp_taxes
-			GROUP BY percent"
+			GROUP BY percent'
 		);
 
 		return $query->result_array();
 	}
 }
-?>
+?>

application/views/configs/invoice_config.php

@@ -44,7 +44,7 @@
 						'name' => 'invoice_default_comments',
 						'id' => 'invoice_default_comments',
 						'class' => 'form-control input-sm',
-						'value '=> $this->config->item('invoice_default_comments')));?>
+						'value' => $this->config->item('invoice_default_comments')));?>
 				</div>
 			</div>
 
@@ -55,7 +55,7 @@
 						'name' => 'invoice_email_message',
 						'id' => 'invoice_email_message',
 						'class' => 'form-control input-sm',
-						'value '=> $this->config->item('invoice_email_message')));?>
+						'value' => $this->config->item('invoice_email_message')));?>
 				</div>
 			</div>
 

application/views/configs/locale_config.php

@@ -262,6 +262,17 @@
 				</div>
 			</div>
 
+			<div class="form-group form-group-sm">
+  				<?php echo form_label($this->lang->line('config_date_or_time_format'), 'date_or_time_format', array('class' => 'control-label col-xs-2')); ?>
+  				<div class='col-xs-2'>
+ 					<?php echo form_checkbox(array(
+ 						'name' => 'date_or_time_format',
+ 						'id' => 'date_or_time_format',
+ 						'value' => 'date_or_time_format',
+  						'checked'=>$this->config->item('date_or_time_format'))); ?>
+  				</div>
+  			</div>
+
 			<?php echo form_submit(array(
 				'name' => 'submit_form',
 				'id' => 'submit_form',

application/views/partial/daterangepicker.php

@@ -1,99 +1,210 @@
-<?php $this->lang->load("calendar"); $this->lang->load("date"); ?>
+<?php $this->lang->load("calendar"); $this->lang->load("date"); 
+	if(empty($this->config->item('date_or_time_format')))
+	{
+?>
+		$('#daterangepicker').css("width","180");
+		var start_date = "<?php echo date('Y-m-d') ?>";
+		var end_date   = "<?php echo date('Y-m-d') ?>";
 
-var start_date = "<?php echo date('Y-m-d') ?>";
-var end_date   = "<?php echo date('Y-m-d') ?>";
+		$('#daterangepicker').daterangepicker({
+			"ranges": {
+				"<?php echo $this->lang->line("datepicker_today"); ?>": [
+					"<?php echo date($this->config->item('dateformat'), mktime(0,0,0,date("m"),date("d"),date("Y")));?>",
+					"<?php echo date($this->config->item('dateformat'), mktime(0,0,0,date("m"),date("d")+1,date("Y"))-1);?>"
+				],
+				"<?php echo $this->lang->line("datepicker_today_last_year"); ?>": [
+					"<?php echo date($this->config->item('dateformat'), mktime(0,0,0,date("m"),date("d"),date("Y")-1));?>",
+					"<?php echo date($this->config->item('dateformat'), mktime(0,0,0,date("m"),date("d")+1,date("Y")-1)-1);?>"
+				],
+				"<?php echo $this->lang->line("datepicker_yesterday"); ?>": [
+					"<?php echo date($this->config->item('dateformat'), mktime(0,0,0,date("m"),date("d")-1,date("Y")));?>",
+					"<?php echo date($this->config->item('dateformat'), mktime(0,0,0,date("m"),date("d"),date("Y"))-1);?>"
+				],
+				"<?php echo $this->lang->line("datepicker_last_7"); ?>": [
+					"<?php echo date($this->config->item('dateformat'), mktime(0,0,0,date("m"),date("d")-6,date("Y")));?>",
+					"<?php echo date($this->config->item('dateformat'), mktime(0,0,0,date("m"),date("d")+1,date("Y"))-1);?>"
+				],
+				"<?php echo $this->lang->line("datepicker_last_30"); ?>": [
+					"<?php echo date($this->config->item('dateformat'), mktime(0,0,0,date("m"),date("d")-29,date("Y")));?>",
+					"<?php echo date($this->config->item('dateformat'), mktime(0,0,0,date("m"),date("d")+1,date("Y"))-1);?>"
+				],
+				"<?php echo $this->lang->line("datepicker_this_month"); ?>": [
+					"<?php echo date($this->config->item('dateformat'), mktime(0,0,0,date("m"),1,date("Y")));?>",
+					"<?php echo date($this->config->item('dateformat'), mktime(0,0,0,date("m")+1,1,date("Y"))-1);?>"
+				],
+				"<?php echo $this->lang->line("datepicker_same_month_to_same_day_last_year"); ?>": [
+					"<?php echo date($this->config->item('dateformat'), mktime(0,0,0,date("m"),1,date("Y")-1));?>",
+					"<?php echo date($this->config->item('dateformat'), mktime(0,0,0,date("m"),date("d")+1,date("Y")-1)-1);?>"
+				],
+				"<?php echo $this->lang->line("datepicker_this_month_last_year"); ?>": [
+					"<?php echo date($this->config->item('dateformat'), mktime(0,0,0,date("m"),1,date("Y")-1));?>",
+					"<?php echo date($this->config->item('dateformat'), mktime(0,0,0,date("m")+1,1,date("Y")-1)-1);?>"
+				],
+				"<?php echo $this->lang->line("datepicker_last_month"); ?>": [
+					"<?php echo date($this->config->item('dateformat'), mktime(0,0,0,date("m")-1,1,date("Y")));?>",
+					"<?php echo date($this->config->item('dateformat'), mktime(0,0,0,date("m"),1,date("Y"))-1);?>"
+				],
+				"<?php echo $this->lang->line("datepicker_this_year"); ?>": [
+					"<?php echo date($this->config->item('dateformat'), mktime(0,0,0,1,1,date("Y")));?>",
+					"<?php echo date($this->config->item('dateformat'), mktime(0,0,0,date("m"),1,date("Y")+1)-1);?>"
+				],
+				"<?php echo $this->lang->line("datepicker_last_year"); ?>": [
+					"<?php echo date($this->config->item('dateformat'), mktime(0,0,0,1,1,date("Y")-1));?>",
+					"<?php echo date($this->config->item('dateformat'), mktime(0,0,0,1,1,date("Y"))-1);?>"
+				],
+				"<?php echo $this->lang->line("datepicker_all_time"); ?>": [
+					"<?php echo date($this->config->item('dateformat'), mktime(0,0,0,01,01,2010));?>",
+					"<?php echo date($this->config->item('dateformat'), mktime(0,0,0,date("m"),date("d")+1,date("Y"))-1);?>"
+				],
+			},
+			"locale": {
+				"format": '<?php echo dateformat_momentjs($this->config->item("dateformat"))?>',
+				"separator": " - ",
+				"applyLabel": "<?php echo $this->lang->line("datepicker_apply"); ?>",
+				"cancelLabel": "<?php echo $this->lang->line("datepicker_cancel"); ?>",
+				"fromLabel": "<?php echo $this->lang->line("datepicker_from"); ?>",
+				"toLabel": "<?php echo $this->lang->line("datepicker_to"); ?>",
+				"customRangeLabel": "<?php echo $this->lang->line("datepicker_custom"); ?>",
+				"daysOfWeek": [
+					"<?php echo $this->lang->line("cal_su"); ?>",
+					"<?php echo $this->lang->line("cal_mo"); ?>",
+					"<?php echo $this->lang->line("cal_tu"); ?>",
+					"<?php echo $this->lang->line("cal_we"); ?>",
+					"<?php echo $this->lang->line("cal_th"); ?>",
+					"<?php echo $this->lang->line("cal_fr"); ?>",
+					"<?php echo $this->lang->line("cal_sa"); ?>",
+					"<?php echo $this->lang->line("cal_su"); ?>"
+				],
+				"monthNames": [
+					"<?php echo $this->lang->line("cal_january"); ?>",
+					"<?php echo $this->lang->line("cal_february"); ?>",
+					"<?php echo $this->lang->line("cal_march"); ?>",
+					"<?php echo $this->lang->line("cal_april"); ?>",
+					"<?php echo $this->lang->line("cal_may"); ?>",
+					"<?php echo $this->lang->line("cal_june"); ?>",
+					"<?php echo $this->lang->line("cal_july"); ?>",
+					"<?php echo $this->lang->line("cal_august"); ?>",
+					"<?php echo $this->lang->line("cal_september"); ?>",
+					"<?php echo $this->lang->line("cal_october"); ?>",
+					"<?php echo $this->lang->line("cal_november"); ?>",
+					"<?php echo $this->lang->line("cal_december"); ?>"
+				],
+				"firstDay": <?php echo $this->lang->line("datepicker_weekstart"); ?>
+			},
+			"alwaysShowCalendars": true,
+			"startDate": "<?php echo date($this->config->item('dateformat'), mktime(0,0,0,date("m"),date("d")+1,date("Y"))-1);?>",
+			"endDate": "<?php echo date($this->config->item('dateformat'), mktime(0,0,0,date("m"),date("d")+1,date("Y"))-1);?>",
+			"minDate": "<?php echo date($this->config->item('dateformat'), mktime(0,0,0,01,01,2010));?>",
+			"maxDate": "<?php echo date($this->config->item('dateformat'), mktime(0,0,0,date("m"),date("d")+1,date("Y"))-1);?>"
+		}, function(start, end, label) {
+			start_date = start.format('YYYY-MM-DD');
+			end_date = end.format('YYYY-MM-DD');
+		});
+<?php
+	}
+	else
+	{
+?>
+		$('#daterangepicker').css("width","305");
+		var start_date = "<?php echo date('Y-m-d H:i:s')?>";
+		var end_date = "<?php echo date('Y-m-d H:i:s')?>";
 
-$('#daterangepicker').daterangepicker({
-	"ranges": {
-		"<?php echo $this->lang->line("datepicker_today"); ?>": [
-			"<?php echo date($this->config->item('dateformat'), mktime(0,0,0,date("m"),date("d"),date("Y")));?>",
-			"<?php echo date($this->config->item('dateformat'), mktime(0,0,0,date("m"),date("d")+1,date("Y"))-1);?>"
-		],
-		"<?php echo $this->lang->line("datepicker_today_last_year"); ?>": [
-			"<?php echo date($this->config->item('dateformat'), mktime(0,0,0,date("m"),date("d"),date("Y")-1));?>",
-			"<?php echo date($this->config->item('dateformat'), mktime(0,0,0,date("m"),date("d")+1,date("Y")-1)-1);?>"
-		],
-		"<?php echo $this->lang->line("datepicker_yesterday"); ?>": [
-			"<?php echo date($this->config->item('dateformat'), mktime(0,0,0,date("m"),date("d")-1,date("Y")));?>",
-			"<?php echo date($this->config->item('dateformat'), mktime(0,0,0,date("m"),date("d"),date("Y"))-1);?>"
-		],
-		"<?php echo $this->lang->line("datepicker_last_7"); ?>": [
-			"<?php echo date($this->config->item('dateformat'), mktime(0,0,0,date("m"),date("d")-6,date("Y")));?>",
-			"<?php echo date($this->config->item('dateformat'), mktime(0,0,0,date("m"),date("d")+1,date("Y"))-1);?>"
-		],
-		"<?php echo $this->lang->line("datepicker_last_30"); ?>": [
-			"<?php echo date($this->config->item('dateformat'), mktime(0,0,0,date("m"),date("d")-29,date("Y")));?>",
-			"<?php echo date($this->config->item('dateformat'), mktime(0,0,0,date("m"),date("d")+1,date("Y"))-1);?>"
-		],
-		"<?php echo $this->lang->line("datepicker_this_month"); ?>": [
-			"<?php echo date($this->config->item('dateformat'), mktime(0,0,0,date("m"),1,date("Y")));?>",
-			"<?php echo date($this->config->item('dateformat'), mktime(0,0,0,date("m")+1,1,date("Y"))-1);?>"
-		],
-		"<?php echo $this->lang->line("datepicker_same_month_to_same_day_last_year"); ?>": [
-			"<?php echo date($this->config->item('dateformat'), mktime(0,0,0,date("m"),1,date("Y")-1));?>",
-			"<?php echo date($this->config->item('dateformat'), mktime(0,0,0,date("m"),date("d")+1,date("Y")-1)-1);?>"
-		],
-		"<?php echo $this->lang->line("datepicker_this_month_last_year"); ?>": [
-			"<?php echo date($this->config->item('dateformat'), mktime(0,0,0,date("m"),1,date("Y")-1));?>",
-			"<?php echo date($this->config->item('dateformat'), mktime(0,0,0,date("m")+1,1,date("Y")-1)-1);?>"
-		],
-		"<?php echo $this->lang->line("datepicker_last_month"); ?>": [
-			"<?php echo date($this->config->item('dateformat'), mktime(0,0,0,date("m")-1,1,date("Y")));?>",
-			"<?php echo date($this->config->item('dateformat'), mktime(0,0,0,date("m"),1,date("Y"))-1);?>"
-		],
-		"<?php echo $this->lang->line("datepicker_this_year"); ?>": [
-			"<?php echo date($this->config->item('dateformat'), mktime(0,0,0,1,1,date("Y")));?>",
-			"<?php echo date($this->config->item('dateformat'), mktime(0,0,0,date("m"),1,date("Y")+1)-1);?>"
-		],
-		"<?php echo $this->lang->line("datepicker_last_year"); ?>": [
-			"<?php echo date($this->config->item('dateformat'), mktime(0,0,0,1,1,date("Y")-1));?>",
-			"<?php echo date($this->config->item('dateformat'), mktime(0,0,0,1,1,date("Y"))-1);?>"
-		],
-		"<?php echo $this->lang->line("datepicker_all_time"); ?>": [
-			"<?php echo date($this->config->item('dateformat'), mktime(0,0,0,01,01,2010));?>",
-			"<?php echo date($this->config->item('dateformat'), mktime(0,0,0,date("m"),date("d")+1,date("Y"))-1);?>"
-		],
-	},
-	"locale": {
-		"format": '<?php echo dateformat_momentjs($this->config->item("dateformat"))?>',
-		"separator": " - ",
-		"applyLabel": "<?php echo $this->lang->line("datepicker_apply"); ?>",
-		"cancelLabel": "<?php echo $this->lang->line("datepicker_cancel"); ?>",
-		"fromLabel": "<?php echo $this->lang->line("datepicker_from"); ?>",
-		"toLabel": "<?php echo $this->lang->line("datepicker_to"); ?>",
-		"customRangeLabel": "<?php echo $this->lang->line("datepicker_custom"); ?>",
-		"daysOfWeek": [
-			"<?php echo $this->lang->line("cal_su"); ?>",
-			"<?php echo $this->lang->line("cal_mo"); ?>",
-			"<?php echo $this->lang->line("cal_tu"); ?>",
-			"<?php echo $this->lang->line("cal_we"); ?>",
-			"<?php echo $this->lang->line("cal_th"); ?>",
-			"<?php echo $this->lang->line("cal_fr"); ?>",
-			"<?php echo $this->lang->line("cal_sa"); ?>",
-			"<?php echo $this->lang->line("cal_su"); ?>"
-		],
-		"monthNames": [
-			"<?php echo $this->lang->line("cal_january"); ?>",
-			"<?php echo $this->lang->line("cal_february"); ?>",
-			"<?php echo $this->lang->line("cal_march"); ?>",
-			"<?php echo $this->lang->line("cal_april"); ?>",
-			"<?php echo $this->lang->line("cal_may"); ?>",
-			"<?php echo $this->lang->line("cal_june"); ?>",
-			"<?php echo $this->lang->line("cal_july"); ?>",
-			"<?php echo $this->lang->line("cal_august"); ?>",
-			"<?php echo $this->lang->line("cal_september"); ?>",
-			"<?php echo $this->lang->line("cal_october"); ?>",
-			"<?php echo $this->lang->line("cal_november"); ?>",
-			"<?php echo $this->lang->line("cal_december"); ?>"
-		],
-		"firstDay": <?php echo $this->lang->line("datepicker_weekstart"); ?>
-	},
-	"alwaysShowCalendars": true,
-	"startDate": "<?php echo date($this->config->item('dateformat'), mktime(0,0,0,date("m"),date("d")+1,date("Y"))-1);?>",
-	"endDate": "<?php echo date($this->config->item('dateformat'), mktime(0,0,0,date("m"),date("d")+1,date("Y"))-1);?>",
-	"minDate": "<?php echo date($this->config->item('dateformat'), mktime(0,0,0,01,01,2010));?>",
-	"maxDate": "<?php echo date($this->config->item('dateformat'), mktime(0,0,0,date("m"),date("d")+1,date("Y"))-1);?>"
-}, function(start, end, label) {
-	start_date = start.format('YYYY-MM-DD');
-	end_date = end.format('YYYY-MM-DD');
-});
+		$('#daterangepicker').daterangepicker({
+			"ranges": {
+				"<?php echo $this->lang->line("datepicker_today"); ?>": [
+					"<?php echo date($this->config->item('dateformat')." ".$this->config->item('timeformat'), mktime(0,0,0,date("m"),date("d"),date("Y")));?>",
+					"<?php echo date($this->config->item('dateformat')." ".$this->config->item('timeformat'),mktime(23,59,59,date("m"),date("d"),date("Y"))-1);?>"
+				],
+				"<?php echo $this->lang->line("datepicker_today_last_year"); ?>": [
+					"<?php echo date($this->config->item('dateformat')." ".$this->config->item('timeformat'),mktime(0,0,0,date("m"),date("d"),date("Y")-1));?>",
+					"<?php echo date($this->config->item('dateformat')." ".$this->config->item('timeformat'),mktime(23,59,59,date("m"),date("d"),date("Y")-1)-1);?>"
+				],
+				"<?php echo $this->lang->line("datepicker_yesterday"); ?>": [
+					"<?php echo date($this->config->item('dateformat')." ".$this->config->item('timeformat'),mktime(0,0,0,date("m"),date("d")-1,date("Y")));?>",
+					"<?php echo date($this->config->item('dateformat')." ".$this->config->item('timeformat'),mktime(23,59,59,date("m"),date("d")-1,date("Y"))-1);?>"
+				],
+				"<?php echo $this->lang->line("datepicker_last_7"); ?>": [
+					"<?php echo date($this->config->item('dateformat')." ".$this->config->item('timeformat'),mktime(0,0,0,date("m"),date("d")-6,date("Y")));?>",
+					"<?php echo date($this->config->item('dateformat')." ".$this->config->item('timeformat'),mktime(23,59,59,date("m"),date("d"),date("Y"))-1);?>"
+				],
+				"<?php echo $this->lang->line("datepicker_last_30"); ?>": [
+					"<?php echo date($this->config->item('dateformat')." ".$this->config->item('timeformat'),mktime(0,0,0,date("m"),date("d")-29,date("Y")));?>",
+					"<?php echo date($this->config->item('dateformat')." ".$this->config->item('timeformat'),mktime(23,59,59,date("m"),date("d"),date("Y"))-1);?>"
+				],
+				"<?php echo $this->lang->line("datepicker_this_month"); ?>": [
+					"<?php echo date($this->config->item('dateformat')." ".$this->config->item('timeformat'),mktime(0,0,0,date("m"),1,date("Y")));?>",
+					"<?php echo date($this->config->item('dateformat')." ".$this->config->item('timeformat'),mktime(23,59,59,date("m")+1,0,date("Y"))-1);?>"
+				],
+				"<?php echo $this->lang->line("datepicker_same_month_to_same_day_last_year"); ?>": [
+					"<?php echo date($this->config->item('dateformat')." ".$this->config->item('timeformat'),mktime(0,0,0,date("m"),1,date("Y")-1));?>",
+					"<?php echo date($this->config->item('dateformat')." ".$this->config->item('timeformat'),mktime(23,59,59,date("m"),date("d"),date("Y")-1)-1);?>"
+				],
+				"<?php echo $this->lang->line("datepicker_this_month_last_year"); ?>": [
+					"<?php echo date($this->config->item('dateformat')." ".$this->config->item('timeformat'),mktime(0,0,0,date("m"),1,date("Y")-1));?>",
+					"<?php echo date($this->config->item('dateformat')." ".$this->config->item('timeformat'),mktime(23,59,59,date("m")+1,0,date("Y")-1)-1);?>"
+				],
+				"<?php echo $this->lang->line("datepicker_last_month"); ?>": [
+					"<?php echo date($this->config->item('dateformat')." ".$this->config->item('timeformat'),mktime(0,0,0,date("m")-1,1,date("Y")));?>",
+					"<?php echo date($this->config->item('dateformat')." ".$this->config->item('timeformat'),mktime(23,59,59,date("m"),0,date("Y"))-1);?>"
+				],
+				"<?php echo $this->lang->line("datepicker_this_year"); ?>": [
+					"<?php echo date($this->config->item('dateformat')." ".$this->config->item('timeformat'),mktime(0,0,0,1,1,date("Y")));?>",
+					"<?php echo date($this->config->item('dateformat')." ".$this->config->item('timeformat'),mktime(23,59,59,date("m"),1,date("Y")+1)-1);?>"
+				],
+				"<?php echo $this->lang->line("datepicker_last_year"); ?>": [
+					"<?php echo date($this->config->item('dateformat')." ".$this->config->item('timeformat'),mktime(0,0,0,1,1,date("Y")-1));?>",
+					"<?php echo date($this->config->item('dateformat')." ".$this->config->item('timeformat'),mktime(23,59,59,1,0,date("Y"))-1);?>"
+				],
+				"<?php echo $this->lang->line("datepicker_all_time"); ?>": [
+					"<?php echo date($this->config->item('dateformat')." ".$this->config->item('timeformat'),mktime(0,0,0,01,01,2010));?>",
+					"<?php echo date($this->config->item('dateformat')." ".$this->config->item('timeformat'),mktime(23,59,59,date("m"),date("d"),date("Y"))-1);?>"
+				],
+			},
+			"locale": {
+				"format": '<?php echo dateformat_momentjs($this->config->item("dateformat")." ".$this->config->item('timeformat'))?>',
+				"separator": " - ",
+				"applyLabel": "<?php echo $this->lang->line("datepicker_apply"); ?>",
+				"cancelLabel": "<?php echo $this->lang->line("datepicker_cancel"); ?>",
+				"fromLabel": "<?php echo $this->lang->line("datepicker_from"); ?>",
+				"toLabel": "<?php echo $this->lang->line("datepicker_to"); ?>",
+				"customRangeLabel": "<?php echo $this->lang->line("datepicker_custom"); ?>",
+				"daysOfWeek": [
+					"<?php echo $this->lang->line("cal_su"); ?>",
+					"<?php echo $this->lang->line("cal_mo"); ?>",
+					"<?php echo $this->lang->line("cal_tu"); ?>",
+					"<?php echo $this->lang->line("cal_we"); ?>",
+					"<?php echo $this->lang->line("cal_th"); ?>",
+					"<?php echo $this->lang->line("cal_fr"); ?>",
+					"<?php echo $this->lang->line("cal_sa"); ?>",
+					"<?php echo $this->lang->line("cal_su"); ?>"
+				],
+				"monthNames": [
+					"<?php echo $this->lang->line("cal_january"); ?>",
+					"<?php echo $this->lang->line("cal_february"); ?>",
+					"<?php echo $this->lang->line("cal_march"); ?>",
+					"<?php echo $this->lang->line("cal_april"); ?>",
+					"<?php echo $this->lang->line("cal_may"); ?>",
+					"<?php echo $this->lang->line("cal_june"); ?>",
+					"<?php echo $this->lang->line("cal_july"); ?>",
+					"<?php echo $this->lang->line("cal_august"); ?>",
+					"<?php echo $this->lang->line("cal_september"); ?>",
+					"<?php echo $this->lang->line("cal_october"); ?>",
+					"<?php echo $this->lang->line("cal_november"); ?>",
+					"<?php echo $this->lang->line("cal_december"); ?>"
+				],
+				"firstDay": <?php echo $this->lang->line("datepicker_weekstart"); ?>
+			},
+		    "timePicker": true,
+		    "timePickerSeconds": true,
+			"alwaysShowCalendars": true,
+			"startDate": "<?php echo date($this->config->item('dateformat')." ".$this->config->item('timeformat'),mktime(0,0,0,date("m"),date("d"),date("Y")));?>",
+			"endDate": "<?php echo date($this->config->item('dateformat')." ".$this->config->item('timeformat'),mktime(23,59,59,date("m"),date("d"),date("Y"))-1);?>",
+			"minDate": "<?php echo date($this->config->item('dateformat')." ".$this->config->item('timeformat'),mktime(0,0,0,01,01,2010));?>",
+			"maxDate": "<?php echo date($this->config->item('dateformat')." ".$this->config->item('timeformat'),mktime(23,59,59,date("m"),date("d"),date("Y"))-1);?>"
+		}, function(start, end, label) {
+			start_date = start.format('YYYY-MM-DD HH:mm:ss');
+			end_date = end.format('YYYY-MM-DD HH:mm:ss');
+		});
+<?php
+	}
+?>

application/views/partial/header.php

@@ -95,11 +95,15 @@
 				<div class="navbar-left">
 					<div id="liveclock"><?php echo date($this->config->item('dateformat') . ' ' . $this->config->item('timeformat')) ?></div>
 				</div>
-				
+
 				<div class="navbar-right" style="margin:0">
-					<?php echo $this->config->item('company') . "  |  $user_info->first_name $user_info->last_name  |  " . ($this->input->get("debug") == "true" ? $this->session->userdata('session_sha1') : ""); ?>
+					<?php echo $user_info->first_name . ' ' . $user_info->last_name . '  |  ' . ($this->input->get("debug") == "true" ? $this->session->userdata('session_sha1') : ''); ?>
 					<?php echo anchor("home/logout", $this->lang->line("common_logout")); ?>
 				</div>
+
+				<div class="navbar-center" style="text-align:center">
+					<strong><?php echo $this->config->item('company'); ?></strong>
+				</div>
 			</div>
 		</div>
 

application/views/partial/header_js.php

@@ -44,6 +44,13 @@
 		}
 	});
 
+	var submit = $.fn.submit;
+
+	$.fn.submit = function() {
+		setup_csrf_token();
+		submit.apply(this, arguments);
+	};
+
 	session_sha1 = '<?php echo $this->session->userdata('session_sha1'); ?>';
 
 </script>

application/views/partial/print_receipt.php

@@ -1,68 +1,64 @@
 <script type="text/javascript">
 function printdoc()
 {
-	// receipt layout sanity check
-	if ( $("#receipt_items, #items, #table_holder").length > 0) 
+	// install firefox addon in order to use this plugin
+	if (window.jsPrintSetup)
 	{
-		// install firefox addon in order to use this plugin
-		if (window.jsPrintSetup) 
-		{
-			// set top margins in millimeters
-			jsPrintSetup.setOption('marginTop', '<?php echo $this->config->item('print_top_margin'); ?>');
-			jsPrintSetup.setOption('marginLeft', '<?php echo $this->config->item('print_left_margin'); ?>');
-			jsPrintSetup.setOption('marginBottom', '<?php echo $this->config->item('print_bottom_margin'); ?>');
-			jsPrintSetup.setOption('marginRight', '<?php echo $this->config->item('print_right_margin'); ?>');
+		// set top margins in millimeters
+		jsPrintSetup.setOption('marginTop', '<?php echo $this->config->item('print_top_margin'); ?>');
+		jsPrintSetup.setOption('marginLeft', '<?php echo $this->config->item('print_left_margin'); ?>');
+		jsPrintSetup.setOption('marginBottom', '<?php echo $this->config->item('print_bottom_margin'); ?>');
+		jsPrintSetup.setOption('marginRight', '<?php echo $this->config->item('print_right_margin'); ?>');
 
-			<?php if (!$this->config->item('print_header'))
-			{
-			?>
-				// set page header
-				jsPrintSetup.setOption('headerStrLeft', '');
-				jsPrintSetup.setOption('headerStrCenter', '');
-				jsPrintSetup.setOption('headerStrRight', '');
-			<?php 
-			}
-			if (!$this->config->item('print_footer'))
-			{
-			?>
-				// set empty page footer
-				jsPrintSetup.setOption('footerStrLeft', '');
-				jsPrintSetup.setOption('footerStrCenter', '');
-				jsPrintSetup.setOption('footerStrRight', '');
-			<?php 
-			} 
-			?>
-			
-			var printers = jsPrintSetup.getPrintersList().split(',');
-			// get right printer here..
-			for(var index in printers) {
-				var default_ticket_printer = window.localStorage && localStorage['<?php echo $selected_printer; ?>'];
-				var selected_printer = printers[index];
-				if (selected_printer == default_ticket_printer) {
-					// select epson label printer
-					jsPrintSetup.setPrinter(selected_printer);
-					// clears user preferences always silent print value
-					// to enable using 'printSilent' option
-					jsPrintSetup.clearSilentPrint();
-					<?php if (!$this->config->item('print_silently')) 
-					{
-					?>
-						// Suppress print dialog (for this context only)
-						jsPrintSetup.setOption('printSilent', 1);
-					<?php 
-					}
-					?>
-					// Do Print 
-					// When print is submitted it is executed asynchronous and
-					// script flow continues after print independently of completetion of print process! 
-					jsPrintSetup.print();
-				}
-			}
-		}
-		else
+		<?php if (!$this->config->item('print_header'))
 		{
-			window.print();
+		?>
+			// set page header
+			jsPrintSetup.setOption('headerStrLeft', '');
+			jsPrintSetup.setOption('headerStrCenter', '');
+			jsPrintSetup.setOption('headerStrRight', '');
+		<?php
 		}
+		if (!$this->config->item('print_footer'))
+		{
+		?>
+			// set empty page footer
+			jsPrintSetup.setOption('footerStrLeft', '');
+			jsPrintSetup.setOption('footerStrCenter', '');
+			jsPrintSetup.setOption('footerStrRight', '');
+		<?php
+		}
+		?>
+
+		var printers = jsPrintSetup.getPrintersList().split(',');
+		// get right printer here..
+		for(var index in printers) {
+			var default_ticket_printer = window.localStorage && localStorage['<?php echo $selected_printer; ?>'];
+			var selected_printer = printers[index];
+			if (selected_printer == default_ticket_printer) {
+				// select epson label printer
+				jsPrintSetup.setPrinter(selected_printer);
+				// clears user preferences always silent print value
+				// to enable using 'printSilent' option
+				jsPrintSetup.clearSilentPrint();
+				<?php if (!$this->config->item('print_silently'))
+				{
+				?>
+					// Suppress print dialog (for this context only)
+					jsPrintSetup.setOption('printSilent', 1);
+				<?php
+				}
+				?>
+				// Do Print
+				// When print is submitted it is executed asynchronous and
+				// script flow continues after print independently of completetion of print process!
+				jsPrintSetup.print();
+			}
+		}
+	}
+	else
+	{
+		window.print();
 	}
 }
 

application/views/sales/receipt_short.php

@@ -32,7 +32,7 @@
 		if (!empty($invoice_number))
 		{
 		?>
-			<div id="invoice_number"><?php echo $this->lang->line('recvs_invoice_number').": ".$invoice_number; ?></div>	
+			<div id="invoice_number"><?php echo $this->lang->line('sales_invoice_number').": ".$invoice_number; ?></div>
 		<?php 
 		}
 		?>

bower.json

@@ -1,7 +1,7 @@
 {
   "name": "opensourcepos",
   "description": "Open Source Point of Sale is a web based POS system written in the PHP language. It uses MySQL as backend and has a simple user interface",
-  "version": "3.0.2",
+  "version": "3.1.0",
   "license": "MIT",
   "authors": [
     "jekkos <jeroen.peelaerts - at - gmail.com>",

composer.json

@@ -1,7 +1,7 @@
 {
 	"name": "opensourcepos",
 	"description" : "Open Source Point of Sale is a web based POS system written in the PHP language. It uses MySQL as backend and has a simple user interface",
-	"version": "3.0.2",
+	"version": "3.1.0",
     "license": "MIT",
 	"authors": [
         {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "opensourcepos",
-  "version": "3.0.2",
+  "version": "3.1.0",
   "description": "Open Source Point of Sale is a web based point of sale system written in the PHP language. It uses MySQL as the data storage back-end and has a simple user interface.",
   "main": "index.php",
   "license": "MIT",

public/license/LICENSE

@@ -5,12 +5,13 @@ Copyright (c) 2012 Alain
 Copyright (c) 2013 Rob Garrison
 Copyright (c) 2013 Parq
 Copyright (c) 2013 Ramel
-Copyright (c) 2014-2016 jekkos
-Copyright (c) 2015-2016 FrancescoUK (aka daN4cat)
+Copyright (c) 2013-2017 jekkos
+Copyright (c) 2015-2017 FrancescoUK (aka daN4cat)
 Copyright (c) 2015 Aamir Shahzad (aka asakpke), RoshanTech.com
 Copyright (c) 2015 Toni Haryanto (aka yllumi)
-Copyright (c) 2016 Ramkrishna Mondal (aka RamkrishnaMondal)
+Copyright (c) 2016-2017 Ramkrishna Mondal (aka RamkrishnaMondal)
 Copyright (c) 2016 Rinaldy@dbarber (aka rnld26)
+Copyright (c) 2016 Jorge Colmenarez (aka jlctmaster), frontuari.com
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of
 this software and associated documentation files (the "Software"), to deal in
@@ -33,4 +34,4 @@ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
 FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
 COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
 IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

public/license/composer.LICENSES

@@ -1,6 +1,6 @@
 {
     "name": "OpenSourcePOS",
-    "version": "3.0.1",
+    "version": "3.1.0",
     "license": [
         "MIT"
     ],