Update changelog for 2.3.4

Remove dbbackup on logout #318

.gitattributes

@@ -1,2 +1,3 @@
 dist/ merge=ours
 application/language/**/*.php merge=ours
+text=auto

.travis.yml

@@ -1,22 +1,16 @@
-language: php
-php:
-      - 5.5
-install: npm install
-before_script:
-      - npm update -g npm
-      - npm install grunt-cli
-      - sudo apt-get update
-      - sudo apt-get install apache2 libapache2-mod-fastcgi
-      # enable php-fpm
-      - sudo cp ~/.phpenv/versions/$(phpenv version-name)/etc/php-fpm.conf.default ~/.phpenv/versions/$(phpenv version-name)/etc/php-fpm.conf
-      - sudo a2enmod rewrite actions fastcgi alias
-      - echo "cgi.fix_pathinfo = 1" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini
-      - ~/.phpenv/versions/$(phpenv version-name)/sbin/php-fpm
-      # configure apache virtual hosts
-      - sudo cp -f travis-ci-apache /etc/apache2/sites-available/default
-      - sudo sed -e "s?%TRAVIS_BUILD_DIR%?$(pwd)?g" --in-place /etc/apache2/sites-available/default
-      - sudo service apache2 restart
-      - mysql -e "create database IF NOT EXISTS ospos;" -uroot
-      - mysql -e "use ospos; source database/database.sql;" -uroot
-      - cp application/config/database.php.tmpl application/config/database.php
-script: grunt mochaWebdriver:test
+sudo: false
+    
+language: node_js
+
+node_js:
+      - "4.1"
+
+services:
+    - docker
+
+before_install:
+    - docker build -t jekkos/opensourcepos .
+    - docker run -d jekkos/opensourcepos 
+
+script:
+    - docker exec -t -i $(docker ps | tail -n 1 | cut -d' ' -f1) /bin/sh -c "while ! curl http://localhost/index.php | grep username; do sleep 1; done; cd app && grunt mochaWebdriver:test" 

COPYING

@@ -1,6 +1,13 @@
 The MIT License (MIT)
 
-Copyright (c) 2014 pappastech
+Copyright (c) 2012-2014 pappastech
+Copyright (c) 2012 Alain
+Copyright (c) 2013 Rob Garrison
+Copyright (c) 2013 Parq
+Copyright (c) 2013 Ramel
+Copyright (c) 2014-2015 jekkos
+Copyright (c) 2015 FrancescoUK (aka daN4cat)
+Copyright (c) 2015 Aamir Shahzad (aka asakpke), RoshanTech.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
@@ -17,4 +24,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.

Dockerfile

@@ -0,0 +1,28 @@
+FROM ubuntu:utopic
+MAINTAINER jekkos
+RUN sed -i -e 's/archive.ubuntu.com\|security.ubuntu.com/old-releases.ubuntu.com/g' /etc/apt/sources.list
+RUN apt-get update
+RUN apt-get -y upgrade
+RUN DEBIAN_FRONTEND=noninteractive apt-get -y install mysql-client mysql-server apache2 libapache2-mod-php5 pwgen python-setuptools vim-tiny php5-mysql php5-gd nodejs npm curl
+RUN easy_install supervisor
+ADD ./docker/foreground.sh /etc/apache2/foreground.sh
+ADD ./docker/supervisord.conf /etc/supervisord.conf
+RUN chmod 755 /etc/apache2/foreground.sh
+# Install dependencies 
+RUN apt-get install -y --no-install-recommends software-properties-common
+RUN apt-get install -y python git
+
+# Get latest Ospos source from Git
+RUN git clone https://github.com/jekkos/opensourcepos.git /app
+# RUN cd app && git checkout develop/2.4
+RUN ln -s /usr/bin/nodejs /usr/bin/node
+RUN cd app && npm install
+RUN npm install -g grunt-cli
+RUn ln -s /usr/local/bin/grunt /usr/bin/grunt
+
+RUN ln -fs /app/* /var/www/html
+RUN rm /var/www/html/index.html
+ADD ./docker/start_container.sh /start_container.sh
+RUN chmod 755 /start_container.sh
+EXPOSE 80 3306
+CMD ["/bin/bash", "/start_container.sh"]

Gruntfile.js

@@ -3,21 +3,33 @@ module.exports = function(grunt) {
   grunt.initConfig({
     pkg: grunt.file.readJSON('package.json'),
     concat: {
-      options: {
-        separator: ';'
-      },
-      dist: {
-        src: ['js/jquery*', 'js/*.js'],
-        dest: 'dist/<%= pkg.name %>.js'
-      }
+        js: {
+            options: {
+                separator: ';'
+            },
+            dist: {
+                src: ['js/jquery*', 'js/*.js'],
+                dest: 'dist/<%= pkg.name %>.js'
+            }
+        },
+        sql: {
+            options: {
+                banner: '-- >> This file is autogenerated from tables.sql and constraints.sql. Do not modify directly << --'
+            },
+            files: {
+                'database/database.sql': ['database/tables.sql', 'database/constraints.sql'],
+                'database/migrate_phppos_dist.sql': ['database/tables.sql', 'database/phppos_migrate.sql', 'database/constraints.sql']
+            }
+        }
     },
+
     uglify: {
       options: {
         banner: '/*! <%= pkg.name %> <%= grunt.template.today("dd-mm-yyyy") %> */\n'
       },
       dist: {
         files: {
-          'dist/<%= pkg.name %>.min.js': ['<%= concat.dist.dest %>']
+          'dist/<%= pkg.name %>.min.js': ['<%= concat.js.dist.dest %>']
         }
       }
     },
@@ -74,6 +86,20 @@ module.exports = function(grunt) {
     watch: {
       files: ['<%= jshint.files %>'],
       tasks: ['jshint']
+    },
+    cachebreaker: {
+        dev: {
+            options: {
+                match: ['opensourcepos.min.js'],
+                src: {
+                    path: 'dist/opensourcepos.min.js'
+                },
+                replacement: 'md5'
+            },
+            files: {
+                src: ['application/views/partial/header.php']
+            }
+        }
     }
   });
 
@@ -83,7 +109,8 @@ module.exports = function(grunt) {
   grunt.loadNpmTasks('grunt-contrib-concat');
   grunt.loadNpmTasks('grunt-script-link-tags');
   grunt.loadNpmTasks('grunt-mocha-webdriver');
+  grunt.loadNpmTasks('grunt-cache-breaker');
 
-  grunt.registerTask('default', ['tags:js', 'concat', 'uglify', 'tags:minjs']);
+  grunt.registerTask('default', ['tags:js', 'concat', 'uglify', 'tags:minjs', 'cachebreaker']);
 
 };

README.md

@@ -16,11 +16,27 @@ username: admin
 password:pointofsale
 9. Enjoy
 
-A more extensive setup guide can be found at [this site](http://www.opensourceposguide.com/guide/gettingstarted/installation)
+13/01/2016: Intall using Docker
+-------------------------------
+From now on ospos can be deployed using Docker on Linux, Mac or Windows. This setup dramatically reduces the number of possible issues as all setup is now done in a Dockerfile. Docker runs natively on mac and linux, but will require more overhead on windows. Please refer to the docker documentation for instructions on how to set it up on your platform.
+
+To build and run the image, issue following commands in a terminal with docker installed
+
+    docker build -t me/ospos https://github.com/jekkos/opensourcepos.git
+    docker run -d -p 80:80 me/ospos
+
+Docker will clone the latest master into the image and start a LAMP stack with the application configured. If you like to persist your changes in this install, then you can use two docker data containers to store database and filesystem changes. In this case you will need following command (first time only)
+
+    docker run -d -v /app --name="ospos" -v /var/lib/mysql --name="ospos-sql" -p 127.0.0.1:80:80 me/ospos
+
+After stopping the created container for the first time, this command will be replaced with
+
+    docker run -d -v /app --volumes-from="ospos" -v /var/lib/mysql --volumes-from="ospos-sql" -p 127.0.0.1:80:80 me/ospos
+
+Both the data and mysql directories will be persisted in a separate docker container and can be mounted within any other container using the last command. A more extensive setup guide can be found at [this site](http://www.opensourceposguide.com/guide/gettingstarted/installation)
 
 If you like the project, and you are making money out of it on a daily basis, then consider to buy me a coffee so I can keep adding features.
 
 
 [![Donate](https://www.paypalobjects.com/en_US/i/btn/btn_donate_LG.gif)](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=MUN6AEG7NY6H8)
 
-Or send some coins to **19kwPpAwrUTxbNEs5D6cRR1k4mf5HNa4v2**

WHATS_NEW.txt

@@ -1,3 +1,37 @@
+Version 2.3.4
+-------------
++ Migration script fixes
++ Improved continuous integration setup
++ More integration tests
++ Virtualized container setup (docker install)
++ Live clock functionality + favicon
++ Improved PHP 7 compatbility
++ Added de_CH (German) as language 
++ Minor code cleanup
++ Removal of annoying backup prompt on logout
+
+Version 2.3.3
+-------------
++ Item kit fixes (search, list, ..)
++ Add datepicker widgets in sale/receiving edit forms
++ Add date filter in items module
++ Add barcode generation logic for EAN8, EAN13
++ Add barcode validation + fallback logic for EAN8, EAN13
++ New config option to generate barcodes if item_number empty
++ Add cost + count to inventory reports
++ Giftcard fixes
++ Refactor sales overview (added date filtering + search options)
++ Better locale config support
++ Improve php compatibility
++ Fix invoice numbering bug on suspend
++ Add configurable locale-dependent dateformat
++ Add grunt-cache-breaker plugin
++ Suspend button appeaers before adding a payment
++ Searching of deleted items, filtering part is removed
++ Remove infamous "0" after leaving sale or receiving comments empty
++ Add SQL script to clean zeroes in sales/receivings comments
++ Numerous other bug fixes
+
 Version 2.3.2
 -------------
 + Nominatim (OpenStreetMap) customer address autocompletion

application/config/autoload.php

@@ -64,7 +64,7 @@ $autoload['libraries'] = array('database','form_validation','session','user_agen
 |	$autoload['helper'] = array('url', 'file');
 */
 
-$autoload['helper'] = array('form','url','table','text','currency', 'html', 'download', 'directory');
+$autoload['helper'] = array('form','url','table','text','currency', 'html', 'download', 'directory', 'dateformat_helper');
 
 
 /*
@@ -109,7 +109,7 @@ $autoload['language'] = array();
 |
 */
 
-$autoload['model'] = array('Appconfig','Person','Customer','Employee','Module','Item', 'Item_taxes', 'Sale', 'Sale_suspended', 'Supplier','Inventory','Receiving','Giftcard', 'Item_kit', 'Item_kit_items','Stock_locations','Item_quantities');
+$autoload['model'] = array('Appconfig','Person','Customer','Employee','Module','Item', 'Item_taxes', 'Sale', 'Sale_suspended', 'Supplier','Inventory','Receiving','Giftcard', 'Item_kit', 'Item_kit_items','Stock_location','Item_quantity');
 
 
 /* End of file autoload.php */

application/config/config.php

@@ -9,7 +9,7 @@
 |
 |
 */
-$config['application_version'] = '2.3.2';
+$config['application_version'] = '2.3.4';
 
 /*
 |--------------------------------------------------------------------------

application/config/database.php.tmpl

@@ -52,7 +52,7 @@ $db['default']['hostname'] = 'localhost';
 $db['default']['username'] = 'root';
 $db['default']['password'] = '';
 $db['default']['database'] = 'ospos';
-$db['default']['dbdriver'] = 'mysql';
+$db['default']['dbdriver'] = 'mysqli';
 $db['default']['dbprefix'] = 'ospos_';
 $db['default']['pconnect'] = FALSE;
 $db['default']['db_debug'] = TRUE;

application/config/routes.php

@@ -43,12 +43,15 @@ $route['no_access/(:any)'] = "no_access/index/$1";
 $route['no_access/(:any)/(:any)'] = "no_access/index/$1/$2";
 $route['sales/index/(:any)'] = "sales/manage/$1";
 $route['sales/index/(:any)/(:any)'] = "sales/manage/$1/$2";
+$route['sales/index/(:any)/(:any)/(:any)'] = "sales/manage/$1/$2/$3";
 $route['reports/(summary_:any)/(:any)/(:any)'] = "reports/$1/$2/$3";
 $route['reports/summary_:any'] = "reports/date_input_excel_export";
 $route['reports/(graphical_:any)/(:any)/(:any)'] = "reports/$1/$2/$3";
 $route['reports/graphical_:any'] = "reports/date_input";
 $route['reports/(inventory_:any)/(:any)'] = "reports/$1/$2";
 $route['reports/inventory_:any'] = "reports/excel_export";
+$route['reports/inventory_summary'] = "reports/inventory_summary_input";
+$route['reports/(inventory_summary)/(:any)/(:any)/(:any)'] = "reports/$1/$2/$3/$4";
 
 $route['reports/(detailed_sales)/(:any)/(:any)/(:any)'] = "reports/$1/$2/$3$/$4";
 $route['reports/detailed_sales'] = "reports/date_input_sales";
@@ -61,7 +64,7 @@ $route['reports/specific_discount'] = "reports/specific_discount_input";
 
 $route['scaffolding_trigger'] = "";
 
-$route['404_override'] = 'errors/page_missing';
+$route['404_override'] = "";
 
 /* End of file routes.php */
 /* Location: ./application/config/routes.php */

application/controllers/config.php

@@ -11,7 +11,7 @@ class Config extends Secure_area
 	function index()
 	{
 		$location_names = array();
-		$data['stock_locations'] = $this->Stock_locations->get_all()->result_array();
+		$data['stock_locations'] = $this->Stock_location->get_all()->result_array();
 		$data['support_barcode'] = $this->barcode_lib->get_list_barcodes();
 		$this->load->view("configs/manage", $data);
 		$this->_remove_duplicate_cookies();
@@ -24,38 +24,32 @@ class Config extends Secure_area
 		
 		$batch_save_data=array(
 		'company'=>$this->input->post('company'),
-		'address'=>$this->input->post('address'),
-		'phone'=>$this->input->post('phone'),
-		'email'=>$this->input->post('email'),
-		'fax'=>$this->input->post('fax'),
-		'website'=>$this->input->post('website'),
-		'default_tax_1_rate'=>$this->input->post('default_tax_1_rate'),		
-		'default_tax_1_name'=>$this->input->post('default_tax_1_name'),		
-		'default_tax_2_rate'=>$this->input->post('default_tax_2_rate'),	
-		'default_tax_2_name'=>$this->input->post('default_tax_2_name'),		
-		'currency_symbol'=>$this->input->post('currency_symbol'),
-		'currency_side'=>$this->input->post('currency_side'),/**GARRISON ADDED 4/20/2013**/
-		'return_policy'=>$this->input->post('return_policy'),
-		'language'=>$this->input->post('language'),
-		'timezone'=>$this->input->post('timezone'),
-        'tax_included'=>$this->input->post('tax_included'),
-		'recv_invoice_format'=>$this->input->post('recv_invoice_format'),
-		'sales_invoice_format'=>$this->input->post('sales_invoice_format'),
-		'receiving_calculate_average_price'=>$this->input->post('receiving_calculate_average_price'),
-		'thousands_separator'=>$this->input->post('thousands_separator'),
-		'decimal_point'=>$this->input->post('decimal_point'),
-		'lines_per_page'=>$this->input->post('lines_per_page'),
-		'default_sales_discount'=>$this->input->post('default_sales_discount'),
-		'custom1_name'=>$this->input->post('custom1_name'),/**GARRISON ADDED 4/20/2013**/
-		'custom2_name'=>$this->input->post('custom2_name'),/**GARRISON ADDED 4/20/2013**/
-		'custom3_name'=>$this->input->post('custom3_name'),/**GARRISON ADDED 4/20/2013**/
-		'custom4_name'=>$this->input->post('custom4_name'),/**GARRISON ADDED 4/20/2013**/
-		'custom5_name'=>$this->input->post('custom5_name'),/**GARRISON ADDED 4/20/2013**/
-		'custom6_name'=>$this->input->post('custom6_name'),/**GARRISON ADDED 4/20/2013**/
-		'custom7_name'=>$this->input->post('custom7_name'),/**GARRISON ADDED 4/20/2013**/
-		'custom8_name'=>$this->input->post('custom8_name'),/**GARRISON ADDED 4/20/2013**/
-		'custom9_name'=>$this->input->post('custom9_name'),/**GARRISON ADDED 4/20/2013**/
-		'custom10_name'=>$this->input->post('custom10_name')/**GARRISON ADDED 4/20/2013**/
+			'address'=>$this->input->post('address'),
+			'phone'=>$this->input->post('phone'),
+			'email'=>$this->input->post('email'),
+			'fax'=>$this->input->post('fax'),
+			'website'=>$this->input->post('website'),
+			'default_tax_1_rate'=>$this->input->post('default_tax_1_rate'),		
+			'default_tax_1_name'=>$this->input->post('default_tax_1_name'),		
+			'default_tax_2_rate'=>$this->input->post('default_tax_2_rate'),	
+			'default_tax_2_name'=>$this->input->post('default_tax_2_name'),		
+			'return_policy'=>$this->input->post('return_policy'),
+			'tax_included'=>$this->input->post('tax_included'),
+			'recv_invoice_format'=>$this->input->post('recv_invoice_format'),
+			'sales_invoice_format'=>$this->input->post('sales_invoice_format'),
+			'receiving_calculate_average_price'=>$this->input->post('receiving_calculate_average_price'),
+			'lines_per_page'=>$this->input->post('lines_per_page'),
+			'default_sales_discount'=>$this->input->post('default_sales_discount'),
+			'custom1_name'=>$this->input->post('custom1_name'),
+			'custom2_name'=>$this->input->post('custom2_name'),
+			'custom3_name'=>$this->input->post('custom3_name'),
+			'custom4_name'=>$this->input->post('custom4_name'),
+			'custom5_name'=>$this->input->post('custom5_name'),
+			'custom6_name'=>$this->input->post('custom6_name'),
+			'custom7_name'=>$this->input->post('custom7_name'),
+			'custom8_name'=>$this->input->post('custom8_name'),
+			'custom9_name'=>$this->input->post('custom9_name'),
+			'custom10_name'=>$this->input->post('custom10_name')
 		);
 		
 		if (!empty($upload_data['orig_name']))
@@ -71,9 +65,28 @@ class Config extends Secure_area
 		$this->_remove_duplicate_cookies();	
 	}
 	
+	function save_locale() 
+	{
+		$batch_save_data=array(	
+			'currency_symbol'=>$this->input->post('currency_symbol'),
+			'currency_side'=>$this->input->post('currency_side'),
+			'language'=>$this->input->post('language'),
+			'timezone'=>$this->input->post('timezone'),
+			'dateformat'=>$this->input->post('dateformat'),
+			'timeformat'=>$this->input->post('timeformat'),
+			'thousands_separator'=>$this->input->post('thousands_separator'),
+			'decimal_point'=>$this->input->post('decimal_point')
+		);
+	
+        $result = $this->Appconfig->batch_save( $batch_save_data );
+        $success = $result ? true : false;
+        echo json_encode(array('success'=>$success, 'message'=>$this->lang->line('config_saved_' . ($success ? '' : 'un') . 'successfully')));
+		$this->_remove_duplicate_cookies();
+	} 
+	
 	function stock_locations() 
 	{
-		$stock_locations = $this->Stock_locations->get_all()->result_array();
+		$stock_locations = $this->Stock_location->get_all()->result_array();
 		$this->load->view('partial/stock_locations', array('stock_locations' => $stock_locations));
 	} 
 	
@@ -92,7 +105,7 @@ class Config extends Secure_area
 	{
 		$this->db->trans_start();
 		
-		$deleted_locations = $this->Stock_locations->get_allowed_locations();
+		$deleted_locations = $this->Stock_location->get_allowed_locations();
 		foreach($this->input->post() as $key => $value)
 		{
 			if (strstr($key, 'stock_location'))
@@ -101,7 +114,7 @@ class Config extends Secure_area
 				unset($deleted_locations[$location_id]);
 				// save or update
 				$location_data = array('location_name' => $value);
-				if ($this->Stock_locations->save($location_data, $location_id))
+				if ($this->Stock_location->save($location_data, $location_id))
 				{
 					$this->_clear_session_state();
 				}
@@ -110,7 +123,7 @@ class Config extends Secure_area
 		// all locations not available in post will be deleted now
 		foreach ($deleted_locations as $location_id => $location_name)
 		{
-			$this->Stock_locations->delete($location_id);
+			$this->Stock_location->delete($location_id);
 		}
 		$success = $this->db->trans_complete();
 		echo json_encode(array('success'=>$success,'message'=>$this->lang->line('config_saved_' . ($success ? '' : 'un') . 'successfully')));
@@ -120,42 +133,42 @@ class Config extends Secure_area
     function save_barcode()
     {
         $batch_save_data=array(
-        'barcode_type'=>$this->input->post('barcode_type'),
-        'barcode_quality'=>$this->input->post('barcode_quality'),
-        'barcode_width'=>$this->input->post('barcode_width'),
-        'barcode_height'=>$this->input->post('barcode_height'),
-        'barcode_font'=>$this->input->post('barcode_font'),
-        'barcode_font_size'=>$this->input->post('barcode_font_size'),
-        'barcode_first_row'=>$this->input->post('barcode_first_row'),
-        'barcode_second_row'=>$this->input->post('barcode_second_row'),
-        'barcode_third_row'=>$this->input->post('barcode_third_row'),
-        'barcode_num_in_row'=>$this->input->post('barcode_num_in_row'),
-        'barcode_page_width'=>$this->input->post('barcode_page_width'),
-        'barcode_page_cellspacing'=>$this->input->post('barcode_page_cellspacing'),
-        'barcode_content'=>$this->input->post('barcode_content'),
+			'barcode_type'=>$this->input->post('barcode_type'),
+			'barcode_quality'=>$this->input->post('barcode_quality'),
+			'barcode_width'=>$this->input->post('barcode_width'),
+			'barcode_height'=>$this->input->post('barcode_height'),
+			'barcode_font'=>$this->input->post('barcode_font'),
+			'barcode_font_size'=>$this->input->post('barcode_font_size'),
+			'barcode_first_row'=>$this->input->post('barcode_first_row'),
+			'barcode_second_row'=>$this->input->post('barcode_second_row'),
+			'barcode_third_row'=>$this->input->post('barcode_third_row'),
+			'barcode_num_in_row'=>$this->input->post('barcode_num_in_row'),
+			'barcode_page_width'=>$this->input->post('barcode_page_width'),
+			'barcode_page_cellspacing'=>$this->input->post('barcode_page_cellspacing'),
+			'barcode_generate_if_empty'=>$this->input->post('barcode_generate_if_empty'),
+			'barcode_content'=>$this->input->post('barcode_content')
         );
         
         $result = $this->Appconfig->batch_save( $batch_save_data );
         $success = $result ? true : false;
         echo json_encode(array('success'=>$success, 'message'=>$this->lang->line('config_saved_' . ($success ? '' : 'un') . 'successfully')));
-        
     }
     
     function save_receipt()
     {
     	$batch_save_data = array (
-		'use_invoice_template' => $this->input->post ( 'use_invoice_template' ),
-		'invoice_default_comments' => $this->input->post ( 'invoice_default_comments' ),
-		'invoice_email_message' => $this->input->post ( 'invoice_email_message' ),
-		'receipt_show_taxes' => $this->input->post ( 'receipt_show_taxes' ),
-		'print_silently' => $this->input->post ( 'print_silently' ),
-		'print_header' => $this->input->post ( 'print_header' ),
-		'print_footer' => $this->input->post ( 'print_footer' ),
-		'print_top_margin' => $this->input->post ( 'print_top_margin' ),
-		'print_left_margin' => $this->input->post ( 'print_left_margin' ),
-		'print_bottom_margin' => $this->input->post ( 'print_bottom_margin' ),
-		'print_right_margin' => $this->input->post ( 'print_right_margin' ),
-    	'show_total_discount' => $this->input->post( 'show_total_discount' )
+			'use_invoice_template' => $this->input->post ( 'use_invoice_template' ),
+			'invoice_default_comments' => $this->input->post ( 'invoice_default_comments' ),
+			'invoice_email_message' => $this->input->post ( 'invoice_email_message' ),
+			'receipt_show_taxes' => $this->input->post ( 'receipt_show_taxes' ),
+			'print_silently' => $this->input->post ( 'print_silently' ),
+			'print_header' => $this->input->post ( 'print_header' ),
+			'print_footer' => $this->input->post ( 'print_footer' ),
+			'print_top_margin' => $this->input->post ( 'print_top_margin' ),
+			'print_left_margin' => $this->input->post ( 'print_left_margin' ),
+			'print_bottom_margin' => $this->input->post ( 'print_bottom_margin' ),
+			'print_right_margin' => $this->input->post ( 'print_right_margin' ),
+			'show_total_discount' => $this->input->post( 'show_total_discount' )
 		);
     	$result = $this->Appconfig->batch_save( $batch_save_data );
     	$success = $result ? true : false;
@@ -174,9 +187,7 @@ class Config extends Secure_area
     			'file_name' => 'company_logo');
     	$this->load->library('upload', $config);
     	$this->upload->do_upload('company_logo');
-    	return strlen($this->upload->display_errors()) == 0 ||
-    	!strcmp($this->upload->display_errors(),
-    			'<p>'.$this->lang->line('upload_no_file_selected').'</p>');
+    	return strlen($this->upload->display_errors()) == 0 || !strcmp($this->upload->display_errors(), '<p>'.$this->lang->line('upload_no_file_selected').'</p>');
     }
     
     function backup_db()
@@ -186,13 +197,13 @@ class Config extends Secure_area
     	{
     		$this->load->dbutil();
     		$prefs = array(
-    				'format'      => 'zip',
-    				'filename'    => 'ospos.sql'
+				'format'      => 'zip',
+				'filename'    => 'ospos.sql'
     		);
     		 
     		$backup =& $this->dbutil->backup($prefs);
     		 
-			$file_name =  'ospos-' . date("Y-m-d-H-i-s") .'.zip';
+			$file_name = 'ospos-' . date("Y-m-d-H-i-s") .'.zip';
     		$save = 'uploads/'.$file_name;
     		$this->load->helper('download');
     		while (ob_get_level()) {

application/controllers/giftcards.php

@@ -1,6 +1,7 @@
 <?php
 require_once ("secure_area.php");
 require_once ("interfaces/idata_controller.php");
+
 class Giftcards extends Secure_area implements iData_controller
 {
 	function __construct()
@@ -10,13 +11,13 @@ class Giftcards extends Secure_area implements iData_controller
 
 	function index($limit_from=0)
 	{
-		$data['controller_name']=$this->get_controller_name();
-		$data['form_width']=$this->get_form_width();
+		$data['controller_name'] = $this->get_controller_name();
+		$data['form_width'] = $this->get_form_width();
 		$lines_per_page = $this->Appconfig->get('lines_per_page');
-		$giftcards = $this->Giftcard->get_all($lines_per_page,$limit_from);
-		$data['links'] = $this->_initialize_pagination($this->Giftcard,$lines_per_page,$limit_from);
-		$data['manage_table']=get_giftcards_manage_table($giftcards,$this);
-		$this->load->view('giftcards/manage',$data);
+		$giftcards = $this->Giftcard->get_all($lines_per_page, $limit_from);
+		$data['links'] = $this->_initialize_pagination($this->Giftcard, $lines_per_page, $limit_from);
+		$data['manage_table'] = get_giftcards_manage_table($giftcards, $this);
+		$this->load->view('giftcards/manage', $data);
 	}
 
 	function search()
@@ -26,8 +27,8 @@ class Giftcards extends Secure_area implements iData_controller
 		$lines_per_page = $this->Appconfig->get('lines_per_page');
 		$giftcards = $this->Giftcard->search($search, $lines_per_page, $limit_from);
 		$total_rows = $this->Giftcard->get_found_rows($search);
-		$links = $this->_initialize_pagination($this->Giftcard,$lines_per_page, $limit_from, $total_rows);
-		$data_rows=get_giftcards_manage_table_data_rows($giftcards,$this);
+		$links = $this->_initialize_pagination($this->Giftcard, $lines_per_page, $limit_from, $total_rows);
+		$data_rows = get_giftcards_manage_table_data_rows($giftcards, $this);
 		echo json_encode(array('total_rows' => $total_rows, 'rows' => $data_rows, 'pagination' => $links));
 	}
 
@@ -36,23 +37,23 @@ class Giftcards extends Secure_area implements iData_controller
 	*/
 	function suggest()
 	{
-		$suggestions = $this->Giftcard->get_search_suggestions($this->input->post('q'),$this->input->post('limit'));
+		$suggestions = $this->Giftcard->get_search_suggestions($this->input->post('q'), $this->input->post('limit'));
 		echo implode("\n",$suggestions);
 	}
-/** GARRISON ADDED 5/3/2013 **/
+
 	/*
 	 Gives search suggestions for person_id based on what is being searched for
 	*/
 	function person_search()
 	{
-		$suggestions = $this->Customer->get_customer_search_suggestions($this->input->post('q'),$this->input->post('limit'));
+		$suggestions = $this->Customer->get_customer_search_suggestions($this->input->post('q'), $this->input->post('limit'));
 		echo implode("\n",$suggestions);
 	}
-/** END GARRISON ADDED **/
+
 	function get_row()
 	{
 		$giftcard_id = $this->input->post('row_id');
-		$data_row=get_giftcard_data_row($this->Giftcard->get_info($giftcard_id),$this);
+		$data_row = get_giftcard_data_row($this->Giftcard->get_info($giftcard_id), $this);
 		echo $data_row;
 	}
 
@@ -61,7 +62,7 @@ class Giftcards extends Secure_area implements iData_controller
 		$giftcard_info = $this->Giftcard->get_info($giftcard_id);
 		$person_name=$giftcard_id > 0? $giftcard_info->first_name . ' ' . $giftcard_info->last_name : '';
 		$data['selected_person'] = $giftcard_id > 0 && isset($giftcard_info->person_id) ? $giftcard_info->person_id . "|" . $person_name : "";
-		$data['giftcard_number']= $giftcard_id > 0 ? $giftcard_info->giftcard_number : $this->Giftcard->get_max_number()->giftcard_number + 1;
+		$data['giftcard_number'] = $giftcard_id > 0 ? $giftcard_info->giftcard_number : $this->Giftcard->get_max_number()->giftcard_number + 1;
 		$data['giftcard_info'] = $giftcard_info;
 		$this->load->view("giftcards/form",$data);
 	}
@@ -70,9 +71,9 @@ class Giftcards extends Secure_area implements iData_controller
 	{
 		$giftcard_data = array(
 			'record_time' => date('Y-m-d H:i:s'),
-			'giftcard_number'=>$this->input->post('giftcard_number',TRUE),
-			'value'=>$this->input->post('value',TRUE),
-			'person_id'=>$this->input->post('person_id',TRUE)?$this->input->post('person_id'):NULL		
+			'giftcard_number'=>$this->input->post('giftcard_number', TRUE),
+			'value'=>$this->input->post('value', TRUE),
+			'person_id'=>$this->input->post('person_id', TRUE) ? $this->input->post('person_id') : NULL		
 		);
 
 		if( $this->Giftcard->save( $giftcard_data, $giftcard_id ) )
@@ -80,20 +81,20 @@ class Giftcards extends Secure_area implements iData_controller
 			//New giftcard
 			if($giftcard_id==-1)
 			{
-				echo json_encode(array('success'=>true,'message'=>$this->lang->line('giftcards_successful_adding').' '.
-				$giftcard_data['giftcard_number'],'giftcard_id'=>$giftcard_data['giftcard_id']));
+				echo json_encode(array('success'=>true, 'message'=>$this->lang->line('giftcards_successful_adding').' '.
+								$giftcard_data['giftcard_number'], 'giftcard_id'=>$giftcard_data['giftcard_id']));
 				$giftcard_id = $giftcard_data['giftcard_id'];
 			}
 			else //previous giftcard
 			{
-				echo json_encode(array('success'=>true,'message'=>$this->lang->line('giftcards_successful_updating').' '.
-				$giftcard_data['giftcard_number'],'giftcard_id'=>$giftcard_id));
+				echo json_encode(array('success'=>true, 'message'=>$this->lang->line('giftcards_successful_updating').' '.
+								$giftcard_data['giftcard_number'], 'giftcard_id'=>$giftcard_id));
 			}
 		}
 		else//failure
 		{
 			echo json_encode(array('success'=>false,'message'=>$this->lang->line('giftcards_error_adding_updating').' '.
-			$giftcard_data['giftcard_number'],'giftcard_id'=>-1));
+							$giftcard_data['giftcard_number'], 'giftcard_id'=>-1));
 		}
 	}
 
@@ -103,12 +104,12 @@ class Giftcards extends Secure_area implements iData_controller
 
 		if($this->Giftcard->delete_list($giftcards_to_delete))
 		{
-			echo json_encode(array('success'=>true,'message'=>$this->lang->line('giftcards_successful_deleted').' '.
-			count($giftcards_to_delete).' '.$this->lang->line('giftcards_one_or_multiple')));
+			echo json_encode(array('success'=>true, 'message'=>$this->lang->line('giftcards_successful_deleted').' '.
+							count($giftcards_to_delete).' '.$this->lang->line('giftcards_one_or_multiple')));
 		}
 		else
 		{
-			echo json_encode(array('success'=>false,'message'=>$this->lang->line('giftcards_cannot_be_deleted')));
+			echo json_encode(array('success'=>false, 'message'=>$this->lang->line('giftcards_cannot_be_deleted')));
 		}
 	}
 		

application/controllers/item_kits.php

@@ -8,15 +8,41 @@ class Item_kits extends Secure_area implements iData_controller
 		parent::__construct('item_kits');
 	}
 	
+	// add the total cost and retail price to a passed items kit retrieving the data from each singolar item part of the kit
+	private function add_totals_to_item_kit($item_kit)
+	{
+		$item_kit->total_cost_price = 0;
+		$item_kit->total_unit_price = 0;
+		
+		foreach ($this->Item_kit_items->get_info($item_kit->item_kit_id) as $item_kit_item)
+		{
+			$item_info = $this->Item->get_info($item_kit_item['item_id']);
+			
+			$item_kit->total_cost_price += $item_info->cost_price * $item_kit_item['quantity'];
+			$item_kit->total_unit_price += $item_info->unit_price * $item_kit_item['quantity'];
+		}
+
+		return $item_kit;
+	}
+	
 	function index($limit_from=0)
 	{
-		$data['controller_name']=$this->get_controller_name();
-		$data['form_width']=$this->get_form_width();
+		$data['controller_name'] = $this->get_controller_name();
+		$data['form_width'] = $this->get_form_width();
 		$lines_per_page = $this->Appconfig->get('lines_per_page');
-		$item_kits = $this->Item_kit->get_all($lines_per_page,$limit_from);
-		$data['links'] = $this->_initialize_pagination($this->Item_kit,$lines_per_page,$limit_from);
-		$data['manage_table']=get_item_kits_manage_table($item_kits,$this);
-		$this->load->view('item_kits/manage',$data);
+		$item_kits = $this->Item_kit->get_all($lines_per_page, $limit_from);
+		
+		foreach($item_kits->result() as $item_kit)
+		{
+			// calculate the total cost and retail price of the Kit so it can be printed out in the manage table
+			$item_kit = $this->add_totals_to_item_kit($item_kit);
+		}
+		
+		$data['links'] = $this->_initialize_pagination($this->Item_kit, $lines_per_page, $limit_from);
+		$data['manage_table'] = get_item_kits_manage_table($item_kits, $this);
+
+		$this->load->view('item_kits/manage', $data);
+		$this->_remove_duplicate_cookies();
 	}
 	
 	function search()
@@ -24,10 +50,19 @@ class Item_kits extends Secure_area implements iData_controller
 		$search = $this->input->post('search');
 		$limit_from = $this->input->post('limit_from');
 		$lines_per_page = $this->Appconfig->get('lines_per_page');
-		$customers = $this->Item_kit->search($search, $lines_per_page, $limit_from);
+		$item_kits = $this->Item_kit->search($search, $lines_per_page, $limit_from);
 		$total_rows = $this->Item_kit->get_found_rows($search);
-		$links = $this->_initialize_pagination($this->Item_kit,$lines_per_page, $limit_from, $total_rows);
-		$data_rows=get_item_kits_manage_table_data_rows($customers,$this);
+		$links = $this->_initialize_pagination($this->Item_kit, $lines_per_page, $limit_from, $total_rows, 'search');
+
+		foreach($item_kits->result() as $item_kit)
+		{
+			// calculate the total cost and retail price of the Kit so it can be printed out in the manage table
+			$item_kit = $this->add_totals_to_item_kit($item_kit);
+		}
+
+		$data_rows = get_item_kits_manage_table_data_rows($item_kits, $this);
+		$this->_remove_duplicate_cookies();
+
 		echo json_encode(array('total_rows' => $total_rows, 'rows' => $data_rows, 'pagination' => $links));
 	}
 
@@ -36,43 +71,51 @@ class Item_kits extends Secure_area implements iData_controller
 	*/
 	function suggest()
 	{
-		$suggestions = $this->Item_kit->get_search_suggestions($this->input->post('q'),$this->input->post('limit'));
-		echo implode("\n",$suggestions);
+		$suggestions = $this->Item_kit->get_search_suggestions($this->input->post('q'), $this->input->post('limit'));
+
+		echo implode("\n", $suggestions);
 	}
 
 	function get_row()
 	{
 		$item_kit_id = $this->input->post('row_id');
-		$data_row=get_item_kit_data_row($this->Item_kit->get_info($item_kit_id),$this);
-		echo $data_row;
+
+		// calculate the total cost and retail price of the Kit so it can be added to the table refresh
+		$item_kit = $this->add_totals_to_item_kit($this->Item_kit->get_info($item_kit_id));
+		
+		echo (get_item_kit_data_row($item_kit, $this));
+		$this->_remove_duplicate_cookies();
 	}
 
 	function view($item_kit_id=-1)
 	{
-		$data['item_kit_info']=$this->Item_kit->get_info($item_kit_id);
-		$this->load->view("item_kits/form",$data);
+		$data['item_kit_info'] = $this->Item_kit->get_info($item_kit_id);
+		$this->load->view("item_kits/form", $data);
 	}
 	
 	function save($item_kit_id=-1)
 	{
 		$item_kit_data = array(
-		'name'=>$this->input->post('name'),
-		'description'=>$this->input->post('description')
+			'name' => $this->input->post('name'),
+			'description' => $this->input->post('description')
 		);
 		
-		if($this->Item_kit->save($item_kit_data,$item_kit_id))
+		if ($this->Item_kit->save($item_kit_data, $item_kit_id))
 		{
 			//New item kit
-			if($item_kit_id==-1)
+			if ($item_kit_id==-1)
 			{
-				echo json_encode(array('success'=>true,'message'=>$this->lang->line('item_kits_successful_adding').' '.
-				$item_kit_data['name'],'item_kit_id'=>$item_kit_data['item_kit_id']));
 				$item_kit_id = $item_kit_data['item_kit_id'];
+				
+				echo json_encode(array('success'=>true,
+									'message'=>$this->lang->line('item_kits_successful_adding').' '.$item_kit_data['name'],
+									'item_kit_id'=>$item_kit_id));
 			}
 			else //previous item
 			{
-				echo json_encode(array('success'=>true,'message'=>$this->lang->line('item_kits_successful_updating').' '.
-				$item_kit_data['name'],'item_kit_id'=>$item_kit_id));
+				echo json_encode(array('success'=>true, 
+									'message'=>$this->lang->line('item_kits_successful_updating').' '.$item_kit_data['name'],
+									'item_kit_id'=>$item_kit_id));
 			}
 			
 			if ($this->input->post('item_kit_item'))
@@ -83,7 +126,7 @@ class Item_kits extends Secure_area implements iData_controller
 					$item_kit_items[] = array(
 						'item_id' => $item_id,
 						'quantity' => $quantity
-						);
+					);
 				}
 			
 				$this->Item_kit_items->save($item_kit_items, $item_kit_id);
@@ -91,24 +134,25 @@ class Item_kits extends Secure_area implements iData_controller
 		}
 		else//failure
 		{
-			echo json_encode(array('success'=>false,'message'=>$this->lang->line('item_kits_error_adding_updating').' '.
-			$item_kit_data['name'],'item_kit_id'=>-1));
+			echo json_encode(array('success'=>false, 
+								'message'=>$this->lang->line('item_kits_error_adding_updating').' '.$item_kit_data['name'],
+								'item_kit_id'=>-1));
 		}
-
 	}
 	
 	function delete()
 	{
-		$item_kits_to_delete=$this->input->post('ids');
+		$item_kits_to_delete = $this->input->post('ids');
 
-		if($this->Item_kit->delete_list($item_kits_to_delete))
+		if ($this->Item_kit->delete_list($item_kits_to_delete))
 		{
-			echo json_encode(array('success'=>true,'message'=>$this->lang->line('item_kits_successful_deleted').' '.
-			count($item_kits_to_delete).' '.$this->lang->line('item_kits_one_or_multiple')));
+			echo json_encode(array('success'=>true,
+								'message'=>$this->lang->line('item_kits_successful_deleted').' '.count($item_kits_to_delete).' '.$this->lang->line('item_kits_one_or_multiple')));
 		}
 		else
 		{
-			echo json_encode(array('success'=>false,'message'=>$this->lang->line('item_kits_cannot_be_deleted')));
+			echo json_encode(array('success'=>false,
+								'message'=>$this->lang->line('item_kits_cannot_be_deleted')));
 		}
 	}
 	
@@ -119,19 +163,25 @@ class Item_kits extends Secure_area implements iData_controller
 
 		$item_kit_ids = explode(':', $item_kit_ids);
 		foreach ($item_kit_ids as $item_kid_id)
-		{
-			$item_kit_info = $this->Item_kit->get_info($item_kid_id);
+		{		
+			// calculate the total cost and retail price of the Kit so it can be added to the barcode text at the bottom
+			$item_kit = $this->add_totals_to_item_kit($this->Item_kit->get_info($item_kid_id));
 
-			$result[] = array('name' =>$item_kit_info->name, 'item_id'=> 'KIT '.$item_kid_id, 'item_number'=>'KIT '.$item_kid_id);
+			$result[] = array('name'=>$item_kit->name, 'item_id'=>'KIT '.$item_kid_id, 'item_number'=>'KIT '.$item_kid_id, 'cost_price'=>$item_kit->total_cost_price, 'unit_price'=>$item_kit->total_unit_price);
 		}
 
 		$data['items'] = $result;
-        $data['configs'] = $this->Appconfig->get_all();
-        $data['barcode_config'] = $this->barcode_lib->get_barcode_config();
+        $barcode_config = $this->barcode_lib->get_barcode_config();
+		// in case the selected barcode type is not Code39 or Code128 we set by default Code128
+		// the rationale for this is that EAN codes cannot have strings as seed, so 'KIT ' is not allowed
+		if($barcode_config['barcode_type'] != 'Code39' && $barcode_config['barcode_type'] != 'Code128')
+		{
+			$barcode_config['barcode_type'] = 'Code128';
+		}
+		$data['barcode_config'] = $barcode_config;
 		$this->load->view("barcode_sheet", $data);
 	}
-	
-	
+
 	/*
 	get the width for the add/edit form
 	*/

application/controllers/items.php

@@ -1,6 +1,7 @@
 <?php
 require_once ("secure_area.php");
 require_once ("interfaces/idata_controller.php");
+
 class Items extends Secure_area implements iData_controller
 {
 	function __construct()
@@ -11,19 +12,33 @@ class Items extends Secure_area implements iData_controller
 	
 	function index($limit_from=0)
 	{
-		$stock_location=$this->item_lib->get_item_location();
-		$stock_locations=$this->Stock_locations->get_allowed_locations();
+		$stock_location = $this->item_lib->get_item_location();
+		$stock_locations = $this->Stock_location->get_allowed_locations();
 		
-		$data['controller_name']=$this->get_controller_name();
-		$data['form_width']=$this->get_form_width();
+		$data['controller_name'] = $this->get_controller_name();
+		$data['form_width'] = $this->get_form_width();
 		$lines_per_page = $this->Appconfig->get('lines_per_page');
-		$items = $this->Item->get_all($stock_location,$lines_per_page,$limit_from);
-		$data['links'] = $this->_initialize_pagination($this->Item,$lines_per_page,$limit_from);
+		$items = $this->Item->get_all($stock_location, $lines_per_page, $limit_from);
+		$data['links'] = $this->_initialize_pagination($this->Item, $lines_per_page, $limit_from);
 		
-		$data['stock_location']=$stock_location;
-		$data['stock_locations']=$stock_locations;
-		$data['manage_table']=get_items_manage_table( $this->Item->get_all( $stock_location, $lines_per_page, $limit_from), $this );
-		$this->load->view('items/manage',$data);
+		// assume year 2010 as starting date for OSPOS
+		$start_of_time = date($this->config->item('dateformat'), mktime(0,0,0,1,1,2010));
+		$today = date($this->config->item('dateformat'));
+
+		$start_date = $this->input->post('start_date') != NULL ? $this->input->post('start_date', TRUE) : $start_of_time;
+		$start_date_formatter = date_create_from_format($this->config->item('dateformat'), $start_date);
+		$end_date = $this->input->post('end_date') != NULL ? $this->input->post('end_date', TRUE) : $today;
+		$end_date_formatter = date_create_from_format($this->config->item('dateformat'), $end_date);
+		
+		$data['start_date'] = $start_date_formatter->format($this->config->item('dateformat'));
+		$data['end_date'] = $end_date_formatter->format($this->config->item('dateformat'));
+	
+		$data['stock_location'] = $stock_location;
+		$data['stock_locations'] = $stock_locations;
+		$data['manage_table'] = get_items_manage_table( $this->Item->get_all($stock_location, $lines_per_page, $limit_from), $this );
+
+		$this->load->view('items/manage', $data);
+
 		$this->_remove_duplicate_cookies();
 	}
 
@@ -37,21 +52,37 @@ class Items extends Secure_area implements iData_controller
 	{
 		$search = $this->input->post('search');
 		$this->item_lib->set_item_location($this->input->post('stock_location'));
-		$stock_location=$this->item_lib->get_item_location();
 		$data['search_section_state'] = $this->input->post('search_section_state');
-		$low_inventory=$this->input->post('low_inventory');
-		$is_serialized=$this->input->post('is_serialized');
-		$no_description=$this->input->post('no_description');
-		$search_custom=$this->input->post('search_custom');
-		$is_deleted=$this->input->post('is_deleted'); // Parq 131215
 		$limit_from = $this->input->post('limit_from');
 		$lines_per_page = $this->Appconfig->get('lines_per_page');
-		$items = $this->Item->search($search,$stock_location,$low_inventory,$is_serialized,$no_description,$search_custom,$is_deleted,$lines_per_page,$limit_from);
-		$data_rows=get_items_manage_table_data_rows($items,$this);
-		$total_rows = $this->Item->get_found_rows($search,$stock_location,$low_inventory,$is_serialized,$no_description,$search_custom,$is_deleted);
+
+		// assume year 2010 as starting date for OSPOS
+		$start_of_time = date($this->config->item('dateformat'), mktime(0,0,0,1,1,2010));
+		$today = date($this->config->item('dateformat'));
+
+		$start_date = $this->input->post('start_date') != NULL ? $this->input->post('start_date', TRUE) : $start_of_time;
+		$start_date_formatter = date_create_from_format($this->config->item('dateformat'), $start_date);
+		$end_date = $this->input->post('end_date') != NULL ? $this->input->post('end_date', TRUE) : $today;
+		$end_date_formatter = date_create_from_format($this->config->item('dateformat'), $end_date);
+		
+		$filters = array('start_date' => $start_date_formatter->format('Y-m-d'), 
+						'end_date' => $end_date_formatter->format('Y-m-d'),
+						'stock_location_id' => $this->item_lib->get_item_location(),
+						'empty_upc' => $this->input->post('empty_upc'),
+						'low_inventory' => $this->input->post('low_inventory'), 
+						'is_serialized' => $this->input->post('is_serialized'),
+						'no_description' => $this->input->post('no_description'),
+						'search_custom' => $this->input->post('search_custom'),
+						'is_deleted' => $this->input->post('is_deleted'));
+		
+		$items = $this->Item->search($search, $filters, $lines_per_page, $limit_from);
+		$data_rows = get_items_manage_table_data_rows($items, $this);
+		$total_rows = $this->Item->get_found_rows($search, $filters);
 		$links = $this->_initialize_pagination($this->Item, $lines_per_page, $limit_from, $total_rows, 'search');
-		$data_rows=get_items_manage_table_data_rows($items,$this);
+		$data_rows = get_items_manage_table_data_rows($items, $this);
+		// do not move this line to be after the json_encode otherwise the searhc function won't work!!
 		$this->_remove_duplicate_cookies();
+		
 		echo json_encode(array('total_rows' => $total_rows, 'rows' => $data_rows, 'pagination' => $links));
 	}
 	
@@ -88,13 +119,16 @@ class Items extends Secure_area implements iData_controller
 	*/
 	function suggest()
 	{
-		$suggestions = $this->Item->get_search_suggestions($this->input->post('q'),$this->input->post('limit'));
+		$suggestions = $this->Item->get_search_suggestions($this->input->post('q'), $this->input->post('limit'),
+															$this->input->post('search_custom'), $this->input->post('is_deleted'));
+
 		echo implode("\n",$suggestions);
 	}
 	
 	function item_search()
 	{
-		$suggestions = $this->Item->get_item_search_suggestions($this->input->post('q'),$this->input->post('limit'),'warehouse');
+		$suggestions = $this->Item->get_item_search_suggestions($this->input->post('q'), $this->input->post('limit'));
+
 		echo implode("\n",$suggestions);
 	}
 
@@ -104,16 +138,17 @@ class Items extends Secure_area implements iData_controller
 	function suggest_category()
 	{
 		$suggestions = $this->Item->get_category_suggestions($this->input->post('q'));
+
 		echo implode("\n",$suggestions);
 	}
 
-/**GARRISON ADDED 5/18/2013**/	
 	/*
 	 Gives search suggestions based on what is being searched for
 	*/
 	function suggest_location()
 	{
 		$suggestions = $this->Item->get_location_suggestions($this->input->post('q'));
+
 		echo implode("\n",$suggestions);
 	}
 	
@@ -123,6 +158,7 @@ class Items extends Secure_area implements iData_controller
 	function suggest_custom1()
 	{
 		$suggestions = $this->Item->get_custom1_suggestions($this->input->post('q'));
+
 		echo implode("\n",$suggestions);
 	}
 	
@@ -132,6 +168,7 @@ class Items extends Secure_area implements iData_controller
 	function suggest_custom2()
 	{
 		$suggestions = $this->Item->get_custom2_suggestions($this->input->post('q'));
+
 		echo implode("\n",$suggestions);
 	}
 	
@@ -141,6 +178,7 @@ class Items extends Secure_area implements iData_controller
 	function suggest_custom3()
 	{
 		$suggestions = $this->Item->get_custom3_suggestions($this->input->post('q'));
+
 		echo implode("\n",$suggestions);
 	}
 	
@@ -150,6 +188,7 @@ class Items extends Secure_area implements iData_controller
 	function suggest_custom4()
 	{
 		$suggestions = $this->Item->get_custom4_suggestions($this->input->post('q'));
+
 		echo implode("\n",$suggestions);
 	}
 	
@@ -159,6 +198,7 @@ class Items extends Secure_area implements iData_controller
 	function suggest_custom5()
 	{
 		$suggestions = $this->Item->get_custom5_suggestions($this->input->post('q'));
+
 		echo implode("\n",$suggestions);
 	}
 	
@@ -168,6 +208,7 @@ class Items extends Secure_area implements iData_controller
 	function suggest_custom6()
 	{
 		$suggestions = $this->Item->get_custom6_suggestions($this->input->post('q'));
+
 		echo implode("\n",$suggestions);
 	}
 	
@@ -177,6 +218,7 @@ class Items extends Secure_area implements iData_controller
 	function suggest_custom7()
 	{
 		$suggestions = $this->Item->get_custom7_suggestions($this->input->post('q'));
+
 		echo implode("\n",$suggestions);
 	}
 	
@@ -186,6 +228,7 @@ class Items extends Secure_area implements iData_controller
 	function suggest_custom8()
 	{
 		$suggestions = $this->Item->get_custom8_suggestions($this->input->post('q'));
+
 		echo implode("\n",$suggestions);
 	}
 	
@@ -195,6 +238,7 @@ class Items extends Secure_area implements iData_controller
 	function suggest_custom9()
 	{
 		$suggestions = $this->Item->get_custom9_suggestions($this->input->post('q'));
+
 		echo implode("\n",$suggestions);
 	}
 	
@@ -204,21 +248,21 @@ class Items extends Secure_area implements iData_controller
 	function suggest_custom10()
 	{
 		$suggestions = $this->Item->get_custom10_suggestions($this->input->post('q'));
+
 		echo implode("\n",$suggestions);
 	}
-
-/**END GARRISON ADDED**/
 		
 	function get_row()
 	{
 		$item_id = $this->input->post('row_id');
 		$item_info = $this->Item->get_info($item_id);
 		$stock_location = $this->item_lib->get_item_location();
-		$item_quantity = $this->Item_quantities->get_item_quantity($item_id,$stock_location);
+		$item_quantity = $this->Item_quantity->get_item_quantity($item_id,$stock_location);
 		$item_info->quantity = $item_quantity->quantity; 
-		$data_row=get_item_data_row($item_info,$this);
+		$data_row = get_item_data_row($item_info,$this);
 		
 		echo $data_row;
+
 		$this->_remove_duplicate_cookies();
 	}
 
@@ -237,33 +281,31 @@ class Items extends Secure_area implements iData_controller
 		$data['default_tax_1_rate']=($item_id==-1) ? $this->Appconfig->get('default_tax_1_rate') : '';
 		$data['default_tax_2_rate']=($item_id==-1) ? $this->Appconfig->get('default_tax_2_rate') : '';
         
-        $locations_data = $this->Stock_locations->get_undeleted_all()->result_array();
+        $locations_data = $this->Stock_location->get_undeleted_all()->result_array();
         foreach($locations_data as $location)
         {
-           $quantity = $this->Item_quantities->get_item_quantity($item_id,$location['location_id'])->quantity;
+           $quantity = $this->Item_quantity->get_item_quantity($item_id,$location['location_id'])->quantity;
            $quantity = ($item_id == -1) ? null: $quantity;
-           $location_array[$location['location_id']] =  array('location_name'=>$location['location_name'],
-                                                                       'quantity'=>$quantity);
-           $data['stock_locations']= $location_array;
+           $location_array[$location['location_id']] =  array('location_name'=>$location['location_name'], 'quantity'=>$quantity);
+           $data['stock_locations'] = $location_array;
         }
-		$this->load->view("items/form",$data);
-	}
 
+		$this->load->view("items/form", $data);
+	}
     
-	//Ramel Inventory Tracking
 	function inventory($item_id=-1)
 	{
 		$data['item_info']=$this->Item->get_info($item_id);
         
         $data['stock_locations'] = array();
-        $stock_locations = $this->Stock_locations->get_undeleted_all()->result_array();          
+        $stock_locations = $this->Stock_location->get_undeleted_all()->result_array();
         foreach($stock_locations as $location_data)
         {            
             $data['stock_locations'][$location_data['location_id']] = $location_data['location_name'];
-            $data['item_quantities'][$location_data['location_id']] = $this->Item_quantities->get_item_quantity($item_id,$location_data['location_id'])->quantity;
+            $data['item_quantities'][$location_data['location_id']] = $this->Item_quantity->get_item_quantity($item_id,$location_data['location_id'])->quantity;
         }     
         
-		$this->load->view("items/inventory",$data);
+		$this->load->view("items/inventory", $data);
 	}
 	
 	function count_details($item_id=-1)
@@ -271,15 +313,15 @@ class Items extends Secure_area implements iData_controller
 		$data['item_info']=$this->Item->get_info($item_id);
         
         $data['stock_locations'] = array();
-        $stock_locations = $this->Stock_locations->get_undeleted_all()->result_array();   
+        $stock_locations = $this->Stock_location->get_undeleted_all()->result_array();
         foreach($stock_locations as $location_data)
         {            
             $data['stock_locations'][$location_data['location_id']] = $location_data['location_name'];
-            $data['item_quantities'][$location_data['location_id']] = $this->Item_quantities->get_item_quantity($item_id,$location_data['location_id'])->quantity;
+            $data['item_quantities'][$location_data['location_id']] = $this->Item_quantity->get_item_quantity($item_id,$location_data['location_id'])->quantity;
         }     
                 
-		$this->load->view("items/count_details",$data);
-	} //------------------------------------------- Ramel
+		$this->load->view("items/count_details", $data);
+	}
 
 	function generate_barcodes($item_ids)
 	{
@@ -288,10 +330,34 @@ class Items extends Secure_area implements iData_controller
 
 		$item_ids = explode(':', $item_ids);
 		$result = $this->Item->get_multiple_info($item_ids)->result_array();
+		$config = $this->barcode_lib->get_barcode_config();
 
+		$data['barcode_config'] = $config;
+		
+		// check the list of items to see if any item_number field is empty
+		foreach($result as &$item)
+		{
+			// update the UPC/EAN/ISBN field if empty / null with the newly generated barcode
+			if (empty($item['item_number']) && $this->Appconfig->get('barcode_generate_if_empty'))
+			{
+				// get the newly generated barcode
+				$barcode_instance = Barcode_lib::barcode_instance($item, $config);
+				$item['item_number'] = $barcode_instance->getData();
+				// remove from item any suppliers table info to avoid save failure because of unknown fields
+				// WARNING: if suppliers table is changed this list needs to be upgraded, which makes the matter a bit tricky to maintain
+				unset($item['person_id']);
+				unset($item['company_name']);
+				unset($item['account_number']);
+				unset($item['agency_name']);
+				
+				// update the item in the database in order to save the UPC/EAN/ISBN field
+				$this->Item->save($item, $item['item_id']);
+			}
+		}
 		$data['items'] = $result;
-		$data['barcode_config'] = $this->barcode_lib->get_barcode_config();
+		// display barcodes
 		$this->load->view("barcode_sheet", $data);
+
 	}
 
 	function bulk_edit()
@@ -300,7 +366,7 @@ class Items extends Secure_area implements iData_controller
 		$suppliers = array('' => $this->lang->line('items_none'));
 		foreach($this->Supplier->get_all()->result_array() as $row)
 		{
-			$suppliers[$row['person_id']] = $row['first_name'] .' '. $row['last_name'];
+			$suppliers[$row['person_id']] = $row['company_name'];
 		}
 		$data['suppliers'] = $suppliers;
 		$data['allow_alt_description_choices'] = array(
@@ -312,6 +378,7 @@ class Items extends Secure_area implements iData_controller
 			''=>$this->lang->line('items_do_nothing'), 
 			1 =>$this->lang->line('items_change_all_to_serialized'),
 			0 =>$this->lang->line('items_change_all_to_unserialized'));
+
 		$this->load->view("items/form_bulk", $data);
 	}
 
@@ -321,28 +388,28 @@ class Items extends Secure_area implements iData_controller
 		$upload_data = $this->upload->data();
         //Save item data
 		$item_data = array(
-		'name'=>$this->input->post('name'),
-		'description'=>$this->input->post('description'),
-		'category'=>$this->input->post('category'),
-		'supplier_id'=>$this->input->post('supplier_id')=='' ? null:$this->input->post('supplier_id'),
-		'item_number'=>$this->input->post('item_number')=='' ? null:$this->input->post('item_number'),
-		'cost_price'=>$this->input->post('cost_price'),
-		'unit_price'=>$this->input->post('unit_price'),
-		'reorder_level'=>$this->input->post('reorder_level'),
-		'receiving_quantity'=>$this->input->post('receiving_quantity'),
-		'allow_alt_description'=>$this->input->post('allow_alt_description'),
-		'is_serialized'=>$this->input->post('is_serialized'),
-		'deleted'=>$this->input->post('is_deleted'),  /** Parq 131215 **/
-		'custom1'=>$this->input->post('custom1'),	/**GARRISON ADDED 4/21/2013**/			
-		'custom2'=>$this->input->post('custom2'),/**GARRISON ADDED 4/21/2013**/
-		'custom3'=>$this->input->post('custom3'),/**GARRISON ADDED 4/21/2013**/
-		'custom4'=>$this->input->post('custom4'),/**GARRISON ADDED 4/21/2013**/
-		'custom5'=>$this->input->post('custom5'),/**GARRISON ADDED 4/21/2013**/
-		'custom6'=>$this->input->post('custom6'),/**GARRISON ADDED 4/21/2013**/
-		'custom7'=>$this->input->post('custom7'),/**GARRISON ADDED 4/21/2013**/
-		'custom8'=>$this->input->post('custom8'),/**GARRISON ADDED 4/21/2013**/
-		'custom9'=>$this->input->post('custom9'),/**GARRISON ADDED 4/21/2013**/
-		'custom10'=>$this->input->post('custom10')/**GARRISON ADDED 4/21/2013**/
+			'name'=>$this->input->post('name'),
+			'description'=>$this->input->post('description'),
+			'category'=>$this->input->post('category'),
+			'supplier_id'=>$this->input->post('supplier_id')=='' ? null:$this->input->post('supplier_id'),
+			'item_number'=>$this->input->post('item_number')=='' ? null:$this->input->post('item_number'),
+			'cost_price'=>$this->input->post('cost_price'),
+			'unit_price'=>$this->input->post('unit_price'),
+			'reorder_level'=>$this->input->post('reorder_level'),
+			'receiving_quantity'=>$this->input->post('receiving_quantity'),
+			'allow_alt_description'=>$this->input->post('allow_alt_description'),
+			'is_serialized'=>$this->input->post('is_serialized'),
+			'deleted'=>$this->input->post('is_deleted'),
+			'custom1'=>$this->input->post('custom1'),			
+			'custom2'=>$this->input->post('custom2'),
+			'custom3'=>$this->input->post('custom3'),
+			'custom4'=>$this->input->post('custom4'),
+			'custom5'=>$this->input->post('custom5'),
+			'custom6'=>$this->input->post('custom6'),
+			'custom7'=>$this->input->post('custom7'),
+			'custom8'=>$this->input->post('custom8'),
+			'custom9'=>$this->input->post('custom9'),
+			'custom10'=>$this->input->post('custom10')
 		);
 		
 		if (!empty($upload_data['orig_name']))
@@ -350,7 +417,7 @@ class Items extends Secure_area implements iData_controller
 			$item_data['pic_id'] = $upload_data['raw_name'];
 		}
 		
-		$employee_id=$this->Employee->get_logged_in_employee_info()->person_id;
+		$employee_id = $this->Employee->get_logged_in_employee_info()->person_id;
 		$cur_item_info = $this->Item->get_info($item_id);
 		
 		if($this->Item->save($item_data,$item_id))
@@ -358,7 +425,7 @@ class Items extends Secure_area implements iData_controller
 			$success = TRUE;
 			$new_item = FALSE;
 			//New item
-			if($item_id==-1)
+			if ($item_id==-1)
 			{
 				$item_id = $item_data['item_id'];
 				$new_item = TRUE;
@@ -375,23 +442,21 @@ class Items extends Secure_area implements iData_controller
 				}
 			}
 			$success &= $this->Item_taxes->save($items_taxes_data, $item_id);
-
             
             //Save item quantity
-            $stock_locations = $this->Stock_locations->get_undeleted_all()->result_array();          
+            $stock_locations = $this->Stock_location->get_undeleted_all()->result_array();
             foreach($stock_locations as $location_data)
             {
                 $updated_quantity = $this->input->post($location_data['location_id'].'_quantity');
                 $location_detail = array('item_id'=>$item_id,
                                         'location_id'=>$location_data['location_id'],
                                         'quantity'=>$updated_quantity);  
-                $item_quantity = $this->Item_quantities->get_item_quantity($item_id, $location_data['location_id']);
+                $item_quantity = $this->Item_quantity->get_item_quantity($item_id, $location_data['location_id']);
                 if ($item_quantity->quantity != $updated_quantity || $new_item) 
                 {              
-	                $success &= $this->Item_quantities->save($location_detail, $item_id, $location_data['location_id']);
+	                $success &= $this->Item_quantity->save($location_detail, $item_id, $location_data['location_id']);
 	                
-	                $inv_data = array
-	                (
+	                $inv_data = array(
 	                    'trans_date'=>date('Y-m-d H:i:s'),
 	                    'trans_items'=>$item_id,
 	                    'trans_user'=>$employee_id,
@@ -399,6 +464,7 @@ class Items extends Secure_area implements iData_controller
 	                    'trans_comment'=>$this->lang->line('items_manually_editing_of_quantity'),
 	                    'trans_inventory'=>$updated_quantity - $item_quantity->quantity
 	                );
+
 	                $success &= $this->Inventory->insert($inv_data);       
                 }                                            
             }        
@@ -406,6 +472,7 @@ class Items extends Secure_area implements iData_controller
             if ($success && $upload_success) 
             {
             	$success_message = $this->lang->line('items_successful_' . ($new_item ? 'adding' : 'updating')) .' '. $item_data['name'];
+
             	echo json_encode(array('success'=>true,'message'=>$success_message,'item_id'=>$item_id));
             }
             else
@@ -413,6 +480,7 @@ class Items extends Secure_area implements iData_controller
             	$error_message = $upload_success ? 
 	            	$this->lang->line('items_error_adding_updating') .' '. $item_data['name'] : 
     	        	$this->upload->display_errors(); 
+
             	echo json_encode(array('success'=>false,
             			'message'=>$error_message,'item_id'=>$item_id)); 
             }
@@ -424,7 +492,6 @@ class Items extends Secure_area implements iData_controller
 					'message'=>$this->lang->line('items_error_adding_updating').' '
 					.$item_data['name'],'item_id'=>-1));
 		}
-
 	}
 	
 	function check_item_number()
@@ -445,20 +512,19 @@ class Items extends Secure_area implements iData_controller
 				'max_height' => '480',
 				'file_name' => sizeof($map));
 		$this->load->library('upload', $config);
-		$this->upload->do_upload('item_image');            
+		$this->upload->do_upload('item_image');           
+		
 		return strlen($this->upload->display_errors()) == 0 || 
             	!strcmp($this->upload->display_errors(), 
             		'<p>'.$this->lang->line('upload_no_file_selected').'</p>');
 	}
 	
-	//Ramel Inventory Tracking
 	function save_inventory($item_id=-1)
 	{	
 		$employee_id=$this->Employee->get_logged_in_employee_info()->person_id;
 		$cur_item_info = $this->Item->get_info($item_id);
         $location_id = $this->input->post('stock_location');
-		$inv_data = array
-		(
+		$inv_data = array(
 			'trans_date'=>date('Y-m-d H:i:s'),
 			'trans_items'=>$item_id,
 			'trans_user'=>$employee_id,
@@ -466,17 +532,18 @@ class Items extends Secure_area implements iData_controller
 			'trans_comment'=>$this->input->post('trans_comment'),
 			'trans_inventory'=>$this->input->post('newquantity')
 		);
+		
 		$this->Inventory->insert($inv_data);
 		
 		//Update stock quantity
-		
-		$item_quantity= $this->Item_quantities->get_item_quantity($item_id,$location_id);
+		$item_quantity= $this->Item_quantity->get_item_quantity($item_id,$location_id);
 		$item_quantity_data = array(
-		'item_id'=>$item_id,
-		'location_id'=>$location_id,
-		'quantity'=>$item_quantity->quantity + $this->input->post('newquantity')
+			'item_id'=>$item_id,
+			'location_id'=>$location_id,
+			'quantity'=>$item_quantity->quantity + $this->input->post('newquantity')
 		);
-		if($this->Item_quantities->save($item_quantity_data,$item_id,$location_id))
+
+		if($this->Item_quantity->save($item_quantity_data,$item_id,$location_id))
 		{			
 			echo json_encode(array('success'=>true,'message'=>$this->lang->line('items_successful_updating').' '.
 			$cur_item_info->name,'item_id'=>$item_id));
@@ -486,8 +553,7 @@ class Items extends Secure_area implements iData_controller
 			echo json_encode(array('success'=>false,'message'=>$this->lang->line('items_error_adding_updating').' '.
 			$cur_item_info->name,'item_id'=>-1));
 		}
-
-	}//---------------------------------------------------------------------Ramel
+	}
 
 	function bulk_update()
 	{
@@ -565,6 +631,7 @@ class Items extends Secure_area implements iData_controller
         {
             $msg = $this->lang->line('items_excel_import_failed');
             echo json_encode( array('success'=>false,'message'=>$msg) );
+
             return;
         }
         else
@@ -588,16 +655,16 @@ class Items extends Secure_area implements iData_controller
 	                        'supplier_id'	=>  $this->Supplier->exists($data[3]) ? $data[3] : null,
 	                        'allow_alt_description'	=>	$data[12] != '' ? '1' : '0',
 	                        'is_serialized'	=>	$data[13] != '' ? '1' : '0',
-	                        'custom1'		=>	$data[14],	/** GARRISON ADDED 5/6/2013 **/
-	                        'custom2'		=>	$data[15],	/** GARRISON ADDED 5/6/2013 **/
-	                        'custom3'		=>	$data[16],	/** GARRISON ADDED 5/6/2013 **/
-	                        'custom4'		=>	$data[17],	/** GARRISON ADDED 5/6/2013 **/
-	                        'custom5'		=>	$data[18],	/** GARRISON ADDED 5/6/2013 **/
-	                        'custom6'		=>	$data[19],	/** GARRISON ADDED 5/6/2013 **/
-	                        'custom7'		=>	$data[20],	/** GARRISON ADDED 5/6/2013 **/
-	                        'custom8'		=>	$data[21],	/** GARRISON ADDED 5/6/2013 **/
-	                        'custom9'		=>	$data[22],	/** GARRISON ADDED 5/6/2013 **/
-	                        'custom10'		=>	$data[23]	/** GARRISON ADDED 5/6/2013 **/
+	                        'custom1'		=>	$data[14],
+	                        'custom2'		=>	$data[15],
+	                        'custom3'		=>	$data[16],
+	                        'custom4'		=>	$data[17],
+	                        'custom5'		=>	$data[18],
+	                        'custom6'		=>	$data[19],
+	                        'custom7'		=>	$data[20],
+	                        'custom8'		=>	$data[21],
+	                        'custom9'		=>	$data[22],
+	                        'custom10'		=>	$data[23]
 	                    );
 	                    $item_number = $data[0];
 	                    $invalidated = false;
@@ -640,7 +707,7 @@ class Items extends Secure_area implements iData_controller
                         $cols = count($data);
 
                         // array to store information if location got a quantity
-                        $allowed_locations = $this->Stock_locations->get_allowed_locations();
+                        $allowed_locations = $this->Stock_location->get_allowed_locations();
                         for ($col = 24; $col < $cols; $col = $col + 2)
                         {
                             $location_id = $data[$col];
@@ -651,15 +718,16 @@ class Items extends Secure_area implements iData_controller
                                     'location_id' => $location_id,
                                     'quantity' => $data[$col + 1],
                                 );
-                                $this->Item_quantities->save($item_quantity_data, $item_data['item_id'], $location_id);
+                                $this->Item_quantity->save($item_quantity_data, $item_data['item_id'], $location_id);
 
-                                $excel_data = array (
+                                $excel_data = array(
                                     'trans_items'=>$item_data['item_id'],
                                     'trans_user'=>$employee_id,
                                     'trans_comment'=>$comment,
                                     'trans_location'=>$data[$col],
                                     'trans_inventory'=>$data[$col + 1]
                                 );
+								
                                 $this->Inventory->insert($excel_data);
                                 unset($allowed_locations[$location_id]);
                             }
@@ -677,7 +745,7 @@ class Items extends Secure_area implements iData_controller
                                 'location_id' => $location_id,
                                 'quantity' => 0,
                             );
-                            $this->Item_quantities->save($item_quantity_data, $item_data['item_id'], $data[$col]);
+                            $this->Item_quantity->save($item_quantity_data, $item_data['item_id'], $data[$col]);
 
                             $excel_data = array
                                 (
@@ -699,7 +767,8 @@ class Items extends Secure_area implements iData_controller
             }
             else 
             {
-                echo json_encode( array('success'=>false,'message'=>'Your upload file has no data or not in supported format.') );
+                echo json_encode( array('success'=>false, 'message'=>'Your upload file has no data or not in supported format.') );
+
                 return;
             }
         }
@@ -715,7 +784,7 @@ class Items extends Secure_area implements iData_controller
 			$msg = "Import items successful";
 		}
 
-		echo json_encode( array('success'=>$success,'message'=>$msg) );
+		echo json_encode( array('success'=>$success, 'message'=>$msg) );
 	}
 
 	/*
@@ -725,6 +794,5 @@ class Items extends Secure_area implements iData_controller
 	{
 		return 450;
 	}
-    
 }
 ?>

application/controllers/person_controller.php

@@ -30,7 +30,7 @@ abstract class Person_controller extends Secure_area implements iPerson_controll
 		}
 		echo '#';
 	}
-/** GARRISON ADDED 4/25/2013 IN PROGRESS **/	
+	
 	/*
 	 Gives search suggestions based on what is being searched for
 	*/
@@ -49,6 +49,5 @@ abstract class Person_controller extends Secure_area implements iPerson_controll
 		$data_row=get_person_data_row($this->Person->get_info($person_id),$this);
 		echo $data_row;
 	}
-		
 }
 ?>

application/controllers/receivings.php

@@ -45,7 +45,7 @@ class Receivings extends Secure_area
 			$mode = $this->input->post("mode");
 			$this->receiving_lib->set_mode($mode);
 		}
-		else if ($this->Stock_locations->is_allowed_location($stock_source, 'receivings'))
+		else if ($this->Stock_location->is_allowed_location($stock_source, 'receivings'))
 		{
 			$this->receiving_lib->set_stock_source($stock_source);
 			$this->receiving_lib->set_stock_destination($stock_destination);
@@ -181,9 +181,9 @@ class Receivings extends Secure_area
 		$data['cart']=$this->receiving_lib->get_cart();
 		$data['total']=$this->receiving_lib->get_total();
 		$data['receipt_title']=$this->lang->line('recvs_receipt');
-		$data['transaction_time']= date('m/d/Y h:i:s a');
+		$data['transaction_time']= date($this->config->item('dateformat').' '.$this->config->item('timeformat'));
 		$data['mode']=$this->receiving_lib->get_mode();
-		$data['show_stock_locations']=$this->Stock_locations->show_locations('receivings');
+		$data['show_stock_locations']=$this->Stock_location->show_locations('receivings');
 		$supplier_id=$this->receiving_lib->get_supplier();
 		$employee_id=$this->Employee->get_logged_in_employee_info()->person_id;
 		$comment = $this->input->post('comment');
@@ -220,8 +220,7 @@ class Receivings extends Secure_area
 			{
 				$data['error_message'] = $this->lang->line('receivings_transaction_failed');
 			}
-			$barcode_config=array('barcode_type'=>2,'barcode_width'=>200, 'barcode_height'=>30, 'barcode_quality'=>100);
-			$data['barcode']=$this->barcode_lib->generate_barcode($data['receiving_id'],$barcode_config);
+			$data['barcode']=$this->barcode_lib->generate_receipt_barcode($data['receiving_id']);
 			$data['print_after_sale'] = $this->receiving_lib->is_print_after_sale();
 			$this->load->view("receivings/receipt",$data);
 			$this->receiving_lib->clear_all();
@@ -229,7 +228,7 @@ class Receivings extends Secure_area
 		$this->_remove_duplicate_cookies();
 	}
 	
-	function _substitute_variable($text, $variable, $object, $function)
+	private function _substitute_variable($text, $variable, $object, $function)
 	{
 		// don't query if this variable isn't used
 		if (strstr($text, $variable))
@@ -240,7 +239,7 @@ class Receivings extends Secure_area
 		return $text;
 	}
 	
-	function _substitute_variables($text,$supplier_info)
+	private function _substitute_variables($text,$supplier_info)
 	{
 		$text=$this->_substitute_variable($text, '$YCO', $this->Receiving, 'get_invoice_number_for_year');
 		$text=$this->_substitute_variable($text, '$CO', $this->Receiving , 'get_invoice_count');
@@ -250,7 +249,7 @@ class Receivings extends Secure_area
 	}
 	
 
-	function _substitute_supplier($text,$supplier_info)
+	private function _substitute_supplier($text,$supplier_info)
 	{
 		$supplier_id=$this->receiving_lib->get_supplier();
 		if($supplier_id!=-1)
@@ -266,16 +265,13 @@ class Receivings extends Secure_area
 		return $text;
 	}
 	
-	function _substitute_invoice_number($supplier_info='')
+	private function _substitute_invoice_number($supplier_info='')
 	{
 		$invoice_number=$this->receiving_lib->get_invoice_number();
-		if (empty($invoice_number))
-		{
-			$invoice_number=$this->config->config['recv_invoice_format'];
-		}
+		$invoice_number=$this->config->config['recv_invoice_format'];
 		$invoice_number = $this->_substitute_variables($invoice_number,$supplier_info);
 		$this->receiving_lib->set_invoice_number($invoice_number);
-		return $invoice_number;
+		return $this->receiving_lib->get_invoice_number();
 	}
 
     function requisition_complete()
@@ -306,15 +302,14 @@ class Receivings extends Secure_area
 		$data['total']=$this->receiving_lib->get_total();
 		$data['mode']=$this->receiving_lib->get_mode();
 		$data['receipt_title']=$this->lang->line('recvs_receipt');
-		$data['transaction_time']= date('m/d/Y h:i:s a', strtotime($receiving_info['receiving_time']));
-		$data['show_stock_locations']=$this->Stock_locations->show_locations('receivings');
+		$data['transaction_time']= date($this->config->item('dateformat').' '.$this->config->item('timeformat'), strtotime($receiving_info['receiving_time']));
+		$data['show_stock_locations']=$this->Stock_location->show_locations('receivings');
 		$supplier_id=$this->receiving_lib->get_supplier();
 		$emp_info=$this->Employee->get_info($receiving_info['employee_id']);
 		$data['payment_type']=$receiving_info['payment_type'];
 		$data['invoice_number']=$this->receiving_lib->get_invoice_number();
 		$data['receiving_id']='RECV '.$receiving_id;
-		$barcode_config=array('barcode_type'=>2,'barcode_width'=>200, 'barcode_height'=>30, 'barcode_quality'=>100);
-		$data['barcode']=$this->barcode_lib->generate_barcode($data['receiving_id'],$barcode_config);
+		$data['barcode']=$this->barcode_lib->generate_receipt_barcode($data['receiving_id']);
 		$data['employee']=$emp_info->first_name.' '.$emp_info->last_name;
 
 		if($supplier_id!=-1)
@@ -328,14 +323,14 @@ class Receivings extends Secure_area
 		$this->_remove_duplicate_cookies();
 	}
 
-	function _reload($data=array())
+	private function _reload($data=array())
 	{
 		$person_info = $this->Employee->get_logged_in_employee_info();
 		$data['cart']=$this->receiving_lib->get_cart();
 		$data['modes']=array('receive'=>$this->lang->line('recvs_receiving'),'return'=>$this->lang->line('recvs_return'));
 		$data['mode']=$this->receiving_lib->get_mode();
 
-		$data['stock_locations']=$this->Stock_locations->get_allowed_locations('receivings');
+		$data['stock_locations']=$this->Stock_location->get_allowed_locations('receivings');
 		$show_stock_locations = count($data['stock_locations']) > 1;
         if ($show_stock_locations) 
         {
@@ -371,28 +366,30 @@ class Receivings extends Secure_area
 	
 	function save($receiving_id)
 	{
+		$date_formatter = date_create_from_format($this->config->item('dateformat') . ' ' . $this->config->item('timeformat'), $this->input->post('date', TRUE));
+
 		$receiving_data = array(
-				'receiving_time' => date('Y-m-d H:i:s', strtotime($this->input->post('date'))),
-				'supplier_id' => $this->input->post('supplier_id') ? $this->input->post('supplier_id') : null,
-				'employee_id' => $this->input->post('employee_id'),
-				'comment' => $this->input->post('comment'),
-				'invoice_number' => $this->input->post('invoice_number') != '' ? $this->input->post('invoice_number') : null
+			'receiving_time' => $date_formatter->format('Y-m-d H:i:s'),
+			'supplier_id' => $this->input->post('supplier_id') ? $this->input->post('supplier_id') : null,
+			'employee_id' => $this->input->post('employee_id'),
+			'comment' => $this->input->post('comment'),
+			'invoice_number' => $this->input->post('invoice_number') != '' ? $this->input->post('invoice_number') : null
 		);
 	
 		if ($this->Receiving->update($receiving_data, $receiving_id))
 		{
 			echo json_encode(array(
-					'success'=>true,
-					'message'=>$this->lang->line('recvs_successfully_updated'),
-					'id'=>$receiving_id)
+				'success'=>true,
+				'message'=>$this->lang->line('recvs_successfully_updated'),
+				'id'=>$receiving_id)
 			);
 		}
 		else
 		{
 			echo json_encode(array(
-					'success'=>false,
-					'message'=>$this->lang->line('recvs_unsuccessfully_updated'),
-					'id'=>$receiving_id)
+				'success'=>false,
+				'message'=>$this->lang->line('recvs_unsuccessfully_updated'),
+				'id'=>$receiving_id)
 			);
 		}
 	}
@@ -410,6 +407,5 @@ class Receivings extends Secure_area
 		$exists=!empty($invoice_number) && $this->Receiving->invoice_number_exists($invoice_number,$receiving_id);
     	echo json_encode(array('success'=>!$exists,'message'=>$this->lang->line('recvs_invoice_number_duplicate')));
     }
-
 }
 ?>

application/controllers/reports.php

@@ -69,6 +69,7 @@ class Reports extends Secure_area
 				to_currency($report_data['subtotal']),
 				to_currency($report_data['total']),
 				to_currency($report_data['tax']),
+				to_currency($report_data['cost']),
 				to_currency($report_data['profit']),
 				$report_data['payment_type'],
 				$report_data['comment']);
@@ -98,7 +99,7 @@ class Reports extends Secure_area
 
 	function get_summary_data($start_date, $end_date = NULL, $sale_type=0)
 	{
-		$end_date = $end_date ?: $start_date;
+		$end_date = $end_date ? $end_date : $start_date;
 		$this->load->model('reports/Summary_sales');
 		$model = $this->Summary_sales;
 		$summary = $model->getSummaryData(array(
@@ -118,12 +119,12 @@ class Reports extends Secure_area
 
 		foreach($report_data as $row)
 		{
-			$tabular_data[] = array($row['sale_date'], to_currency($row['subtotal']), to_currency($row['total']), to_currency($row['tax']),to_currency($row['profit']));
+			$tabular_data[] = array($row['sale_date'], $row['quantity_purchased'], to_currency($row['subtotal']), to_currency($row['total']), to_currency($row['tax']), to_currency($row['cost']), to_currency($row['profit']));
 		}
 
 		$data = array(
 			"title" => $this->lang->line('reports_sales_summary_report'),
-			"subtitle" => date('m/d/Y', strtotime($start_date)) .'-'.date('m/d/Y', strtotime($end_date)),
+			"subtitle" => date($this->config->item('dateformat'), strtotime($start_date)) .'-'.date($this->config->item('dateformat'), strtotime($end_date)),
 			"headers" => $model->getDataColumns(),
 			"data" => $tabular_data,
 			"summary_data" => $model->getSummaryData(array('start_date'=>$start_date, 'end_date'=>$end_date, 'sale_type' => $sale_type)),
@@ -143,12 +144,12 @@ class Reports extends Secure_area
 
 		foreach($report_data as $row)
 		{
-			$tabular_data[] = array($row['category'], to_currency($row['subtotal']), to_currency($row['total']), to_currency($row['tax']),to_currency($row['profit']));
+			$tabular_data[] = array($row['category'], $row['quantity_purchased'], to_currency($row['subtotal']), to_currency($row['total']), to_currency($row['tax']), to_currency($row['cost']), to_currency($row['profit']));
 		}
 
 		$data = array(
 			"title" => $this->lang->line('reports_categories_summary_report'),
-			"subtitle" => date('m/d/Y', strtotime($start_date)) .'-'.date('m/d/Y', strtotime($end_date)),
+			"subtitle" => date($this->config->item('dateformat'), strtotime($start_date)) .'-'.date($this->config->item('dateformat'), strtotime($end_date)),
 			"headers" => $model->getDataColumns(),
 			"data" => $tabular_data,
 			"summary_data" => $model->getSummaryData(array('start_date'=>$start_date, 'end_date'=>$end_date, 'sale_type' => $sale_type)),
@@ -168,12 +169,12 @@ class Reports extends Secure_area
 
 		foreach($report_data as $row)
 		{
-			$tabular_data[] = array($row['customer'], to_currency($row['subtotal']), to_currency($row['total']), to_currency($row['tax']),to_currency($row['profit']));
+			$tabular_data[] = array($row['customer'], $row['quantity_purchased'], to_currency($row['subtotal']), to_currency($row['total']), to_currency($row['tax']), to_currency($row['cost']), to_currency($row['profit']));
 		}
 
 		$data = array(
 			"title" => $this->lang->line('reports_customers_summary_report'),
-			"subtitle" => date('m/d/Y', strtotime($start_date)) .'-'.date('m/d/Y', strtotime($end_date)),
+			"subtitle" => date($this->config->item('dateformat'), strtotime($start_date)) .'-'.date($this->config->item('dateformat'), strtotime($end_date)),
 			"headers" => $model->getDataColumns(),
 			"data" => $tabular_data,
 			"summary_data" => $model->getSummaryData(array('start_date'=>$start_date, 'end_date'=>$end_date, 'sale_type' => $sale_type)),
@@ -193,12 +194,12 @@ class Reports extends Secure_area
 
 		foreach($report_data as $row)
 		{
-			$tabular_data[] = array($row['supplier'], to_currency($row['subtotal']), to_currency($row['total']), to_currency($row['tax']),to_currency($row['profit']));
+			$tabular_data[] = array($row['supplier'], $row['quantity_purchased'], to_currency($row['subtotal']), to_currency($row['total']), to_currency($row['tax']), to_currency($row['cost']), to_currency($row['profit']));
 		}
 
 		$data = array(
 			"title" => $this->lang->line('reports_suppliers_summary_report'),
-			"subtitle" => date('m/d/Y', strtotime($start_date)) .'-'.date('m/d/Y', strtotime($end_date)),
+			"subtitle" => date($this->config->item('dateformat'), strtotime($start_date)) .'-'.date($this->config->item('dateformat'), strtotime($end_date)),
 			"headers" => $model->getDataColumns(),
 			"data" => $tabular_data,
 			"summary_data" => $model->getSummaryData(array('start_date'=>$start_date, 'end_date'=>$end_date, 'sale_type' => $sale_type)),
@@ -218,12 +219,12 @@ class Reports extends Secure_area
 
 		foreach($report_data as $row)
 		{
-			$tabular_data[] = array(character_limiter($row['name'], 16), $row['quantity_purchased'], to_currency($row['subtotal']), to_currency($row['total']), to_currency($row['tax']),to_currency($row['profit']));
+			$tabular_data[] = array(character_limiter($row['name'], 40), $row['quantity_purchased'], to_currency($row['subtotal']), to_currency($row['total']), to_currency($row['tax']), to_currency($row['cost']), to_currency($row['profit']));
 		}
 
 		$data = array(
 			"title" => $this->lang->line('reports_items_summary_report'),
-			"subtitle" => date('m/d/Y', strtotime($start_date)) .'-'.date('m/d/Y', strtotime($end_date)),
+			"subtitle" => date($this->config->item('dateformat'), strtotime($start_date)) .'-'.date($this->config->item('dateformat'), strtotime($end_date)),
 			"headers" => $model->getDataColumns(),
 			"data" => $tabular_data,
 			"summary_data" => $model->getSummaryData(array('start_date'=>$start_date, 'end_date'=>$end_date, 'sale_type' => $sale_type)),
@@ -243,12 +244,12 @@ class Reports extends Secure_area
 
 		foreach($report_data as $row)
 		{
-			$tabular_data[] = array($row['employee'], to_currency($row['subtotal']), to_currency($row['total']), to_currency($row['tax']),to_currency($row['profit']));
+			$tabular_data[] = array($row['employee'], $row['quantity_purchased'], to_currency($row['subtotal']), to_currency($row['total']), to_currency($row['tax']), to_currency($row['cost']), to_currency($row['profit']));
 		}
 
 		$data = array(
 			"title" => $this->lang->line('reports_employees_summary_report'),
-			"subtitle" => date('m/d/Y', strtotime($start_date)) .'-'.date('m/d/Y', strtotime($end_date)),
+			"subtitle" => date($this->config->item('dateformat'), strtotime($start_date)) .'-'.date($this->config->item('dateformat'), strtotime($end_date)),
 			"headers" => $model->getDataColumns(),
 			"data" => $tabular_data,
 			"summary_data" => $model->getSummaryData(array('start_date'=>$start_date, 'end_date'=>$end_date, 'sale_type' => $sale_type)),
@@ -268,12 +269,12 @@ class Reports extends Secure_area
 
 		foreach($report_data as $row)
 		{
-			$tabular_data[] = array($row['percent'], to_currency($row['subtotal']), to_currency($row['total']), to_currency($row['tax']));
+			$tabular_data[] = array($row['percent'], $row['count'], to_currency($row['subtotal']), to_currency($row['total']), to_currency($row['tax']));
 		}
 
 		$data = array(
 			"title" => $this->lang->line('reports_taxes_summary_report'),
-			"subtitle" => date('m/d/Y', strtotime($start_date)) .'-'.date('m/d/Y', strtotime($end_date)),
+			"subtitle" => date($this->config->item('dateformat'), strtotime($start_date)) .'-'.date($this->config->item('dateformat'), strtotime($end_date)),
 			"headers" => $model->getDataColumns(),
 			"data" => $tabular_data,
 			"summary_data" => $model->getSummaryData(array('start_date'=>$start_date, 'end_date'=>$end_date, 'sale_type' => $sale_type)),
@@ -293,12 +294,12 @@ class Reports extends Secure_area
 
 		foreach($report_data as $row)
 		{
-			$tabular_data[] = array($row['discount_percent'],$row['count']);
+			$tabular_data[] = array($row['discount_percent'], $row['count']);
 		}
 
 		$data = array(
 			"title" => $this->lang->line('reports_discounts_summary_report'),
-			"subtitle" => date('m/d/Y', strtotime($start_date)) .'-'.date('m/d/Y', strtotime($end_date)),
+			"subtitle" => date($this->config->item('dateformat'), strtotime($start_date)) .'-'.date($this->config->item('dateformat'), strtotime($end_date)),
 			"headers" => $model->getDataColumns(),
 			"data" => $tabular_data,
 			"summary_data" => $model->getSummaryData(array('start_date'=>$start_date, 'end_date'=>$end_date, 'sale_type' => $sale_type)),
@@ -308,6 +309,7 @@ class Reports extends Secure_area
 		$this->load->view("reports/tabular",$data);
 	}
 
+	//Summary payments report
 	function summary_payments($start_date, $end_date, $sale_type, $export_excel=0)
 	{
 		$this->load->model('reports/Summary_payments');
@@ -317,12 +319,12 @@ class Reports extends Secure_area
 
 		foreach($report_data as $row)
 		{
-			$tabular_data[] = array($row['payment_type'],to_currency($row['payment_amount']));
+			$tabular_data[] = array($row['payment_type'], $row['count'], to_currency($row['payment_amount']));
 		}
 
 		$data = array(
 			"title" => $this->lang->line('reports_payments_summary_report'),
-			"subtitle" => date('m/d/Y', strtotime($start_date)) .'-'.date('m/d/Y', strtotime($end_date)),
+			"subtitle" => date($this->config->item('dateformat'), strtotime($start_date)) .'-'.date($this->config->item('dateformat'), strtotime($end_date)),
 			"headers" => $model->getDataColumns(),
 			"data" => $tabular_data,
 			"summary_data" => $model->getSummaryData(array('start_date'=>$start_date, 'end_date'=>$end_date, 'sale_type' => $sale_type)),
@@ -344,7 +346,7 @@ class Reports extends Secure_area
 	function date_input_sales()
 	{
 		$data = $this->_get_common_report_data();
-		$stock_locations = $this->Stock_locations->get_allowed_locations('sales');
+		$stock_locations = $this->Stock_location->get_allowed_locations('sales');
 		$stock_locations['all'] =  $this->lang->line('reports_all');
 		$data['stock_locations'] = array_reverse($stock_locations, TRUE);
         $data['mode'] = 'sale';
@@ -354,7 +356,7 @@ class Reports extends Secure_area
     function date_input_recv()
     {
         $data = $this->_get_common_report_data();
-		$stock_locations = $this->Stock_locations->get_allowed_locations('receivings');
+		$stock_locations = $this->Stock_location->get_allowed_locations('receivings');
 		$stock_locations['all'] =  $this->lang->line('reports_all');
 		$data['stock_locations'] = array_reverse($stock_locations, TRUE);
  		$data['mode'] = 'receiving';
@@ -370,7 +372,7 @@ class Reports extends Secure_area
 		$data = array(
 			"title" => $this->lang->line('reports_sales_summary_report'),
 			"data_file" => site_url("reports/graphical_summary_sales_graph/$start_date/$end_date/$sale_type"),
-			"subtitle" => date('m/d/Y', strtotime($start_date)) .'-'.date('m/d/Y', strtotime($end_date)),
+			"subtitle" => date($this->config->item('dateformat'), strtotime($start_date)) .'-'.date($this->config->item('dateformat'), strtotime($end_date)),
 			"summary_data" => $model->getSummaryData(array('start_date'=>$start_date, 'end_date'=>$end_date, 'sale_type' => $sale_type))
 		);
 
@@ -387,7 +389,7 @@ class Reports extends Secure_area
 		$graph_data = array();
 		foreach($report_data as $row)
 		{
-			$graph_data[date('m/d/Y', strtotime($row['sale_date']))]= $row['total'];
+			$graph_data[date($this->config->item('dateformat'), strtotime($row['sale_date']))]= $row['total'];
 		}
 
 		$data = array(
@@ -410,7 +412,7 @@ class Reports extends Secure_area
 		$data = array(
 			"title" => $this->lang->line('reports_items_summary_report'),
 			"data_file" => site_url("reports/graphical_summary_items_graph/$start_date/$end_date/$sale_type"),
-			"subtitle" => date('m/d/Y', strtotime($start_date)) .'-'.date('m/d/Y', strtotime($end_date)),
+			"subtitle" => date($this->config->item('dateformat'), strtotime($start_date)) .'-'.date($this->config->item('dateformat'), strtotime($end_date)),
 			"summary_data" => $model->getSummaryData(array('start_date'=>$start_date, 'end_date'=>$end_date, 'sale_type' => $sale_type))
 		);
 
@@ -449,7 +451,7 @@ class Reports extends Secure_area
 		$data = array(
 			"title" => $this->lang->line('reports_categories_summary_report'),
 			"data_file" => site_url("reports/graphical_summary_categories_graph/$start_date/$end_date/$sale_type"),
-			"subtitle" => date('m/d/Y', strtotime($start_date)) .'-'.date('m/d/Y', strtotime($end_date)),
+			"subtitle" => date($this->config->item('dateformat'), strtotime($start_date)) .'-'.date($this->config->item('dateformat'), strtotime($end_date)),
 			"summary_data" => $model->getSummaryData(array('start_date'=>$start_date, 'end_date'=>$end_date, 'sale_type' => $sale_type))
 		);
 
@@ -477,6 +479,7 @@ class Reports extends Secure_area
 		$this->load->view("reports/graphs/pie",$data);
 	}
 
+	//Graphical summary suppliers report
 	function graphical_summary_suppliers($start_date, $end_date, $sale_type)
 	{
 		$this->load->model('reports/Summary_suppliers');
@@ -485,7 +488,7 @@ class Reports extends Secure_area
 		$data = array(
 			"title" => $this->lang->line('reports_suppliers_summary_report'),
 			"data_file" => site_url("reports/graphical_summary_suppliers_graph/$start_date/$end_date/$sale_type"),
-			"subtitle" => date('m/d/Y', strtotime($start_date)) .'-'.date('m/d/Y', strtotime($end_date)),
+			"subtitle" => date($this->config->item('dateformat'), strtotime($start_date)) .'-'.date($this->config->item('dateformat'), strtotime($end_date)),
 			"summary_data" => $model->getSummaryData(array('start_date'=>$start_date, 'end_date'=>$end_date, 'sale_type' => $sale_type))
 		);
 
@@ -513,6 +516,7 @@ class Reports extends Secure_area
 		$this->load->view("reports/graphs/pie",$data);
 	}
 
+	//Graphical summary employees report
 	function graphical_summary_employees($start_date, $end_date, $sale_type)
 	{
 		$this->load->model('reports/Summary_employees');
@@ -521,7 +525,7 @@ class Reports extends Secure_area
 		$data = array(
 			"title" => $this->lang->line('reports_employees_summary_report'),
 			"data_file" => site_url("reports/graphical_summary_employees_graph/$start_date/$end_date/$sale_type"),
-			"subtitle" => date('m/d/Y', strtotime($start_date)) .'-'.date('m/d/Y', strtotime($end_date)),
+			"subtitle" => date($this->config->item('dateformat'), strtotime($start_date)) .'-'.date($this->config->item('dateformat'), strtotime($end_date)),
 			"summary_data" => $model->getSummaryData(array('start_date'=>$start_date, 'end_date'=>$end_date, 'sale_type' => $sale_type))
 		);
 
@@ -549,6 +553,7 @@ class Reports extends Secure_area
 		$this->load->view("reports/graphs/pie",$data);
 	}
 
+	//Graphical summary taxes report
 	function graphical_summary_taxes($start_date, $end_date, $sale_type)
 	{
 		$this->load->model('reports/Summary_taxes');
@@ -557,7 +562,7 @@ class Reports extends Secure_area
 		$data = array(
 			"title" => $this->lang->line('reports_taxes_summary_report'),
 			"data_file" => site_url("reports/graphical_summary_taxes_graph/$start_date/$end_date/$sale_type"),
-			"subtitle" => date('m/d/Y', strtotime($start_date)) .'-'.date('m/d/Y', strtotime($end_date)),
+			"subtitle" => date($this->config->item('dateformat'), strtotime($start_date)) .'-'.date($this->config->item('dateformat'), strtotime($end_date)),
 			"summary_data" => $model->getSummaryData(array('start_date'=>$start_date, 'end_date'=>$end_date, 'sale_type' => $sale_type))
 		);
 
@@ -594,7 +599,7 @@ class Reports extends Secure_area
 		$data = array(
 			"title" => $this->lang->line('reports_customers_summary_report'),
 			"data_file" => site_url("reports/graphical_summary_customers_graph/$start_date/$end_date/$sale_type"),
-			"subtitle" => date('m/d/Y', strtotime($start_date)) .'-'.date('m/d/Y', strtotime($end_date)),
+			"subtitle" => date($this->config->item('dateformat'), strtotime($start_date)) .'-'.date($this->config->item('dateformat'), strtotime($end_date)),
 			"summary_data" => $model->getSummaryData(array('start_date'=>$start_date, 'end_date'=>$end_date, 'sale_type' => $sale_type))
 		);
 
@@ -633,7 +638,7 @@ class Reports extends Secure_area
 		$data = array(
 			"title" => $this->lang->line('reports_discounts_summary_report'),
 			"data_file" => site_url("reports/graphical_summary_discounts_graph/$start_date/$end_date/$sale_type"),
-			"subtitle" => date('m/d/Y', strtotime($start_date)) .'-'.date('m/d/Y', strtotime($end_date)),
+			"subtitle" => date($this->config->item('dateformat'), strtotime($start_date)) .'-'.date($this->config->item('dateformat'), strtotime($end_date)),
 			"summary_data" => $model->getSummaryData(array('start_date'=>$start_date, 'end_date'=>$end_date, 'sale_type' => $sale_type))
 		);
 
@@ -663,6 +668,7 @@ class Reports extends Secure_area
 		$this->load->view("reports/graphs/bar",$data);
 	}
 
+	//Graphical summary payments report
 	function graphical_summary_payments($start_date, $end_date, $sale_type)
 	{
 		$this->load->model('reports/Summary_payments');
@@ -671,7 +677,7 @@ class Reports extends Secure_area
 		$data = array(
 			"title" => $this->lang->line('reports_payments_summary_report'),
 			"data_file" => site_url("reports/graphical_summary_payments_graph/$start_date/$end_date/$sale_type"),
-			"subtitle" => date('m/d/Y', strtotime($start_date)) .'-'.date('m/d/Y', strtotime($end_date)),
+			"subtitle" => date($this->config->item('dateformat'), strtotime($start_date)) .'-'.date($this->config->item('dateformat'), strtotime($end_date)),
 			"summary_data" => $model->getSummaryData(array('start_date'=>$start_date, 'end_date'=>$end_date, 'sale_type' => $sale_type))
 		);
 
@@ -700,6 +706,7 @@ class Reports extends Secure_area
 
 		$this->load->view("reports/graphs/pie",$data);
 	}
+
 	function specific_customer_input()
 	{
 		$data = $this->_get_common_report_data();
@@ -727,18 +734,18 @@ class Reports extends Secure_area
 
 		foreach($report_data['summary'] as $key=>$row)
 		{
-			$summary_data[] = array(anchor('sales/receipt/'.$row['sale_id'], 'POS '.$row['sale_id'], array('target' => '_blank')), $row['sale_date'], $row['items_purchased'], $row['employee_name'], to_currency($row['subtotal']), to_currency($row['total']), to_currency($row['tax']),to_currency($row['profit']), $row['payment_type'], $row['comment']);
+			$summary_data[] = array(anchor('sales/receipt/'.$row['sale_id'], 'POS '.$row['sale_id'], array('target' => '_blank')), $row['sale_date'], $row['items_purchased'], $row['employee_name'], to_currency($row['subtotal']), to_currency($row['total']), to_currency($row['tax']), to_currency($row['cost']), to_currency($row['profit']), $row['payment_type'], $row['comment']);
 
 			foreach($report_data['details'][$key] as $drow)
 			{
-				$details_data[$key][] = array($drow['name'], $drow['category'], $drow['serialnumber'], $drow['description'], $drow['quantity_purchased'], to_currency($drow['subtotal']), to_currency($drow['total']), to_currency($drow['tax']),to_currency($drow['profit']), $drow['discount_percent'].'%');
+				$details_data[$key][] = array($drow['name'], $drow['category'], $drow['serialnumber'], $drow['description'], $drow['quantity_purchased'], to_currency($drow['subtotal']), to_currency($drow['total']), to_currency($drow['tax']), to_currency($drow['cost']), to_currency($drow['profit']), $drow['discount_percent'].'%');
 			}
 		}
 
 		$customer_info = $this->Customer->get_info($customer_id);
 		$data = array(
 			"title" => $customer_info->first_name .' '. $customer_info->last_name.' '.$this->lang->line('reports_report'),
-			"subtitle" => date('m/d/Y', strtotime($start_date)) .'-'.date('m/d/Y', strtotime($end_date)),
+			"subtitle" => date($this->config->item('dateformat'), strtotime($start_date)) .'-'.date($this->config->item('dateformat'), strtotime($end_date)),
 			"headers" => $model->getDataColumns(),
 			"summary_data" => $summary_data,
 			"details_data" => $details_data,
@@ -777,18 +784,18 @@ class Reports extends Secure_area
 
 		foreach($report_data['summary'] as $key=>$row)
 		{
-			$summary_data[] = array(anchor('sales/receipt/'.$row['sale_id'], 'POS '.$row['sale_id'], array('target' => '_blank')), $row['sale_date'], $row['items_purchased'], $row['customer_name'], to_currency($row['subtotal']), to_currency($row['total']), to_currency($row['tax']),to_currency($row['profit']), $row['payment_type'], $row['comment']);
+			$summary_data[] = array(anchor('sales/receipt/'.$row['sale_id'], 'POS '.$row['sale_id'], array('target' => '_blank')), $row['sale_date'], $row['items_purchased'], $row['customer_name'], to_currency($row['subtotal']), to_currency($row['total']), to_currency($row['tax']), to_currency($row['cost']), to_currency($row['profit']), $row['payment_type'], $row['comment']);
 
 			foreach($report_data['details'][$key] as $drow)
 			{
-				$details_data[$key][] = array($drow['name'], $drow['category'], $drow['serialnumber'], $drow['description'], $drow['quantity_purchased'], to_currency($drow['subtotal']), to_currency($drow['total']), to_currency($drow['tax']),to_currency($drow['profit']), $drow['discount_percent'].'%');
+				$details_data[$key][] = array($drow['name'], $drow['category'], $drow['serialnumber'], $drow['description'], $drow['quantity_purchased'], to_currency($drow['subtotal']), to_currency($drow['total']), to_currency($drow['tax']), to_currency($drow['cost']), to_currency($drow['profit']), $drow['discount_percent'].'%');
 			}
 		}
 
 		$employee_info = $this->Employee->get_info($employee_id);
 		$data = array(
 			"title" => $employee_info->first_name .' '. $employee_info->last_name.' '.$this->lang->line('reports_report'),
-			"subtitle" => date('m/d/Y', strtotime($start_date)) .'-'.date('m/d/Y', strtotime($end_date)),
+			"subtitle" => date($this->config->item('dateformat'), strtotime($start_date)) .'-'.date($this->config->item('dateformat'), strtotime($end_date)),
 			"headers" => $model->getDataColumns(),
 			"summary_data" => $summary_data,
 			"details_data" => $details_data,
@@ -831,13 +838,13 @@ class Reports extends Secure_area
 
 			foreach($report_data['details'][$key] as $drow)
 			{
-				$details_data[$key][] = array($drow['name'], $drow['description'], $drow['quantity_purchased'], to_currency($drow['subtotal']), to_currency($drow['total']), to_currency($drow['tax']),/*to_currency($drow['profit']),*/ $drow['discount_percent'].'%');
+				$details_data[$key][] = array($drow['name'], $drow['category'], $drow['serialnumber'], $drow['description'], $drow['quantity_purchased'], to_currency($drow['subtotal']), to_currency($drow['total']), to_currency($drow['tax']),/*to_currency($drow['profit']),*/ $drow['discount_percent'].'%');
 			}
 		}
 
 		$data = array(
 					"title" => $discount. '% '.$this->lang->line('reports_discount') . ' ' . $this->lang->line('reports_report'),
-					"subtitle" => date('m/d/Y', strtotime($start_date)) .'-'.date('m/d/Y', strtotime($end_date)),
+					"subtitle" => date($this->config->item('dateformat'), strtotime($start_date)) .'-'.date($this->config->item('dateformat'), strtotime($end_date)),
 					"headers" => $headers,
 					"summary_data" => $summary_data,
 					"details_data" => $details_data,
@@ -861,26 +868,26 @@ class Reports extends Secure_area
 		$summary_data = array();
 		$details_data = array();
 
-		$show_locations = $this->Stock_locations->multiple_locations();
+		$show_locations = $this->Stock_location->multiple_locations();
 
 		foreach($report_data['summary'] as $key=>$row)
 		{
-			$summary_data[] = array(anchor('sales/edit/'.$row['sale_id'] . '/width:'.FORM_WIDTH, 'POS '.$row['sale_id'], array('class' => 'thickbox')), $row['sale_date'], $row['items_purchased'], $row['employee_name'], $row['customer_name'], to_currency($row['subtotal']), to_currency($row['total']), to_currency($row['tax']),to_currency($row['profit']), $row['payment_type'], $row['comment']);
+			$summary_data[] = array(anchor('sales/edit/'.$row['sale_id'] . '/width:'.FORM_WIDTH, 'POS '.$row['sale_id'], array('class' => 'thickbox')), $row['sale_date'], $row['items_purchased'], $row['employee_name'], $row['customer_name'], to_currency($row['subtotal']), to_currency($row['total']), to_currency($row['tax']), to_currency($row['cost']), to_currency($row['profit']), $row['payment_type'], $row['comment']);
 
 			foreach($report_data['details'][$key] as $drow)
 			{
 				$quantity_purchased = $drow['quantity_purchased'];
 				if ($show_locations)
 				{
-					$quantity_purchased .= ' [' . $this->Stock_locations->get_location_name($drow['item_location']) . ']';
+					$quantity_purchased .= ' [' . $this->Stock_location->get_location_name($drow['item_location']) . ']';
 				}
-				$details_data[$key][] = array($drow['name'], $drow['category'], $drow['serialnumber'], $drow['description'], $quantity_purchased, to_currency($drow['subtotal']), to_currency($drow['total']), to_currency($drow['tax']),to_currency($drow['profit']), $drow['discount_percent'].'%');
+				$details_data[$key][] = array($drow['name'], $drow['category'], $drow['serialnumber'], $drow['description'], $quantity_purchased, to_currency($drow['subtotal']), to_currency($drow['total']), to_currency($drow['tax']), to_currency($drow['cost']), to_currency($drow['profit']), $drow['discount_percent'].'%');
 			}
 		}
 
 		$data = array(
 			"title" =>$this->lang->line('reports_detailed_sales_report'),
-			"subtitle" => date('m/d/Y', strtotime($start_date)) .'-'.date('m/d/Y', strtotime($end_date)),
+			"subtitle" => date($this->config->item('dateformat'), strtotime($start_date)) .'-'.date($this->config->item('dateformat'), strtotime($end_date)),
 			"headers" => $model->getDataColumns(),
 			"editable" => "sales",
 			"summary_data" => $summary_data,
@@ -904,7 +911,7 @@ class Reports extends Secure_area
 		$summary_data = array();
 		$details_data = array();
 
-		$show_locations = $this->Stock_locations->multiple_locations();
+		$show_locations = $this->Stock_location->multiple_locations();
 
 		foreach($report_data['summary'] as $key=>$row)
 		{
@@ -915,7 +922,7 @@ class Reports extends Secure_area
 				$quantity_purchased = $drow['receiving_quantity'] > 1 ? $drow['quantity_purchased'] . ' x ' . $drow['receiving_quantity'] : $drow['quantity_purchased'];
 				if ($show_locations)
 				{
-					$quantity_purchased .= ' [' . $this->Stock_locations->get_location_name($drow['item_location']) . ']';
+					$quantity_purchased .= ' [' . $this->Stock_location->get_location_name($drow['item_location']) . ']';
 				}
 				$details_data[$key][] = array($drow['item_number'], $drow['name'], $drow['category'], $quantity_purchased, to_currency($drow['total']), $drow['discount_percent'].'%');
 			}
@@ -923,7 +930,7 @@ class Reports extends Secure_area
 
 		$data = array(
 			"title" =>$this->lang->line('reports_detailed_receivings_report'),
-			"subtitle" => date('m/d/Y', strtotime($start_date)) .'-'.date('m/d/Y', strtotime($end_date)),
+			"subtitle" => date($this->config->item('dateformat'), strtotime($start_date)) .'-'.date($this->config->item('dateformat'), strtotime($end_date)),
 			"headers" => $model->getDataColumns(),
 			"header_width" => intval(100 / count($headers['summary'])),
 			"editable" => "receivings",
@@ -965,15 +972,38 @@ class Reports extends Secure_area
 		$this->load->view("reports/tabular",$data);
 	}
 
-	function inventory_summary($export_excel=0)
+	function inventory_summary_input()
+	{
+		$data = array();
+
+		$this->load->model('reports/Inventory_Summary');
+		$model = $this->Inventory_Summary;
+		$data['item_count'] = $model->getItemCountDropdownArray();
+
+		$stock_locations = $this->Stock_location->get_allowed_locations();
+		$stock_locations['all'] =  $this->lang->line('reports_all');
+		$data['stock_locations'] = array_reverse($stock_locations, TRUE);
+
+		$this->load->view("reports/inventory_summary_input", $data);
+	}
+
+	function inventory_summary($export_excel=0, $location_id = 'all', $item_count = 'all')
 	{
 		$this->load->model('reports/Inventory_summary');
 		$model = $this->Inventory_summary;
 		$tabular_data = array();
-		$report_data = $model->getData(array());
+		$report_data = $model->getData(array('location_id'=>$location_id,'item_count'=>$item_count));
 		foreach($report_data as $row)
 		{
-			$tabular_data[] = array($row['name'], $row['item_number'], $row['description'], $row['quantity'], $row['reorder_level'],$row['location_name']);
+			$tabular_data[] = array($row['name'],
+								$row['item_number'],
+								$row['description'],
+								$row['quantity'],
+								$row['reorder_level'],
+								$row['location_name'],
+								to_currency($row['cost_price']),
+								to_currency($row['unit_price']),
+								to_currency($row['sub_total_value']));
 		}
 
 		$data = array(
@@ -981,7 +1011,7 @@ class Reports extends Secure_area
 			"subtitle" => '',
 			"headers" => $model->getDataColumns(),
 			"data" => $tabular_data,
-			"summary_data" => $model->getSummaryData(array()),
+			"summary_data" => $model->getSummaryData($report_data),
 			"export_excel" => $export_excel
 		);
 

application/controllers/sales.php

@@ -14,28 +14,66 @@ class Sales extends Secure_area
 		$this->_reload();
 	}
 	
-	function manage($payment_type = 0, $limit_from = 0)
+	function manage($only_invoices = FALSE, $only_cash = FALSE, $limit_from = 0)
 	{
-		$data['controller_name']=strtolower($this->uri->segment(1));
-		$data['payment_types'] = array($this->lang->line('sales_no_filter'), $this->lang->line('sales_invoice'));
-		$data['search_section_state']=$this->input->post('search_section_state');
-	
-		$lines_per_page = $this->Appconfig->get('lines_per_page');
-		$sales = $this->Sale->get_all($payment_type,$lines_per_page,$limit_from);
-		$total_rows = $this->Sale->get_found_rows($payment_type);
-		$data['payment_type'] = $payment_type;
-		$data['links'] = $this->_initialize_pagination($this->Sale, $lines_per_page, $limit_from, -1, 'manage', $payment_type);
-	
-		$data['manage_table']=get_sales_manage_table($sales,$this);
-		$this->load->view($data['controller_name'] . '/manage',$data);
+		$person_id = $this->session->userdata('person_id');
+
+		if (!$this->Employee->has_grant('reports_sales', $person_id))
+		{
+			redirect('no_access/sales/reports_sales');
+		}
+		else
+		{
+			$this->Sale->create_sales_items_temp_table();
+
+			$data['controller_name'] = strtolower($this->uri->segment(1));
+			$data['only_invoices'] = array($this->lang->line('sales_no_filter'), $this->lang->line('sales_invoice'));
+			$data['search_section_state'] = $this->input->post('search_section_state');
+			$lines_per_page = $this->Appconfig->get('lines_per_page');
+
+			$today = date($this->config->item('dateformat'));
+			$start_date = $this->input->post('start_date') != NULL ? $this->input->post('start_date', TRUE) : $today;
+			$start_date_formatter = date_create_from_format($this->config->item('dateformat'), $start_date);
+			$end_date = $this->input->post('end_date') != NULL ? $this->input->post('end_date', TRUE) : $today;
+			$end_date_formatter = date_create_from_format($this->config->item('dateformat'), $end_date);
+
+			$sale_type   = 'all';
+			$location_id = 'all';
+			$is_valid_receipt = FALSE;
+			$search = null;
+
+			$filters = array('sale_type' => $sale_type,
+				'location_id' => $location_id,
+				'start_date' => $start_date_formatter->format('Y-m-d'),
+				'end_date' => $end_date_formatter->format('Y-m-d'),
+				'only_invoices' => $only_invoices,
+				'only_cash' => $only_cash,
+				'is_valid_receipt' => $is_valid_receipt);
+
+			$sales = $this->Sale->search($search, $filters, $lines_per_page, $limit_from)->result_array();
+			$payments = $this->Sale->get_payments_summary($search, $filters);
+			$total_rows = $this->Sale->get_found_rows($search, $filters);
+			$data['only_invoices'] = $only_invoices;
+			$data['start_date'] = $start_date_formatter->format($this->config->item('dateformat'));
+			$data['end_date'] = $end_date_formatter->format($this->config->item('dateformat'));
+			$data['links'] = $this->_initialize_pagination($this->Sale, $lines_per_page, $limit_from, $total_rows, 'manage', $only_invoices);
+			$data['manage_table'] = get_sales_manage_table($sales, $this);
+			$data['payments_summary'] = get_sales_manage_payments_summary($payments, $sales, $this);
+
+			$this->load->view($data['controller_name'] . '/manage', $data);
+		}
+
 		$this->_remove_duplicate_cookies();
 	}
 	
 	function get_row()
 	{
+		$this->Sale->create_sales_items_temp_table();
+
 		$sale_id = $this->input->post('row_id');
 		$sale_info = $this->Sale->get_info($sale_id)->result_array();
-		$data_row=get_sale_data_row($sale_info[0],$this);
+		$data_row = get_sales_manage_sale_data_row($sale_info[0], $this);
+
 		echo $data_row;
 	}
 	
@@ -51,33 +89,62 @@ class Sales extends Secure_area
 	
 	function search()
 	{
-		$payment_type = $this->input->post('payment_type', TRUE);
+		$this->Sale->create_sales_items_temp_table();
+
+		$only_invoices = $this->input->post('only_invoices', TRUE);
+		$only_cash = $this->input->post('only_cash', TRUE);
+		$lines_per_page = $this->Appconfig->get('lines_per_page');
 		$limit_from = $this->input->post('limit_from', TRUE);
 		$search = $this->input->post('search', TRUE);
-		$lines_per_page = $this->Appconfig->get('lines_per_page');
-		$sales = $this->Sale->search($search, $payment_type, $lines_per_page, $limit_from, $search);
-		$total_rows = $this->Sale->get_found_rows($search);
-		$links = $this->_initialize_pagination($this->Sale,$lines_per_page,$limit_from,$total_rows,'search',$payment_type);
-		$data_rows=get_sales_manage_table_data_rows($sales,$this);
-		echo json_encode(array('total_rows' => $total_rows, 'rows' => $data_rows, 'pagination' => $links));
+
+		$today = date($this->config->item('dateformat'));
+		$start_date = $this->input->post('start_date') != NULL ? $this->input->post('start_date', TRUE) : $today;
+		$start_date_formatter = date_create_from_format($this->config->item('dateformat'), $start_date);
+		$end_date = $this->input->post('end_date') != NULL ? $this->input->post('end_date', TRUE) : $today;
+		$end_date_formatter = date_create_from_format($this->config->item('dateformat'), $end_date);
+
+		$is_valid_receipt = isset($search) ? $this->sale_lib->is_valid_receipt($search) : FALSE;
+
+		$sale_type = 'all';
+		$location_id = 'all';
+
+		$filters = array('sale_type' => $sale_type,
+						'location_id' => $location_id,
+						'start_date' => $start_date_formatter->format('Y-m-d'),
+						'end_date' => $end_date_formatter->format('Y-m-d'),
+						'only_invoices' => $only_invoices,
+						'only_cash' => $only_cash,
+						'is_valid_receipt' => $is_valid_receipt);
+
+		$sales = $this->Sale->search($search, $filters, $lines_per_page, $limit_from)->result_array();
+		$payments = $this->Sale->get_payments_summary($search, $filters);
+		$total_rows = $this->Sale->get_found_rows($search, $filters);
+		$links = $this->_initialize_pagination($this->Sale, $lines_per_page, $limit_from, $total_rows, 'search', $only_invoices);
+		$sale_rows = get_sales_manage_table_data_rows($sales, $this);
+		$payment_summary = get_sales_manage_payments_summary($payments, $sales, $this);
 		$this->_remove_duplicate_cookies();
+		
+		echo json_encode(array('total_rows' => $total_rows, 'rows' => $sale_rows, 'pagination' => $links, 'payment_summary' => $payment_summary));
 	}
 
 	function item_search()
 	{
 		$suggestions = array();
+
 		if ($this->sale_lib->get_mode() == 'return') 
 		{
 			$this->sale_lib->is_valid_receipt($this->input->post('q')) && $suggestions[] = $this->input->post('q');
 		}
 		$suggestions = array_merge($suggestions, $this->Item->get_item_search_suggestions($this->input->post('q'),$this->input->post('limit')));
 		$suggestions = array_merge($suggestions, $this->Item_kit->get_item_kit_search_suggestions($this->input->post('q'),$this->input->post('limit')));
-		echo implode("\n",$suggestions);
+
+		echo implode("\n", $suggestions);
 	}
 
 	function customer_search()
 	{
 		$suggestions = $this->Customer->get_customer_search_suggestions($this->input->post('q'),$this->input->post('limit'));
+
 		echo implode("\n",$suggestions);
 	}
 
@@ -86,6 +153,7 @@ class Sales extends Secure_area
 		$search = $this->input->post('q', TRUE);
 		$limit = $this->input->post('limit', TRUE);
 		$suggestions = $this->Sale->get_search_suggestions($search, $limit);
+
 		echo implode("\n",$suggestions);
 	}
 
@@ -104,7 +172,7 @@ class Sales extends Secure_area
 			$mode = $this->input->post("mode");
 			$this->sale_lib->set_mode($mode);
 		} 
-		else if ($this->Stock_locations->is_allowed_location($stock_location, 'sales'))
+		else if ($this->Stock_location->is_allowed_location($stock_location, 'sales'))
 		{
 			$this->sale_lib->set_sale_location($stock_location);
 		}
@@ -113,7 +181,7 @@ class Sales extends Secure_area
 	
 	function set_comment() 
 	{
- 	  $this->sale_lib->set_comment($this->input->post('comment'));
+		$this->sale_lib->set_comment($this->input->post('comment'));
 	}
 	
 	function set_invoice_number()
@@ -133,10 +201,10 @@ class Sales extends Secure_area
 	
 	function set_email_receipt()
 	{
- 	  $this->sale_lib->set_email_receipt($this->input->post('email_receipt'));
+ 		$this->sale_lib->set_email_receipt($this->input->post('email_receipt'));
 	}
 
-	//Alain Multiple Payments
+	// Multiple Payments
 	function add_payment()
 	{		
 		$data = array();
@@ -145,11 +213,16 @@ class Sales extends Secure_area
 		if ( $this->form_validation->run() == FALSE )
 		{
 			if ( $this->input->post( 'payment_type' ) == $this->lang->line( 'sales_gift_card' ) )
+			{
 				$data['error']=$this->lang->line('sales_must_enter_numeric_giftcard');
+			}
 			else
+			{
 				$data['error']=$this->lang->line('sales_must_enter_numeric');
+			}
 				
  			$this->_reload( $data );
+
  			return;
 		}
 		
@@ -186,7 +259,7 @@ class Sales extends Secure_area
 		$this->_reload($data);
 	}
 
-	//Alain Multiple Payments
+	// Multiple Payments
 	function delete_payment( $payment_id )
 	{
 		$this->sale_lib->delete_payment( $payment_id );
@@ -205,18 +278,11 @@ class Sales extends Secure_area
 		{
 			$this->sale_lib->return_entire_sale($item_id_or_number_or_item_kit_or_receipt);
 		}
-		elseif($this->Sale_suspended->invoice_number_exists($item_id_or_number_or_item_kit_or_receipt))
-		{
-			$this->sale_lib->clear_all();
-			$sale_id=$this->Sale_suspended->get_sale_by_invoice_number($item_id_or_number_or_item_kit_or_receipt)->row()->sale_id;
-			$this->sale_lib->copy_entire_suspended_sale($sale_id);
-			$this->Sale_suspended->delete($sale_id);
-		}
-		elseif($this->sale_lib->is_valid_item_kit($item_id_or_number_or_item_kit_or_receipt))
+		else if($this->sale_lib->is_valid_item_kit($item_id_or_number_or_item_kit_or_receipt))
 		{
 			$this->sale_lib->add_item_kit($item_id_or_number_or_item_kit_or_receipt,$item_location);
 		}
-		elseif(!$this->sale_lib->add_item($item_id_or_number_or_item_kit_or_receipt,$quantity,$item_location,$this->config->item('default_sales_discount')))
+		else if(!$this->sale_lib->add_item($item_id_or_number_or_item_kit_or_receipt,$quantity,$item_location,$this->config->item('default_sales_discount')))
 		{
 			$data['error']=$this->lang->line('sales_unable_to_add_item');
 		}
@@ -230,7 +296,7 @@ class Sales extends Secure_area
 
 	function edit_item($line)
 	{
-		$data= array();
+		$data = array();
 
 		$this->form_validation->set_rules('price', 'lang:items_price', 'required|numeric');
 		$this->form_validation->set_rules('quantity', 'lang:items_quantity', 'required|numeric');
@@ -243,14 +309,13 @@ class Sales extends Secure_area
 		$discount = $this->input->post("discount");
 		$item_location = $this->input->post("location");
 
-
 		if ($this->form_validation->run() != FALSE)
 		{
-			$this->sale_lib->edit_item($line,$description,$serialnumber,$quantity,$discount,$price);
+			$this->sale_lib->edit_item($line, $description, $serialnumber, $quantity, $discount, $price);
 		}
 		else
 		{
-			$data['error']=$this->lang->line('sales_error_editing_item');
+			$data['error'] = $this->lang->line('sales_error_editing_item');
 		}
 		
 		if($this->sale_lib->out_of_stock($this->sale_lib->get_item_id($line),$item_location))
@@ -258,7 +323,6 @@ class Sales extends Secure_area
 			$data['warning'] = $this->lang->line('sales_quantity_less_than_zero');
 		}
 
-
 		$this->_reload($data);
 	}
 
@@ -278,72 +342,70 @@ class Sales extends Secure_area
 
 	function complete()
 	{
-		$data['cart']=$this->sale_lib->get_cart();
-		$data['subtotal']=$this->sale_lib->get_subtotal();
-		$data['discounted_subtotal']=$this->sale_lib->get_subtotal(TRUE);
-		$data['tax_exclusive_subtotal']=$this->sale_lib->get_subtotal(TRUE, TRUE);
-		$data['taxes']=$this->sale_lib->get_taxes();
-		$data['total']=$this->sale_lib->get_total();
-		$data['discount']=$this->sale_lib->get_discount();
-		$data['receipt_title']=$this->lang->line('sales_receipt');
-		$data['transaction_time']= date('m/d/Y h:i:s a');
-		$data['transaction_date']= date('d/m/Y', strtotime($data['transaction_time']));
-		$data['show_stock_locations']=$this->Stock_locations->show_locations('sales');
-		$customer_id=$this->sale_lib->get_customer();
-		$employee_id=$this->Employee->get_logged_in_employee_info()->person_id;
-		$comment=$this->sale_lib->get_comment();
-		$data['comments']=$comment;
+		$data['cart'] = $this->sale_lib->get_cart();
+		$data['subtotal'] = $this->sale_lib->get_subtotal();
+		$data['discounted_subtotal'] = $this->sale_lib->get_subtotal(TRUE);
+		$data['tax_exclusive_subtotal'] = $this->sale_lib->get_subtotal(TRUE, TRUE);
+		$data['taxes'] = $this->sale_lib->get_taxes();
+		$data['total'] = $this->sale_lib->get_total();
+		$data['discount'] = $this->sale_lib->get_discount();
+		$data['receipt_title'] = $this->lang->line('sales_receipt');
+		$data['transaction_time'] = date($this->config->item('dateformat').' '.$this->config->item('timeformat'));
+		$data['transaction_date'] = date($this->config->item('dateformat'));
+		$data['show_stock_locations'] = $this->Stock_location->show_locations('sales');
+		$customer_id = $this->sale_lib->get_customer();
+		$employee_id = $this->Employee->get_logged_in_employee_info()->person_id;
+		$data['comments'] = $this->sale_lib->get_comment();
 		$emp_info=$this->Employee->get_info($employee_id);
-		$data['payments']=$this->sale_lib->get_payments();
-		$data['amount_change']=$this->sale_lib->get_amount_due() * -1;
-		$data['amount_due']=$this->sale_lib->get_amount_due();
-		$data['employee']=$emp_info->first_name.' '.$emp_info->last_name;
+		$data['payments'] = $this->sale_lib->get_payments();
+		$data['amount_change'] = $this->sale_lib->get_amount_due() * -1;
+		$data['amount_due'] = $this->sale_lib->get_amount_due();
+		$data['employee'] = $emp_info->first_name.' '.$emp_info->last_name;
 		$data['company_info'] = implode("\n", array(
 				$this->config->item('address'),
 				$this->config->item('phone'),
 				$this->config->item('account_number')
 		));
-        $cust_info='';
+        $cust_info = '';
 		if($customer_id!=-1)
 		{
-			$cust_info=$this->Customer->get_info($customer_id);
+			$cust_info = $this->Customer->get_info($customer_id);
 			if (isset($cust_info->company_name))
 			{
-				$data['customer']=$cust_info->company_name;
+				$data['customer'] = $cust_info->company_name;
 			}
 			else
 			{
-				$data['customer']=$cust_info->first_name.' '.$cust_info->last_name;
+				$data['customer'] = $cust_info->first_name.' '.$cust_info->last_name;
 			}
 			$data['customer_address'] = $cust_info->address_1;
 			$data['customer_location'] = $cust_info->zip . ' ' . $cust_info->city;
 			$data['account_number'] = $cust_info->account_number;
 			$data['customer_info'] = implode("\n", array(
-					$data['customer'],
-					$data['customer_address'],
-					$data['customer_location'],
-					$data['account_number']
+				$data['customer'],
+				$data['customer_address'],
+				$data['customer_location'],
+				$data['account_number']
 			));
 		}
-		$invoice_number=$this->_substitute_invoice_number($cust_info);
+		$invoice_number = $this->_substitute_invoice_number($cust_info);
 		if ($this->sale_lib->is_invoice_number_enabled() && $this->Sale->invoice_number_exists($invoice_number))
 		{
-			$data['error']=$this->lang->line('sales_invoice_number_duplicate');
+			$data['error'] = $this->lang->line('sales_invoice_number_duplicate');
 			$this->_reload($data);
 		}
 		else 
 		{
 			$invoice_number = $this->sale_lib->is_invoice_number_enabled() ? $invoice_number : NULL;
-			$data['invoice_number']=$invoice_number;
-			$data['sale_id']='POS '.$this->Sale->save($data['cart'],$customer_id,$employee_id,$comment,$invoice_number,$data['payments']);
+			$data['invoice_number'] = $invoice_number;
+			$data['sale_id'] = 'POS '.$this->Sale->save($data['cart'], $customer_id, $employee_id, $data['comments'], $invoice_number, $data['payments']);
 			if ($data['sale_id'] == 'POS -1')
 			{
 				$data['error_message'] = $this->lang->line('sales_transaction_failed');
 			}
 			else
 			{
-				$barcode_config=array('barcode_type'=>2,'barcode_width'=>200, 'barcode_height'=>30, 'barcode_quality'=>100);
-				$data['barcode']=$this->barcode_lib->generate_barcode($data['sale_id'],$barcode_config);
+				$data['barcode'] = $this->barcode_lib->generate_receipt_barcode($data['sale_id']);
 				// if we want to email. .. just attach the pdf in there?
 				if ($this->sale_lib->get_email_receipt() && !empty($cust_info->email))
 				{
@@ -372,7 +434,7 @@ class Sales extends Secure_area
 					$this->email->send();
 				}
 			}
-			$data['cur_giftcard_value']=$this->sale_lib->get_giftcard_remainder();
+			$data['cur_giftcard_value'] = $this->sale_lib->get_giftcard_remainder();
 			$data['print_after_sale'] = $this->sale_lib->is_print_after_sale();
 			if ($this->sale_lib->is_invoice_number_enabled() && $this->config->item('use_invoice_template'))
 			{
@@ -388,7 +450,7 @@ class Sales extends Secure_area
 		$this->_remove_duplicate_cookies();
 	}
 	
-	function _invoice_email_pdf($data)
+	private function _invoice_email_pdf($data)
 	{
 		$data['image_prefix'] = "";
 		$html = $this->load->view('sales/invoice_email', $data, true);
@@ -397,10 +459,12 @@ class Sales extends Secure_area
 		$file_content  = pdf_create($html, '', false);
 		$filename = sys_get_temp_dir() . '/'. $this->lang->line('sales_invoice') .'-' . str_replace('/', '-' , $data["invoice_number"]) . '.pdf';
 		write_file($filename, $file_content);
+
 		return $filename;
 	}
 	
-	function invoice_email($sale_id) {
+	function invoice_email($sale_id)
+	{
 		$sale_data = $this->_load_sale_data($sale_id);
 		$sale_data['image_prefix'] = base_url();
 		$this->load->view('sales/invoice_email', $sale_data);
@@ -408,7 +472,8 @@ class Sales extends Secure_area
 		$this->_remove_duplicate_cookies();
 	}
 	
-	function send_invoice($sale_id) {
+	function send_invoice($sale_id)
+	{
 		$sale_data = $this->_load_sale_data($sale_id);
 		$text = $this->config->item('invoice_email_message');
 		$text = str_replace('$INV', $sale_data['invoice_number'], $text);
@@ -428,15 +493,15 @@ class Sales extends Secure_area
 			$message = $this->lang->line($result ? 'sales_invoice_sent' : 'sales_invoice_unsent') . ' ' . $sale_data["customer_email"];
 		}
 		echo json_encode(array(
-				'success'=>$result,
-				'message'=>$message,
-				'id'=>$sale_id)
+			'success'=>$result,
+			'message'=>$message,
+			'id'=>$sale_id)
 		);
 		$this->sale_lib->clear_all();
 		$this->_remove_duplicate_cookies();
 	}
 	
-	function _substitute_variable($text, $variable, $object, $function)
+	private function _substitute_variable($text, $variable, $object, $function)
 	{
 		// don't query if this variable isn't used
 		if (strstr($text, $variable))
@@ -444,10 +509,11 @@ class Sales extends Secure_area
 			$value = call_user_func(array($object, $function));
 			$text = str_replace($variable, $value, $text);
 		}
+
 		return $text;
 	}
 	
-	function _substitute_customer($text, $cust_info)
+	private function _substitute_customer($text, $cust_info)
 	{
 		// substitute customer info
 		$customer_id=$this->sale_lib->get_customer();
@@ -461,90 +527,90 @@ class Sales extends Secure_area
 			}
 			$text=str_replace('$CI',$acronym,$text);
 		}
+
 		return $text;
 	}
 	
-	function _substitute_variables($text, $cust_info)
+	private function _substitute_variables($text, $cust_info)
 	{
 		$text=$this->_substitute_variable($text, '$YCO', $this->Sale, 'get_invoice_number_for_year');
 		$text=$this->_substitute_variable($text, '$CO', $this->Sale , 'get_invoice_count');
 		$text=$this->_substitute_variable($text, '$SCO', $this->Sale_suspended, 'get_invoice_count');
 		$text=strftime($text);
 		$text=$this->_substitute_customer($text, $cust_info);
+
 		return $text;
 	}
 	
-	function _substitute_invoice_number($cust_info)
+	private function _substitute_invoice_number($cust_info)
 	{
-		$invoice_number=$this->sale_lib->get_invoice_number();
-		if (empty($invoice_number))
-		{
-			$invoice_number=$this->config->config['sales_invoice_format'];
-		}
+		$invoice_number = $this->config->config['sales_invoice_format'];
 		$invoice_number = $this->_substitute_variables($invoice_number, $cust_info);
-		$this->sale_lib->set_invoice_number($invoice_number);
-		return $invoice_number;
+		$this->sale_lib->set_invoice_number($invoice_number, TRUE);
+		return $this->sale_lib->get_invoice_number();
 	}
-	
-	function _load_sale_data($sale_id) {
+
+	private function _load_sale_data($sale_id)
+	{
+		$this->Sale->create_sales_items_temp_table();
+
 		$this->sale_lib->clear_all();
 		$sale_info = $this->Sale->get_info($sale_id)->row_array();
 		$this->sale_lib->copy_entire_sale($sale_id);
-		$data['cart']=$this->sale_lib->get_cart();
-		$data['payments']=$this->sale_lib->get_payments();
-		$data['subtotal']=$this->sale_lib->get_subtotal();
-		$data['discounted_subtotal']=$this->sale_lib->get_subtotal(TRUE);
-		$data['tax_exclusive_subtotal']=$this->sale_lib->get_subtotal(TRUE, TRUE);
-		$data['taxes']=$this->sale_lib->get_taxes();
-		$data['total']=$this->sale_lib->get_total();
-		$data['discount']=$this->sale_lib->get_discount();
-		$data['receipt_title']=$this->lang->line('sales_receipt');
-		$data['transaction_time']= date('d/m/Y H:i:s', strtotime($sale_info['sale_time']));
-		$data['show_stock_locations']=$this->Stock_locations->show_locations('sales');
-		$data['transaction_date']= date('d/m/Y', strtotime($sale_info['sale_time']));
-		$customer_id=$this->sale_lib->get_customer();
-		$employee_id=$this->Employee->get_logged_in_employee_info()->person_id;
-		$emp_info=$this->Employee->get_info($employee_id);
-		$data['amount_change']=$this->sale_lib->get_amount_due() * -1;
-		$data['amount_due']=$this->sale_lib->get_amount_due();
-		$data['employee']=$emp_info->first_name.' '.$emp_info->last_name;
+		$data['cart'] = $this->sale_lib->get_cart();
+		$data['payments'] = $this->sale_lib->get_payments();
+		$data['subtotal'] = $this->sale_lib->get_subtotal();
+		$data['discounted_subtotal'] = $this->sale_lib->get_subtotal(TRUE);
+		$data['tax_exclusive_subtotal'] = $this->sale_lib->get_subtotal(TRUE, TRUE);
+		$data['taxes'] = $this->sale_lib->get_taxes();
+		$data['total'] = $this->sale_lib->get_total();
+		$data['discount'] = $this->sale_lib->get_discount();
+		$data['receipt_title'] = $this->lang->line('sales_receipt');
+		$data['transaction_time'] = date($this->config->item('dateformat').' '.$this->config->item('timeformat'), strtotime($sale_info['sale_time']));
+		$data['transaction_date'] = date($this->config->item('dateformat'), strtotime($sale_info['sale_time']));
+		$data['show_stock_locations'] = $this->Stock_location->show_locations('sales');
+		$customer_id = $this->sale_lib->get_customer();
+		$employee_id = $this->Employee->get_logged_in_employee_info()->person_id;
+		$emp_info = $this->Employee->get_info($employee_id);
+		$data['amount_change'] = $this->sale_lib->get_amount_due() * -1;
+		$data['amount_due'] = $this->sale_lib->get_amount_due();
+		$data['employee'] = $emp_info->first_name.' '.$emp_info->last_name;
 	
 		if($customer_id!=-1)
 		{
-			$cust_info=$this->Customer->get_info($customer_id);
+			$cust_info = $this->Customer->get_info($customer_id);
 			if (isset($cust_info->company_name))
 			{
-				$data['customer']=$cust_info->company_name;
+				$data['customer'] = $cust_info->company_name;
 			}
 			else
 			{
-				$data['customer']=$cust_info->first_name.' '.$cust_info->last_name;
+				$data['customer'] = $cust_info->first_name.' '.$cust_info->last_name;
 			}
-			$data['first_name']=$cust_info->first_name;
-			$data['last_name']=$cust_info->last_name;
+			$data['first_name'] = $cust_info->first_name;
+			$data['last_name'] = $cust_info->last_name;
 			$data['customer_address'] = $cust_info->address_1;
 			$data['customer_location'] = $cust_info->zip . ' ' . $cust_info->city;
 			$data['customer_email'] = $cust_info->email;
 			$data['account_number'] = $cust_info->account_number;
 			$data['customer_info'] = implode("\n", array(
-					$data['customer'],
-					$data['customer_address'],
-					$data['customer_location'],
-					$data['account_number']
+				$data['customer'],
+				$data['customer_address'],
+				$data['customer_location'],
+				$data['account_number']
 			));
 		}
-		$data['sale_id']='POS '.$sale_id;
-		$data['comments'] = $sale_info[ 'comment' ];
+		$data['sale_id'] = 'POS '.$sale_id;
+		$data['comments'] = $sale_info['comment'];
 		$data['invoice_number'] = $sale_info['invoice_number'];
 		$data['company_info'] = implode("\n", array(
-				$this->config->item('address'),
-				$this->config->item('phone'),
-				$this->config->item('account_number')
+			$this->config->item('address'),
+			$this->config->item('phone'),
+			$this->config->item('account_number')
 		));
-		// static barcode config for receipts + invoices 
-		$barcode_config=array('barcode_type'=>2,'barcode_width'=>200, 'barcode_height'=>30, 'barcode_quality'=>100);
-		$data['barcode']=$this->barcode_lib->generate_barcode($data['sale_id'],$barcode_config);
+		$data['barcode'] = $this->barcode_lib->generate_receipt_barcode($data['sale_id']);
 		$data['print_after_sale'] = FALSE;
+
 		return $data;
 	}
 	
@@ -575,6 +641,7 @@ class Sales extends Secure_area
 		{
 			$data['employees'][$employee->person_id] = $employee->first_name . ' '. $employee->last_name;
 		}
+		$this->Sale->create_sales_items_temp_table();
 
 		$sale_info = $this->Sale->get_info($sale_id)->row_array();
 		$person_name = $sale_info['first_name'] . " " . $sale_info['last_name'];
@@ -584,7 +651,8 @@ class Sales extends Secure_area
 		$this->load->view('sales/form', $data);
 	}
 	
-	function delete($sale_id = -1, $update_inventory=TRUE) {
+	function delete($sale_id = -1, $update_inventory=TRUE)
+	{
 		$employee_id=$this->Employee->get_logged_in_employee_info()->person_id;
 		$sale_ids= $sale_id == -1 ? $this->input->post('ids') : array($sale_id);
 
@@ -601,8 +669,10 @@ class Sales extends Secure_area
 	
 	function save($sale_id)
 	{
+		$start_date_formatter = date_create_from_format($this->config->item('dateformat') . ' ' . $this->config->item('timeformat'), $this->input->post('date', TRUE));
+
 		$sale_data = array(
-			'sale_time' => date('Y-m-d H:i:s', strtotime($this->input->post('date'))),
+			'sale_time' => $start_date_formatter->format('Y-m-d H:i:s'),
 			'customer_id' => $this->input->post('customer_id') ? $this->input->post('customer_id') : NULL,
 			'employee_id' => $this->input->post('employee_id'),
 			'comment' => $this->input->post('comment'),
@@ -627,7 +697,7 @@ class Sales extends Secure_area
 		}
 	}
 	
-	function _payments_cover_total()
+	private function _payments_cover_total()
 	{
 		$total_payments = 0;
 
@@ -646,28 +716,28 @@ class Sales extends Secure_area
 		return true;
 	}
 	
-	function _reload($data=array())
+	private function _reload($data=array())
 	{
 		$person_info = $this->Employee->get_logged_in_employee_info();
-		$data['cart']=$this->sale_lib->get_cart();	 
-        $data['modes']=array('sale'=>$this->lang->line('sales_sale'),'return'=>$this->lang->line('sales_return'));
-        $data['mode']=$this->sale_lib->get_mode();
+		$data['cart'] = $this->sale_lib->get_cart();	 
+        $data['modes'] = array('sale'=>$this->lang->line('sales_sale'),'return'=>$this->lang->line('sales_return'));
+        $data['mode'] = $this->sale_lib->get_mode();
 
-        $data['stock_locations']=$this->Stock_locations->get_allowed_locations('sales');
-        $data['stock_location']=$this->sale_lib->get_sale_location();
+        $data['stock_locations'] = $this->Stock_location->get_allowed_locations('sales');
+        $data['stock_location'] = $this->sale_lib->get_sale_location();
         
-		$data['subtotal']=$this->sale_lib->get_subtotal(TRUE);
-		$data['tax_exclusive_subtotal']=$this->sale_lib->get_subtotal(TRUE, TRUE);
-		$data['taxes']=$this->sale_lib->get_taxes();
-		$data['discount']=$this->sale_lib->get_discount();
-		$data['total']=$this->sale_lib->get_total();
-		$data['items_module_allowed']=$this->Employee->has_grant('items', $person_info->person_id);
-		$data['comment']=$this->sale_lib->get_comment();
-		$data['email_receipt']=$this->sale_lib->get_email_receipt();
-		$data['payments_total']=$this->sale_lib->get_payments_total();
-		$data['amount_due']=$this->sale_lib->get_amount_due();
-		$data['payments']=$this->sale_lib->get_payments();
-		$data['payment_options']=array(
+		$data['subtotal'] = $this->sale_lib->get_subtotal(TRUE);
+		$data['tax_exclusive_subtotal'] = $this->sale_lib->get_subtotal(TRUE, TRUE);
+		$data['taxes'] = $this->sale_lib->get_taxes();
+		$data['discount'] = $this->sale_lib->get_discount();
+		$data['total'] = $this->sale_lib->get_total();
+		$data['items_module_allowed'] = $this->Employee->has_grant('items', $person_info->person_id);
+		$data['comment'] = $this->sale_lib->get_comment();
+		$data['email_receipt'] = $this->sale_lib->get_email_receipt();
+		$data['payments_total'] = $this->sale_lib->get_payments_total();
+		$data['amount_due'] = $this->sale_lib->get_amount_due();
+		$data['payments'] = $this->sale_lib->get_payments();
+		$data['payment_options'] = array(
 			$this->lang->line('sales_cash') => $this->lang->line('sales_cash'),
 			$this->lang->line('sales_check') => $this->lang->line('sales_check'),
 			$this->lang->line('sales_giftcard') => $this->lang->line('sales_giftcard'),
@@ -675,19 +745,21 @@ class Sales extends Secure_area
 			$this->lang->line('sales_credit') => $this->lang->line('sales_credit')
 		);
 
-		$customer_id=$this->sale_lib->get_customer();
-		$cust_info='';
+		$customer_id = $this->sale_lib->get_customer();
+		$cust_info = '';
 		if($customer_id!=-1)
 		{
-			$cust_info=$this->Customer->get_info($customer_id);
-			$data['customer']=$cust_info->first_name.' '.$cust_info->last_name;
-			$data['customer_email']=$cust_info->email;
+			$cust_info = $this->Customer->get_info($customer_id);
+			$data['customer'] = $cust_info->first_name.' '.$cust_info->last_name;
+			$data['customer_email'] = $cust_info->email;
 		}
-		$data['invoice_number']=$this->_substitute_invoice_number($cust_info);
-		$data['invoice_number_enabled']=$this->sale_lib->is_invoice_number_enabled();
-		$data['print_after_sale']=$this->sale_lib->is_print_after_sale();
-		$data['payments_cover_total']=$this->_payments_cover_total();
+		$data['invoice_number'] = $this->_substitute_invoice_number($cust_info);
+		$data['invoice_number_enabled'] = $this->sale_lib->is_invoice_number_enabled();
+		$data['print_after_sale'] = $this->sale_lib->is_print_after_sale();
+		$data['payments_cover_total'] = $this->_payments_cover_total();
+
 		$this->load->view("sales/register",$data);
+
 		$this->_remove_duplicate_cookies();
 	}
 
@@ -699,60 +771,54 @@ class Sales extends Secure_area
 	
 	function suspend()
 	{
-		$data['cart']=$this->sale_lib->get_cart();
-		$data['subtotal']=$this->sale_lib->get_subtotal();
-		$data['taxes']=$this->sale_lib->get_taxes();
-		$data['total']=$this->sale_lib->get_total();
-		$data['receipt_title']=$this->lang->line('sales_receipt');
-		$data['transaction_time']= date('m/d/Y h:i:s a');
-		$customer_id=$this->sale_lib->get_customer();
-		$employee_id=$this->Employee->get_logged_in_employee_info()->person_id;
-		$comment = $this->input->post('comment');
-		$invoice_number=$this->sale_lib->get_invoice_number();
-		
-		$emp_info=$this->Employee->get_info($employee_id);
-		$payment_type = $this->input->post('payment_type');
-		$data['payment_type']=$this->input->post('payment_type');
-		//Alain Multiple payments
-		$data['payments']=$this->sale_lib->get_payments();
-		$data['amount_change']=to_currency($this->sale_lib->get_amount_due() * -1);
-		$data['employee']=$emp_info->first_name.' '.$emp_info->last_name;
-		
-		if ($this->Sale_suspended->invoice_number_exists($invoice_number))
+		$data['cart'] = $this->sale_lib->get_cart();
+		$data['subtotal'] = $this->sale_lib->get_subtotal();
+		$data['taxes'] = $this->sale_lib->get_taxes();
+		$data['total'] = $this->sale_lib->get_total();
+		$data['receipt_title'] = $this->lang->line('sales_receipt');
+		$data['transaction_time'] = date($this->config->item('dateformat').' '.$this->config->item('timeformat'));
+		$customer_id = $this->sale_lib->get_customer();
+		$employee_id = $this->Employee->get_logged_in_employee_info()->person_id;
+		$comment = $this->sale_lib->get_comment();
+		$invoice_number = $this->sale_lib->get_invoice_number();
+
+		$emp_info = $this->Employee->get_info($employee_id);
+		$data['payment_type'] = $this->input->post('payment_type');
+		// Multiple payments
+		$data['payments'] = $this->sale_lib->get_payments();
+		$data['amount_change'] = to_currency($this->sale_lib->get_amount_due() * -1);
+		$data['employee'] = $emp_info->first_name.' '.$emp_info->last_name;
+
+		if($customer_id!=-1)
 		{
-			$this->_reload(array('error' => $data['error']=$this->lang->line('sales_invoice_number_duplicate')));
+			$cust_info = $this->Customer->get_info($customer_id);
+			if (isset($cust_info->company_name))
+			{
+				$data['customer'] = $cust_info->company_name;
+			}
+			else
+			{
+				$data['customer'] = $cust_info->first_name.' '.$cust_info->last_name;
+			}
 		}
-		else
+
+		$total_payments = 0;
+
+		foreach($data['payments'] as $payment)
 		{
-			if($customer_id!=-1)
-			{
-				$cust_info=$this->Customer->get_info($customer_id);
-				if (isset($cust_info->company_name))
-				{
-					$data['customer']=$cust_info->company_name;
-				}
-				else
-				{
-					$data['customer']=$cust_info->first_name.' '.$cust_info->last_name;
-				}
-			}
-	
-			$total_payments = 0;
-	
-			foreach($data['payments'] as $payment)
-			{
-				$total_payments = bcadd($total_payments, $payment['payment_amount'], PRECISION);
-			}
-	
-			//SAVE sale to database
-			$data['sale_id']='POS '.$this->Sale_suspended->save($data['cart'], $customer_id,$employee_id,$comment,$invoice_number,$data['payments']);
-			if ($data['sale_id'] == 'POS -1')
-			{
-				$data['error_message'] = $this->lang->line('sales_transaction_failed');
-			}
-			$this->sale_lib->clear_all();
-			$this->_reload(array('success' => $this->lang->line('sales_successfully_suspended_sale')));
+			$total_payments = bcadd($total_payments, $payment['payment_amount'], PRECISION);
 		}
+
+		//SAVE sale to database
+		$data['sale_id'] = 'POS '.$this->Sale_suspended->save($data['cart'], $customer_id, $employee_id, $comment, $invoice_number, $data['payments']);
+		if ($data['sale_id'] == 'POS -1')
+		{
+			$data['error_message'] = $this->lang->line('sales_transaction_failed');
+		}
+
+		$this->sale_lib->clear_all();
+
+		$this->_reload(array('success' => $this->lang->line('sales_successfully_suspended_sale')));
 	}
 	
 	function suspended()
@@ -776,8 +842,7 @@ class Sales extends Secure_area
 		$sale_id=$this->input->post('sale_id');
 		$invoice_number=$this->input->post('invoice_number');
 		$exists=!empty($invoice_number) && $this->Sale->invoice_number_exists($invoice_number,$sale_id);
-		echo json_encode(array('success'=>!$exists,'message'=>$this->lang->line('sales_invoice_number_duplicate')));
+		echo json_encode(array('success'=>!$exists, 'message'=>$this->lang->line('sales_invoice_number_duplicate')));
 	}
-	
 }
 ?>

application/controllers/suppliers.php

@@ -73,6 +73,7 @@ class Suppliers extends Person_controller
 		);
 		$supplier_data=array(
 		'company_name'=>$this->input->post('company_name'),
+		'agency_name'=>$this->input->post('agency_name'),
 		'account_number'=>$this->input->post('account_number')=='' ? null:$this->input->post('account_number'),
 		);
 		if($this->Supplier->save($person_data,$supplier_data,$supplier_id))
@@ -131,5 +132,5 @@ class Suppliers extends Person_controller
 	{			
 		return 360;
 	}
-}
+}
 ?>

application/core/MY_Lang.php

@@ -3,7 +3,7 @@
 class MY_Lang extends CI_Lang
 {
 
-	function MY_Lang()
+	function __construct()
 	{
 		parent::__construct();
 	}

application/helpers/currency_helper.php

@@ -1,5 +1,4 @@
 <?php
-/** GARRISON MODIFIED 4/20/2013 **/
 function to_currency($number,$escape=FALSE)
 {
 	$CI =& get_instance();
@@ -22,7 +21,6 @@ function to_currency($number,$escape=FALSE)
     		return '-'.number_format(abs($number), 2, $decimal_point, $thousands_separator).$currency_symbol;
     }
 }
-/** END MODIFIED **/
 
 function to_currency_no_money($number)
 {

application/helpers/dateformat_helper.php

@@ -0,0 +1,69 @@
+<?php
+
+/*
+ * Matches each symbol of PHP date format standard
+ * with jQuery equivalent codeword
+ * @author Tristan Jahier
+ */
+function dateformat_jquery($php_format)
+{
+    $SYMBOLS_MATCHING = array(
+        // Day
+        'd' => 'dd',
+        'D' => 'D',
+        'j' => 'd',
+        'l' => 'DD',
+        'N' => '',
+        'S' => '',
+        'w' => '',
+        'z' => 'o',
+        // Week
+        'W' => '',
+        // Month
+        'F' => 'MM',
+        'm' => 'mm',
+        'M' => 'M',
+        'n' => 'm',
+        't' => '',
+        // Year
+        'L' => '',
+        'o' => '',
+        'Y' => 'yy',
+        'y' => 'y',
+        // Time
+        'a' => 'tt',
+        'A' => 'TT',
+        'B' => '',
+        'g' => 'h',
+        'G' => 'H',
+        'h' => 'hh',
+        'H' => 'HH',
+        'i' => 'mm',
+        's' => 'ss',
+        'u' => ''
+    );
+    $jqueryui_format = "";
+    $escaping = false;
+    for($i = 0; $i < strlen($php_format); $i++)
+    {
+        $char = $php_format[$i];
+        if($char === '\\') // PHP date format escaping character
+        {
+            $i++;
+            if($escaping) $jqueryui_format .= $php_format[$i];
+            else $jqueryui_format .= '\'' . $php_format[$i];
+            $escaping = true;
+        }
+        else
+        {
+            if($escaping) { $jqueryui_format .= "'"; $escaping = false; }
+            if(isset($SYMBOLS_MATCHING[$char]))
+                $jqueryui_format .= $SYMBOLS_MATCHING[$char];
+            else
+                $jqueryui_format .= $char;
+        }
+    }
+    return $jqueryui_format;
+}
+
+?>

application/helpers/report_helper.php

@@ -1,36 +1,45 @@
 <?php
 function get_simple_date_ranges()
 {
-		$CI =& get_instance();
-		$CI->load->language('reports');
-		$today =  date('Y-m-d');
-		$yesterday = date('Y-m-d', mktime(0,0,0,date("m"),date("d")-1,date("Y")));
-		$six_days_ago = date('Y-m-d', mktime(0,0,0,date("m"),date("d")-6,date("Y")));
-		$start_of_this_month = date('Y-m-d', mktime(0,0,0,date("m"),1,date("Y")));
-		$end_of_this_month = date('Y-m-d',strtotime('-1 second',strtotime('+1 month',strtotime(date('m').'/01/'.date('Y').' 00:00:00'))));
-		$start_of_last_month = date('Y-m-d', mktime(0,0,0,date("m")-1,1,date("Y")));
-		$end_of_last_month = date('Y-m-d',strtotime('-1 second',strtotime('+1 month',strtotime((date('m') - 1).'/01/'.date('Y').' 00:00:00'))));
-		$start_of_this_year =  date('Y-m-d', mktime(0,0,0,1,1,date("Y")));
-		$end_of_this_year =  date('Y-m-d', mktime(0,0,0,12,31,date("Y")));
-		$start_of_last_year =  date('Y-m-d', mktime(0,0,0,1,1,date("Y")-1));
-		$end_of_last_year =  date('Y-m-d', mktime(0,0,0,12,31,date("Y")-1));
-		$start_of_time =  date('Y-m-d', 0);
+	$CI =& get_instance();
+	$CI->load->language('reports');
 
-		return array(
-			$today. '/' . $today 								=> $CI->lang->line('reports_today'),
-			$yesterday. '/' . $yesterday						=> $CI->lang->line('reports_yesterday'),
-			$six_days_ago. '/' . $today 						=> $CI->lang->line('reports_last_7'),
-			$start_of_this_month . '/' . $end_of_this_month		=> $CI->lang->line('reports_this_month'),
-			$start_of_last_month . '/' . $end_of_last_month		=> $CI->lang->line('reports_last_month'),
-			$start_of_this_year . '/' . $end_of_this_year	 	=> $CI->lang->line('reports_this_year'),
-			$start_of_last_year . '/' . $end_of_last_year		=> $CI->lang->line('reports_last_year'),
-			$start_of_time . '/' . 	$today						=> $CI->lang->line('reports_all_time'),
-		);
+	$today = date('Y-m-d');
+	$today_last_year = date('Y-m-d', mktime(0,0,0,date("m"),date("d"),date("Y")-1));
+	$yesterday = date('Y-m-d', mktime(0,0,0,date("m"),date("d")-1,date("Y")));
+	$six_days_ago = date('Y-m-d', mktime(0,0,0,date("m"),date("d")-6,date("Y")));
+	$start_of_this_month = date('Y-m-d', mktime(0,0,0,date("m"),1,date("Y")));
+	$end_of_this_month = date('Y-m-d',strtotime('-1 second',strtotime('+1 month',strtotime(date('m').'/01/'.date('Y').' 00:00:00'))));
+	$start_of_this_month_last_year = date('Y-m-d', mktime(0,0,0,date("m"),1,date("Y")-1));
+	$end_of_this_month_last_year = date('Y-m-d',strtotime('-1 second',strtotime('+1 month',strtotime(date('m').'/01/'.(date('Y')-1).' 00:00:00'))));
+	$start_of_last_month = date('Y-m-d', mktime(0,0,0,date("m")-1,1,date("Y")));
+	$end_of_last_month = date('Y-m-d',strtotime('-1 second',strtotime('+1 month',strtotime((date('m') - 1).'/01/'.date('Y').' 00:00:00'))));
+	$start_of_this_year = date('Y-m-d', mktime(0,0,0,1,1,date("Y")));
+	$end_of_this_year = date('Y-m-d', mktime(0,0,0,12,31,date("Y")));
+	$start_of_last_year = date('Y-m-d', mktime(0,0,0,1,1,date("Y")-1));
+	$end_of_last_year = date('Y-m-d', mktime(0,0,0,12,31,date("Y")-1));
+	$start_of_time = date('Y-m-d', 0);
+
+	return array(
+		$today . '/' . $today => $CI->lang->line('reports_today'),
+		$today_last_year . '/' . $today_last_year => $CI->lang->line('reports_today_last_year'),
+		$yesterday . '/' . $yesterday => $CI->lang->line('reports_yesterday'),
+		$six_days_ago . '/' . $today => $CI->lang->line('reports_last_7'),
+		$start_of_this_month . '/' . $today => $CI->lang->line('reports_this_month_to_today'),
+		$start_of_this_month . '/' . $end_of_this_month => $CI->lang->line('reports_this_month'),
+		$start_of_this_month_last_year . '/' . $today_last_year => $CI->lang->line('reports_this_month_to_today_last_year'),
+		$start_of_this_month_last_year . '/' . $end_of_this_month_last_year	=> $CI->lang->line('reports_this_month_last_year'),
+		$start_of_last_month . '/' . $end_of_last_month => $CI->lang->line('reports_last_month'),
+		$start_of_this_year . '/' . $end_of_this_year => $CI->lang->line('reports_this_year'),
+		$start_of_last_year . '/' . $end_of_last_year => $CI->lang->line('reports_last_year'),
+		$start_of_time . '/' . 	$today => $CI->lang->line('reports_all_time')
+	);
 }
 
 function get_months()
 {
 	$months = array();
+
 	for($k=1;$k<=12;$k++)
 	{
 		$cur_month = mktime(0, 0, 0, $k, 1, 2000);
@@ -56,6 +65,7 @@ function get_days()
 function get_years()
 {
 	$years = array();
+
 	for($k=0;$k<10;$k++)
 	{
 		$years[date("Y")-$k] = date("Y")-$k;
@@ -83,6 +93,7 @@ function random_color()
     while(strlen($c)<6){
         $c .= sprintf("%02X", mt_rand(0, 255));
     }
+
     return $c;
 }
 

application/helpers/table_helper.php

@@ -1,16 +1,18 @@
 <?php
 
-function get_sales_manage_table($sales,$controller)
+function get_sales_manage_table($sales, $controller)
 {
 	$CI =& get_instance();
 	$table='<table class="tablesorter" id="sortable_table">';
 
 	$headers = array('&nbsp;',
+	$CI->lang->line('sales_receipt_number'),
 	$CI->lang->line('sales_sale_time'),
 	$CI->lang->line('customers_customer'),
 	$CI->lang->line('sales_amount_tendered'),
 	$CI->lang->line('sales_amount_due'),
-	$CI->lang->line('sales_receipt_number'),
+	$CI->lang->line('sales_change_due'),
+	$CI->lang->line('sales_payment'),
 	$CI->lang->line('sales_invoice_number'),
 	'&nbsp');
 
@@ -20,58 +22,99 @@ function get_sales_manage_table($sales,$controller)
 		$table.="<th>$header</th>";
 	}
 	$table.='</tr></thead><tbody>';
-	$table.=get_sales_manage_table_data_rows($sales,$controller);
+	$table.=get_sales_manage_table_data_rows($sales, $controller);
 	$table.='</tbody></table>';
+
 	return $table;
 }
 
 /*
- Gets the html data rows for the people.
+ Gets the html data rows for the sales.
  */
-function get_sales_manage_table_data_rows($sales,$controller)
+function get_sales_manage_table_data_rows($sales, $controller)
 {
 	$CI =& get_instance();
-	$table_data_rows='';
+	$table_data_rows = '';
+	$sum_amount_tendered = 0;
+	$sum_amount_due = 0;
+	$sum_change_due = 0;
 
-	foreach($sales->result_array() as $sale)
+	foreach($sales as $key=>$sale)
 	{
-		$table_data_rows.=get_sale_data_row($sale,$controller);
+		$table_data_rows .= get_sales_manage_sale_data_row($sale, $controller);
+		
+		$sum_amount_tendered += $sale['amount_tendered'];
+		$sum_amount_due += $sale['amount_due'];
+		$sum_change_due += $sale['change_due'];
 	}
 
-	if($sales->num_rows()==0)
+	if($table_data_rows == '')
 	{
-		$table_data_rows.="<tr><td colspan='8'><div class='warning_message' style='padding:7px;'>".$CI->lang->line('sales_no_sales_to_display')."</div></tr></tr>";
+		$table_data_rows .= "<tr><td colspan='10'><div class='warning_message' style='padding:7px;'>".$CI->lang->line('sales_no_sales_to_display')."</div></td></tr>";
+	}
+	else
+	{
+		$table_data_rows .= "<tr class='static-last'><td>&nbsp;</td><td>".$CI->lang->line('sales_total')."</td><td>&nbsp;</td><td>&nbsp;</td><td>".to_currency($sum_amount_tendered)."</td><td>".to_currency($sum_amount_due)."</td><td>".to_currency($sum_change_due)."</td><td colspan=\"3\"></td></tr>";
 	}
 
 	return $table_data_rows;
 }
 
-function get_sale_data_row($sale,$controller)
+function get_sales_manage_sale_data_row($sale, $controller)
 {
 	$CI =& get_instance();
-	$controller_name=$CI->uri->segment(1);
+	$controller_name = $CI->uri->segment(1);
 	$width = $controller->get_form_width();
 
 	$table_data_row='<tr>';
-	$table_data_row.='<td width="3%"><input type="checkbox" id="sale_"' . $sale[ 'sale_id' ] . ' value="' . $sale[ 'sale_id' ]. '" /></td>';
-	$table_data_row.='<td width="17%">'.date('d/m/Y H:i' , strtotime($sale[ 'sale_time' ])).'</td>';
-	$table_data_row.='<td width="23%">'.character_limiter( $sale[ 'last_name' ] . " " . $sale[ 'first_name' ] ,25).'</td>';
-	$table_data_row.='<td width="10%">'.to_currency( $sale[ 'amount_tendered' ] ).'</td>';
-	$table_data_row.='<td width="10%">'.to_currency( $sale[ 'amount_due' ] ).'</td>';
-	$table_data_row.='<td width="15%">'.'Ticket ' . $sale[ 'sale_id' ]. '</td>';
-	$table_data_row.='<td width="10%">'.$sale[ 'invoice_number' ].'</td>';
-	$table_data_row.='<td width="12%">';
-	$table_data_row.=anchor($controller_name."/edit/" . $sale[ 'sale_id' ] . "/width:$width", $CI->lang->line('common_edit'),array('class'=>'thickbox','title'=>$CI->lang->line($controller_name.'_update')));
+	$table_data_row.='<td width="3%"><input type="checkbox" id="sale_' . $sale['sale_id'] . '" value="' . $sale['sale_id']. '" /></td>';
+	$table_data_row.='<td width="15%">'.'POS ' . $sale['sale_id'] . '</td>';
+	$table_data_row.='<td width="17%">'.date( $CI->config->item('dateformat') . ' ' . $CI->config->item('timeformat'), strtotime($sale['sale_time']) ).'</td>';
+	$table_data_row.='<td width="23%">'.character_limiter( $sale['customer_name'], 25).'</td>';
+	$table_data_row.='<td width="8%">'.to_currency( $sale['amount_tendered'] ).'</td>';
+	$table_data_row.='<td width="8%">'.to_currency( $sale['amount_due'] ).'</td>';
+	$table_data_row.='<td width="8%">'.to_currency( $sale['change_due'] ).'</td>';
+	$table_data_row.='<td width="12%">'.$sale['payment_type'].'</td>';
+	$table_data_row.='<td width="8%">'.$sale['invoice_number'].'</td>';
+	$table_data_row.='<td width="8%">';
+	$table_data_row.=anchor($controller_name."/edit/" . $sale['sale_id'] . "/width:$width", $CI->lang->line('common_edit'),array('class'=>'thickbox','title'=>$CI->lang->line($controller_name.'_update')));
 	$table_data_row.='&nbsp;&nbsp;&nbsp;&nbsp;';
-	$table_data_row.='<a href="'.site_url($controller_name. "/receipt/" . $sale[ 'sale_id' ]) . '">' . $CI->lang->line('sales_show_receipt') .  '</a>';
+	$table_data_row.='<a href="'.site_url($controller_name. "/receipt/" . $sale['sale_id']) . '">' . $CI->lang->line('sales_show_receipt') . '</a>';
 	$table_data_row.='&nbsp;&nbsp;&nbsp;&nbsp;';
-	$table_data_row.='<a href="'.site_url($controller_name. "/invoice/" . $sale[ 'sale_id' ]) . '">' . $CI->lang->line('sales_show_invoice') .  '</a>';
+	$table_data_row.='<a href="'.site_url($controller_name. "/invoice/" . $sale['sale_id']) . '">' . $CI->lang->line('sales_show_invoice') . '</a>';
 	$table_data_row.='</td>';
 	$table_data_row.='</tr>';
 
 	return $table_data_row;
 }
 
+/*
+Get the sales payments summary
+*/
+function get_sales_manage_payments_summary($payments, $sales, $controller)
+{
+	$CI =& get_instance();
+	$table='<div id="report_summary">';
+
+	foreach($payments as $key=>$payment)
+	{
+		$amount = $payment['payment_amount'];
+
+		// WARNING: the strong assumption here is that if a change is due it was a cash transaction always
+		// therefore we remove from the total cash amount any change due
+		if( $payment['payment_type'] == $CI->lang->line('sales_cash') )
+		{
+			foreach($sales as $key=>$sale)
+			{
+				$amount -= $sale['change_due'];
+			}
+		}
+		$table.='<div class="summary_row">'.$payment['payment_type'].': '.to_currency( $amount ) . '</div>';
+	}
+	$table.='</div>';
+	return $table;
+}
+
 /*
 Gets the html table to manage people.
 */
@@ -95,6 +138,7 @@ function get_people_manage_table($people,$controller)
 	$table.='</tr></thead><tbody>';
 	$table.=get_people_manage_table_data_rows($people,$controller);
 	$table.='</tbody></table>';
+
 	return $table;
 }
 
@@ -148,6 +192,7 @@ function get_detailed_data_row($row, $controller)
 		$table_data_row.='</td>';
 	}
 	$table_data_row.='</tr>';
+
 	return $table_data_row;
 }
 
@@ -161,10 +206,12 @@ function get_supplier_manage_table($suppliers,$controller)
 	
 	$headers = array('<input type="checkbox" id="select_all" />',
 	$CI->lang->line('suppliers_company_name'),
+	$CI->lang->line('suppliers_agency_name'),
 	$CI->lang->line('common_last_name'),
 	$CI->lang->line('common_first_name'),
 	$CI->lang->line('common_email'),
 	$CI->lang->line('common_phone_number'),
+	$CI->lang->line('suppliers_supplier_id'),
 	'&nbsp');
 	
 	$table.='<thead><tr>';
@@ -175,6 +222,7 @@ function get_supplier_manage_table($suppliers,$controller)
 	$table.='</tr></thead><tbody>';
 	$table.=get_supplier_manage_table_data_rows($suppliers,$controller);
 	$table.='</tbody></table>';
+
 	return $table;
 }
 
@@ -193,7 +241,7 @@ function get_supplier_manage_table_data_rows($suppliers,$controller)
 	
 	if($suppliers->num_rows()==0)
 	{
-		$table_data_rows.="<tr><td colspan='7'><div class='warning_message' style='padding:7px;'>".$CI->lang->line('common_no_persons_to_display')."</div></tr></tr>";
+		$table_data_rows.="<tr><td colspan='9'><div class='warning_message' style='padding:7px;'>".$CI->lang->line('common_no_persons_to_display')."</div></td></tr>";
 	}
 	
 	return $table_data_rows;
@@ -208,11 +256,13 @@ function get_supplier_data_row($supplier,$controller)
 	$table_data_row='<tr>';
 	$table_data_row.="<td width='5%'><input type='checkbox' id='person_$supplier->person_id' value='".$supplier->person_id."'/></td>";
 	$table_data_row.='<td width="17%">'.character_limiter($supplier->company_name,13).'</td>';
+	$table_data_row.='<td width="17%">'.character_limiter($supplier->agency_name,13).'</td>';
 	$table_data_row.='<td width="17%">'.character_limiter($supplier->last_name,13).'</td>';
 	$table_data_row.='<td width="17%">'.character_limiter($supplier->first_name,13).'</td>';
 	$table_data_row.='<td width="22%">'.mailto($supplier->email,character_limiter($supplier->email,22)).'</td>';
-	$table_data_row.='<td width="17%">'.character_limiter($supplier->phone_number,13).'</td>';		
-	$table_data_row.='<td width="5%">'.anchor($controller_name."/view/$supplier->person_id/width:$width", $CI->lang->line('common_edit'),array('class'=>'thickbox','title'=>$CI->lang->line($controller_name.'_update'))).'</td>';		
+	$table_data_row.='<td width="17%">'.character_limiter($supplier->phone_number,13).'</td>';
+	$table_data_row.='<td width="5%">'.character_limiter($supplier->person_id,5).'</td>';
+	$table_data_row.='<td width="5%">'.anchor($controller_name."/view/$supplier->person_id/width:$width", $CI->lang->line('common_edit'),array('class'=>'thickbox','title'=>$CI->lang->line($controller_name.'_update'))).'</td>';
 	$table_data_row.='</tr>';
 	
 	return $table_data_row;
@@ -230,6 +280,7 @@ function get_items_manage_table($items,$controller)
 	$CI->lang->line('items_item_number'),
 	$CI->lang->line('items_name'),
 	$CI->lang->line('items_category'),
+	$CI->lang->line('suppliers_company_name'),
 	$CI->lang->line('items_cost_price'),
 	$CI->lang->line('items_unit_price'),
 	$CI->lang->line('items_quantity'),
@@ -247,6 +298,7 @@ function get_items_manage_table($items,$controller)
 	$table.='</tr></thead><tbody>';
 	$table.=get_items_manage_table_data_rows($items,$controller);
 	$table.='</tbody></table>';
+
 	return $table;
 }
 
@@ -265,7 +317,7 @@ function get_items_manage_table_data_rows($items,$controller)
 	
 	if($items->num_rows()==0)
 	{
-		$table_data_rows.="<tr><td colspan='12'><div class='warning_message' style='padding:7px;'>".$CI->lang->line('items_no_items_to_display')."</div></tr></tr>";
+		$table_data_rows.="<tr><td colspan='12'><div class='warning_message' style='padding:7px;'>".$CI->lang->line('items_no_items_to_display')."</div></td></tr>";
 	}
 	
 	return $table_data_rows;
@@ -291,6 +343,7 @@ function get_item_data_row($item,$controller)
 	$table_data_row.='<td width="15%">'.$item->item_number.'</td>';
 	$table_data_row.='<td width="20%">'.$item->name.'</td>';
 	$table_data_row.='<td width="14%">'.$item->category.'</td>';
+	$table_data_row.='<td width="14%">'.$item->company_name.'</td>';
 	$table_data_row.='<td width="14%">'.to_currency($item->cost_price).'</td>';
 	$table_data_row.='<td width="14%">'.to_currency($item->unit_price).'</td>';
     $table_data_row.='<td width="14%">'.$item->quantity.'</td>';
@@ -306,12 +359,12 @@ function get_item_data_row($item,$controller)
 	}
 	$table_data_row.='<td align="center" width="55px">' . $image . '</td>';
 	$table_data_row.='<td width="5%">'.anchor($controller_name."/view/$item->item_id/width:$width", $CI->lang->line('common_edit'),array('class'=>'thickbox','title'=>$CI->lang->line($controller_name.'_update'))).'</td>';		
-	
-	//Ramel Inventory Tracking
+
 	$table_data_row.='<td width="10%">'.anchor($controller_name."/inventory/$item->item_id/width:$width", $CI->lang->line('common_inv'),array('class'=>'thickbox','title'=>$CI->lang->line($controller_name.'_count')))./*'</td>';//inventory count	
 	$table_data_row.='<td width="5%">'*/'&nbsp;&nbsp;&nbsp;&nbsp;'.anchor($controller_name."/count_details/$item->item_id/width:$width", $CI->lang->line('common_det'),array('class'=>'thickbox','title'=>$CI->lang->line($controller_name.'_details_count'))).'</td>';//inventory details	
 	
 	$table_data_row.='</tr>';
+
 	return $table_data_row;
 }
 
@@ -321,7 +374,6 @@ Gets the html table to manage giftcards.
 function get_giftcards_manage_table( $giftcards, $controller )
 {
 	$CI =& get_instance();
-	
 	$table='<table class="tablesorter" id="sortable_table">';
 	
 	$headers = array('<input type="checkbox" id="select_all" />', 
@@ -340,6 +392,7 @@ function get_giftcards_manage_table( $giftcards, $controller )
 	$table.='</tr></thead><tbody>';
 	$table.=get_giftcards_manage_table_data_rows( $giftcards, $controller );
 	$table.='</tbody></table>';
+
 	return $table;
 }
 
@@ -358,13 +411,12 @@ function get_giftcards_manage_table_data_rows( $giftcards, $controller )
 	
 	if($giftcards->num_rows()==0)
 	{
-		$table_data_rows.="<tr><td colspan='11'><div class='warning_message' style='padding:7px;'>".$CI->lang->line('giftcards_no_giftcards_to_display')."</div></tr></tr>";
+		$table_data_rows.="<tr><td colspan='11'><div class='warning_message' style='padding:7px;'>".$CI->lang->line('giftcards_no_giftcards_to_display')."</div></td></tr>";
 	}
 	
 	return $table_data_rows;
 }
 
-/** GARRISON MODIFIED 4/25/2013 **/
 function get_giftcard_data_row($giftcard,$controller)
 {
 	$CI =& get_instance();
@@ -377,12 +429,11 @@ function get_giftcard_data_row($giftcard,$controller)
 	$table_data_row.='<td width="15%">'.$giftcard->first_name.'</td>';
 	$table_data_row.='<td width="15%">'.$giftcard->giftcard_number.'</td>';
 	$table_data_row.='<td width="20%">'.to_currency($giftcard->value).'</td>';
-	$table_data_row.='<td width="5%">'.anchor($controller_name."/view/$giftcard->giftcard_id/width:$width", $CI->lang->line('common_edit'),array('class'=>'thickbox','title'=>$CI->lang->line($controller_name.'_update'))).'</td>';		
-	
+	$table_data_row.='<td width="5%">'.anchor($controller_name."/view/$giftcard->giftcard_id/width:$width", $CI->lang->line('common_edit'),array('class'=>'thickbox','title'=>$CI->lang->line($controller_name.'_update'))).'</td>';
 	$table_data_row.='</tr>';
+
 	return $table_data_row;
 }
-/** END GARRISON MODIFIED **/
 
 /*
 Gets the html table to manage item kits.
@@ -390,12 +441,14 @@ Gets the html table to manage item kits.
 function get_item_kits_manage_table( $item_kits, $controller )
 {
 	$CI =& get_instance();
-	
 	$table='<table class="tablesorter" id="sortable_table">';
 	
 	$headers = array('<input type="checkbox" id="select_all" />', 
+	$CI->lang->line('item_kits_kit'),
 	$CI->lang->line('item_kits_name'),
 	$CI->lang->line('item_kits_description'),
+	$CI->lang->line('items_cost_price'),
+	$CI->lang->line('items_unit_price'),
 	'&nbsp', 
 	);
 	
@@ -407,31 +460,32 @@ function get_item_kits_manage_table( $item_kits, $controller )
 	$table.='</tr></thead><tbody>';
 	$table.=get_item_kits_manage_table_data_rows( $item_kits, $controller );
 	$table.='</tbody></table>';
+
 	return $table;
 }
 
 /*
 Gets the html data rows for the item kits.
 */
-function get_item_kits_manage_table_data_rows( $item_kits, $controller )
+function get_item_kits_manage_table_data_rows($item_kits, $controller)
 {
 	$CI =& get_instance();
 	$table_data_rows='';
 	
 	foreach($item_kits->result() as $item_kit)
 	{
-		$table_data_rows.=get_item_kit_data_row( $item_kit, $controller );
+		$table_data_rows .= get_item_kit_data_row($item_kit, $controller);
 	}
 	
 	if($item_kits->num_rows()==0)
 	{
-		$table_data_rows.="<tr><td colspan='11'><div class='warning_message' style='padding:7px;'>".$CI->lang->line('item_kits_no_item_kits_to_display')."</div></tr></tr>";
+		$table_data_rows .= "<tr><td colspan='11'><div class='warning_message' style='padding:7px;'>".$CI->lang->line('item_kits_no_item_kits_to_display')."</div></td></tr>";
 	}
 	
 	return $table_data_rows;
 }
 
-function get_item_kit_data_row($item_kit,$controller)
+function get_item_kit_data_row($item_kit, $controller)
 {
 	$CI =& get_instance();
 	$controller_name=strtolower(get_class($CI));
@@ -439,12 +493,15 @@ function get_item_kit_data_row($item_kit,$controller)
 
 	$table_data_row='<tr>';
 	$table_data_row.="<td width='3%'><input type='checkbox' id='item_kit_$item_kit->item_kit_id' value='".$item_kit->item_kit_id."'/></td>";
+	$table_data_row.='<td width="15%">'.'KIT '.$item_kit->item_kit_id.'</td>';
 	$table_data_row.='<td width="15%">'.$item_kit->name.'</td>';
 	$table_data_row.='<td width="20%">'.character_limiter($item_kit->description, 25).'</td>';
-	$table_data_row.='<td width="5%">'.anchor($controller_name."/view/$item_kit->item_kit_id/width:$width", $CI->lang->line('common_edit'),array('class'=>'thickbox','title'=>$CI->lang->line($controller_name.'_update'))).'</td>';		
-	
+	$table_data_row.='<td width="15%">'.to_currency($item_kit->total_cost_price).'</td>';
+	$table_data_row.='<td width="15%">'.to_currency($item_kit->total_unit_price).'</td>';
+	$table_data_row.='<td width="5%">'.anchor($controller_name."/view/$item_kit->item_kit_id/width:$width", $CI->lang->line('common_edit'),array('class'=>'thickbox','title'=>$CI->lang->line($controller_name.'_update'))).'</td>';
 	$table_data_row.='</tr>';
+
 	return $table_data_row;
 }
 
-?>
+?>

application/hooks/load_config.php

@@ -24,7 +24,7 @@ function load_config()
         $map = directory_map('./application/language/' . $language);
         foreach($map as $file)
         {
-            if ( substr(strrchr($file,'.'),1) == "php")
+            if ( !is_array($file) && substr(strrchr($file,'.'), 1) == "php")
             {
                 $CI->lang->load( str_replace( '_lang.php', '', $file ),  $language);    
             }

application/language/de-CH/common_lang.php

@@ -0,0 +1,57 @@
+<?php 
+
+$lang["common_address_1"] = "Adresse 1";
+$lang["common_address_2"] = "Adresse 2";
+$lang["common_city"] = "Stadt";
+$lang["common_comments"] = "Kommentare";
+$lang["common_common"] = "Allgemein";
+$lang["common_confirm_search"] = "Sie haben einen oder mehrere Zeilen gewählt. Nach der Verarbeitung werden diese nicht mehr selektiert sein. Wollen Sie die Suche dennoch verarbeiten?";
+$lang["common_country"] = "Land";
+$lang["common_date"] = "Datum";
+$lang["common_delete"] = "Löschen";
+$lang["common_print"] = "Drucken";
+$lang["common_det"] = "Details";
+$lang["common_edit"] = "Ändern";
+$lang["common_email"] = "Email";
+$lang["common_email_invalid_format"] = "Das Email Format ist nicht korrekt";
+$lang["common_fields_required_message"] = "Die Felder in rot sind erforderlich";
+$lang["common_first_name"] = "Vorname";
+$lang["common_first_name_required"] = "Vorname ist erforderlich";
+$lang["common_first_page"] = "Erste";
+$lang["common_gender"] = "Geschlecht";
+$lang["common_gender_female"] = "F";
+$lang["common_gender_male"] = "M";
+$lang["common_inv"] = "Lag";
+$lang["common_last_name"] = "Nachname";
+$lang["common_last_name_required"] = "Nachname ist erforderlich";
+$lang["common_last_page"] = "Letzte";
+$lang["common_learn_about_project"] = "für neueste Nachrichten zum Projekt";
+$lang["common_list_of"] = "Liste von";
+$lang["common_logout"] = "Logout";
+$lang["common_new"] = "Neu";
+$lang["common_no_persons_to_display"] = "Keine Personen zum Anzeigen";
+$lang["common_or"] = "Oder";
+$lang["common_phone_number"] = "Telefon";
+$lang["common_phone_number_required"] = "Telefon ist erforderlich";
+$lang["common_please_visit_my"] = "Bitte beuschen Sie ";
+$lang["common_powered_by"] = "Powered by";
+$lang["common_price"] = "Preis";
+$lang["common_remove"] = "Annulieren";
+$lang["common_return_policy"] = "Rücknahmepolitik";
+$lang["common_search"] = "Suche";
+$lang["common_search_options"] = "Suchkriterien";
+$lang["common_searched_for"] = "Gescuht nach";
+$lang["common_state"] = "BL/Kanton";
+$lang["common_submit"] = "Senden";
+$lang["common_view_recent_sales"] = "Letzte Verkäufe";
+$lang["common_website"] = "Website";
+$lang["common_welcome"] = "Willkommen";
+$lang["common_welcome_message"] = "Willkommen bei PHP Point Of Sales, zum Beginnen auf ein Modul klicken";
+$lang["common_you_are_using_ospos"] = "Sie verwenden Open Source Point Of Sales Version";
+$lang["common_zip"] = "PLZ";
+$lang["common_import"] = "Import";
+$lang["common_download_import_template"] = "Download Import Excel Voralge (CSV)";
+$lang["common_import_file_path"] = "Dateipfad";
+$lang["common_import_excel"] = "Excel Import";
+$lang["common_import_full_path"] = "Voller Dateipfad zum Excel File notwendig";
+$lang["common_required"] = "Erforderlich";

application/language/de-CH/config_lang.php

@@ -0,0 +1,121 @@
+<?php 
+
+$lang["config_address"] = "Adresse";
+$lang["config_address_required"] = "Adresse ist erforderlich";
+$lang["config_backup_button"] = "Sicherung";
+$lang["config_backup_database"] = "Sicherungs-Datenbank";
+$lang["config_barcode_company"] = "Firmenname";
+$lang["config_barcode_configuration"] = "Barcodes";
+$lang["config_barcode_content"] = "Barcode Inhalt";
+$lang["config_barcode_first_row"] = "Erste Zeile";
+$lang["config_barcode_font"] = "Schrift";
+$lang["config_barcode_height"] = "Höhe";
+$lang["config_barcode_id"] = "Artikel-Nr/Name";
+$lang["config_barcode_info"] = "Barcode Einstellung";
+$lang["config_barcode_layout"] = "Barcode Layout";
+$lang["config_barcode_name"] = "Name";
+$lang["config_barcode_number"] = "UPC/EAN/ISBN";
+$lang["config_barcode_number_in_row"] = "Nummer in Zeile";
+$lang["config_barcode_page_cellspacing"] = "Zellenabstand auf Seite";
+$lang["config_barcode_page_width"] = "Seitenbreite";
+$lang["config_barcode_price"] = "Preis";
+$lang["config_barcode_quality"] = "Qualität (1-100)";
+$lang["config_barcode_second_row"] = "Zeile 2";
+$lang["config_barcode_third_row"] = "Zeile 3";
+$lang["config_barcode_type"] = "Barcode Typ";
+$lang["config_barcode_width"] = "Breite (px)";
+$lang["config_barcode_generate_if_empty"] = "Generiere Barcode wenn leer";
+$lang["config_company"] = "Firmenname";
+$lang["config_company_logo"] = "Logo";
+$lang["config_company_required"] = "Firmenname ist erforderlich";
+$lang["config_company_website_url"] = "Webseite ist nicht in korrektem Format";
+$lang["config_currency_side"] = "Pos. rechts";
+$lang["config_currency_symbol"] = "Währungssymbol";
+$lang["config_custom1"] = "Zusatzfeld 1";
+$lang["config_custom10"] = "Zusatzfeld 10";
+$lang["config_custom2"] = "Zusatzfeld 2";
+$lang["config_custom3"] = "Zusatzfeld 3";
+$lang["config_custom4"] = "Zusatzfeld 4";
+$lang["config_custom5"] = "Zusatzfeld 5";
+$lang["config_custom6"] = "Zusatzfeld 6";
+$lang["config_custom7"] = "Zusatzfeld 7";
+$lang["config_custom8"] = "Zusatzfeld 8";
+$lang["config_custom9"] = "Zusatzfeld 9";
+$lang["config_decimal_point"] = "Dezimaltrennzeichen";
+$lang["config_default_barcode_font_size_number"] = "Die Barcode Schriftgrösse muss eine Zahl sein";
+$lang["config_default_barcode_font_size_required"] = "Die Barcode Schriftgrösse ist erforderlich";
+$lang["config_default_barcode_height_number"] = "Die Barcode Höhe muss eine Zahl sein";
+$lang["config_default_barcode_height_required"] = "Die Barcode Höhe ist erforderlich";
+$lang["config_default_barcode_num_in_row_number"] = "Die Barcode Num muss eine Zahl sein";
+$lang["config_default_barcode_num_in_row_required"] = "Die Barcode Num ist erforderlich";
+$lang["config_default_barcode_page_cellspacing_number"] = "Der Barcode Zellabstand muss eine Zahl sein";
+$lang["config_default_barcode_page_cellspacing_required"] = "Der Barcode Zellabstand ist erforderlich";
+$lang["config_default_barcode_page_width_number"] = "Die Barcode Seitenbreite muss eine Zahl sein";
+$lang["config_default_barcode_page_width_required"] = "Die Barcode Seitenbreite ist erforderlich";
+$lang["config_default_barcode_quality_number"] = "Die Barcode Qualität muss eine Zahl sein";
+$lang["config_default_barcode_quality_required"] = "Die Barcode Qualität ist erforderlich";
+$lang["config_default_barcode_width_number"] = "Die Barcode Breite muss eine Zahl sein";
+$lang["config_default_barcode_width_required"] = "Die Barcode Breite ist erforderlich";
+$lang["config_default_sales_discount"] = "Standard Verkaufsrabatt";
+$lang["config_default_sales_discount_number"] = "Der Standard Verkaufsrabatt muss eine Zahl sein";
+$lang["config_default_sales_discount_required"] = "Der Standard Verkaufsrabatt ist erforderlich";
+$lang["config_default_tax_rate"] = "MWSt %";
+$lang["config_default_tax_rate_1"] = "MWSt 1";
+$lang["config_default_tax_rate_2"] = "MWSt 2";
+$lang["config_default_tax_rate_number"] = "MWSt Rate";
+$lang["config_default_tax_rate_required"] = "MWSt ist erforderlich";
+$lang["config_fax"] = "Fax";
+$lang["config_general_configuration"] = "Einstellungen";
+$lang["config_info"] = "Systemeinstellungen";
+$lang["config_invoice_default_comments"] = "Rechnungskommentar";
+$lang["config_invoice_email_message"] = "Rechnungsvorlage (Email)";
+$lang["config_invoice_printer"] = "Rechnungsdrucker";
+$lang["config_jsprintsetup_required"] = "Warnung! Diese Funktion ist nur funktionsfähig";
+$lang["config_language"] = "Sprache";
+$lang["config_lines_per_page"] = "Zeilen pro Seite";
+$lang["config_lines_per_page_number"] = "Zeilen pro Seite muss eine Zahl sein";
+$lang["config_lines_per_page_required"] = "Zeilen pro Seite ist erforderlich";
+$lang["config_location_configuration"] = "Lagerort";
+$lang["config_location_info"] = "Lagerort-Information";
+$lang["config_logout"] = "Wollen Sie eine Sicherung machen vor dem Beenden? Klicke [OK] für Sicherung";
+$lang["config_number_format"] = "Zahlenformat";
+$lang["config_phone"] = "Telefon";
+$lang["config_phone_required"] = "Telefon ist erforderlich";
+$lang["config_print_bottom_margin"] = "Unterer Rand";
+$lang["config_print_bottom_margin_number"] = "Unterer Rand muss eine Zahl sein";
+$lang["config_print_bottom_margin_required"] = "Unterer Rand ist erforderlich";
+$lang["config_print_footer"] = "Drucke Browser Fusszeile";
+$lang["config_print_header"] = "Drucke Browser Kopfzeile";
+$lang["config_print_left_margin"] = "Rand links";
+$lang["config_print_left_margin_number"] = "Rand links muss eine Zahl sein";
+$lang["config_print_left_margin_required"] = "Rand links ist erforderlich";
+$lang["config_print_right_margin"] = "Rand rechts";
+$lang["config_print_right_margin_number"] = "Rand rechts muss eine Zahl sein";
+$lang["config_print_right_margin_required"] = "Rand rechts ist erforderlich";
+$lang["config_print_silently"] = "Zeige Druckdialog";
+$lang["config_print_top_margin"] = "Rand oben";
+$lang["config_print_top_margin_number"] = "Rand oben muss eine Zahl sein";
+$lang["config_print_top_margin_required"] = "Rand oben ist erforderlich";
+$lang["config_receipt_configuration"] = "Druckereinstellungen";
+$lang["config_receipt_info"] = "Quittungsinformation";
+$lang["config_receipt_printer"] = "Quittungsdrucker";
+$lang["config_receipt_show_taxes"] = "Zeige MWSt";
+$lang["config_receiving_calculate_average_price"] = "Berechne Durchschnittseinkaufspreis";
+$lang["config_recv_invoice_format"] = "Format Eingangsrechnung";
+$lang["config_return_policy_required"] = "Rücknahmepolitik erforderlich";
+$lang["config_sales_invoice_format"] = "Format Verkaufsrechnung";
+$lang["config_saved_successfully"] = "Einstellungen erfolgreich gesichert";
+$lang["config_saved_unsuccessfully"] = "Einstellungen konnten nicht gesichert werden";
+$lang["config_show_total_discount"] = "Zeige Gesamtrabatt";
+$lang["config_stock_location"] = "Lagerort";
+$lang["config_stock_location_duplicate"] = "Bitte verwenden Sie einen eindeutigen Lagerort";
+$lang["config_stock_location_invalid_chars"] = "Der Lagerort kann keine Unterstriche enthalten";
+$lang["config_stock_location_required"] = "Lagerort Nummer ist erforderlich";
+$lang["config_tax_included"] = "MWSt inbegriffen";
+$lang["config_thousands_separator"] = "Tausendertrennzeichen";
+$lang["config_timezone"] = "Zeitzone";
+$lang["config_use_invoice_template"] = "Verwende Rechnungsvorlage";
+$lang["config_website"] = "Website";
+$lang["config_locale_configuration"] = "Länderkonfiguration";
+$lang["config_locale_info"] = "Info Länderkonfiguration";
+$lang["config_datetimeformat"] = "Datum und Zeit";

application/language/de-CH/customers_lang.php

@@ -0,0 +1,19 @@
+<?php 
+
+$lang["customers_account_number"] = "Konto-Nr.";
+$lang["customers_account_number_duplicate"] = "Diese Konto-Nr. existiert bereits";
+$lang["customers_basic_information"] = "Kundeninformation";
+$lang["customers_cannot_be_deleted"] = "Kunde kann nicht gelöscht werden, ein oder mehrere Kunden weisen Verkäufe auf";
+$lang["customers_company_name"] = "Firmenname";
+$lang["customers_confirm_delete"] = "Wollen Sie die gewählten Kunden wirklich löschen?";
+$lang["customers_customer"] = "Kunde";
+$lang["customers_error_adding_updating"] = "Fehler beim Hinzufügen/Ändern";
+$lang["customers_new"] = "Neuer Kunde";
+$lang["customers_none_selected"] = "Sie haben keinen Kunde zum Löschen gewählt";
+$lang["customers_one_or_multiple"] = "Kunde(n)";
+$lang["customers_successful_adding"] = "Kunde erfolgreich hinzugefügt";
+$lang["customers_successful_deleted"] = "Löschung erfolgreich";
+$lang["customers_successful_updating"] = "Änderung erfolgreich";
+$lang["customers_taxable"] = "Steuerpflichtig";
+$lang["customers_update"] = "Kunde ändern";
+$lang["customers_import_items_excel"] = "Importiere Kunden via Excel";

application/language/de-CH/employees_lang.php

@@ -0,0 +1,28 @@
+<?php 
+
+$lang["employees_basic_information"] = "Mitarbeiter-Information";
+$lang["employees_cannot_be_deleted"] = "Konnte gewählten Mitarbeiter nicht löschen, einer oder mehrere weisen Verkäufe aus.";
+$lang["employees_confirm_delete"] = "Wollen Sie diesen Mitarbeiter wirklich löschen?";
+$lang["employees_employee"] = "Mitarbeiter";
+$lang["employees_error_adding_updating"] = "Fehler beim Hinzufügen/Ändern";
+$lang["employees_error_deleting_demo_admin"] = "Sie können den Admin nicht löschen";
+$lang["employees_error_updating_demo_admin"] = "Sie können den Admin nicht ändern";
+$lang["employees_login_info"] = "Mitarbeiter Login";
+$lang["employees_new"] = "Neuer Mitarbeiter";
+$lang["employees_none_selected"] = "Sie haben keinen Mitarbeiter zum Löschen gewählt";
+$lang["employees_one_or_multiple"] = "Mitarbeiter";
+$lang["employees_password"] = "Passwort";
+$lang["employees_password_minlength"] = "Passwort muss mindestens 8 Zeichen lang sein";
+$lang["employees_password_must_match"] = "Passwörter passen nicht überein";
+$lang["employees_password_required"] = "Passwort ist erforderlich";
+$lang["employees_permission_desc"] = "Klicken Sie unten, um die jeweiligen Zugangsrechte zu aktivieren";
+$lang["employees_permission_info"] = "Mitarbeiter Zugangsrechte";
+$lang["employees_repeat_password"] = "Wiederhole Passwort";
+$lang["employees_successful_adding"] = "Hinzufügen erfolgreich";
+$lang["employees_successful_deleted"] = "Löschung erfolgreich";
+$lang["employees_successful_updating"] = "Änderung erfolgreich";
+$lang["employees_update"] = "Mitarbeiter ändern";
+$lang["employees_username"] = "Benutzername";
+$lang["employees_username_minlength"] = "Benutzername muss mindestens 5 Zeichen lang sein";
+$lang["employees_username_required"] = "Benutzername ist erforderlich";
+$lang["employees_subpermission_required"] = "Fügen Sie mindestens ein Zugangsrecht pro Modul hinzu";

application/language/de-CH/error_lang.php

@@ -0,0 +1,4 @@
+<?php 
+
+$lang["error_no_permission_module"] = "Sie haben nicht die Zugangsrechte für das gewählte Modul";
+$lang["error_unknown"] = "Unbekannter Fehler";

application/language/de-CH/giftcards_lang.php

@@ -0,0 +1,70 @@
+<?php 
+
+$lang["giftcards_add_minus"] = "Bestandsänderung";
+$lang["giftcards_allow_alt_description"] = "Erlaube Alternative Bezeichnung";
+$lang["giftcards_amazon"] = "Amazon";
+$lang["giftcards_remaining_balance"] = "Restwert von Gutschein %1 ist %2!";
+$lang["giftcards_basic_information"] = "Gutschein Information";
+$lang["giftcards_bulk_edit"] = "Sammeländerung";
+$lang["giftcards_cannot_be_deleted"] = "Konnte gewählte Gutscheine nicht löschen, einer oder mehrere weisen Verkäufe auf";
+$lang["giftcards_cannot_find_giftcard"] = "Konnte keinen Gutschein finden";
+$lang["giftcards_card_value"] = "Wert";
+$lang["giftcards_category"] = "Kategorie";
+$lang["giftcards_change_all_to_allow_alt_desc"] = "Erlaube Alt. Bez. für ALLE";
+$lang["giftcards_change_all_to_not_allow_allow_desc"] = "Erlaube Alt. Bez. für KEINEN";
+$lang["giftcards_change_all_to_serialized"] = "Ändere alle zu serialisiert";
+$lang["giftcards_change_all_to_unserialized"] = "Ändere alle zu NICHT serialisiert";
+$lang["giftcards_confirm_bulk_edit"] = "Wollen Sie alle gewählten Gutscheine ändern?";
+$lang["giftcards_confirm_delete"] = "Wollen Sie alle gewählten Gutscheine löschen?";
+$lang["giftcards_cost_price"] = "Einstandspreis";
+$lang["giftcards_count"] = "Bestandsänderung";
+$lang["giftcards_current_quantity"] = "Aktuelle Menge";
+$lang["giftcards_description"] = "Bezeichnung";
+$lang["giftcards_details_count"] = "Bestandsdetails";
+$lang["giftcards_do_nothing"] = "Tue nichts";
+$lang["giftcards_edit_fields_you_want_to_update"] = "Wollen Sie die Felder für ALLE gewählten Gutscheine ändern?";
+$lang["giftcards_edit_multiple_giftcards"] = "Sammeländerung";
+$lang["giftcards_error_adding_updating"] = "Fehler beim Hinzufügen/Ändern";
+$lang["giftcards_error_updating_multiple"] = "Fehler beim Ändern";
+$lang["giftcards_excel_import_failed"] = "Excel Import fehlerhaft";
+$lang["giftcards_generate_barcodes"] = "Generiere Barcodes";
+$lang["giftcards_giftcard"] = "Gutschein";
+$lang["giftcards_giftcard_number"] = "Gutschein-Nr.";
+$lang["giftcards_info_provided_by"] = "Info provided by";
+$lang["giftcards_inventory_comments"] = "Kommentare";
+$lang["giftcards_is_serialized"] = "Gutschein hat Seriennummer";
+$lang["giftcards_low_inventory_giftcards"] = "Gutscheine mit Minderbestand";
+$lang["giftcards_manually_editing_of_quantity"] = "Manuelle Bestandesänderung";
+$lang["giftcards_must_select_giftcard_for_barcode"] = "Sie müssen einen Gutschein wählen, um Barcodes zu generieren";
+$lang["giftcards_new"] = "Neuer Gutschein";
+$lang["giftcards_no_description_giftcards"] = "Gutscheine ohne Beschreibung";
+$lang["giftcards_no_giftcards_to_display"] = "Keine Gutscheine zum Anzeigen";
+$lang["giftcards_none"] = "Nichts";
+$lang["giftcards_none_selected"] = "Sie haben keine Gutscheine zum Ändern gewählt";
+$lang["giftcards_number"] = "Gutschein-Nr. muss eine Zahl sein";
+$lang["giftcards_number_information"] = "Gutschein Nummer";
+$lang["giftcards_number_required"] = "Gutschein Nummer muss eine Zahl sein";
+$lang["giftcards_one_or_multiple"] = "Gutschein(e)";
+$lang["giftcards_person_id"] = "Kunde";
+$lang["giftcards_quantity"] = "Menge";
+$lang["giftcards_quantity_required"] = "Menge ist erforderlich";
+$lang["giftcards_reorder_level"] = "Mindestbestand";
+$lang["giftcards_retrive_giftcard_info"] = "Gutschein Information";
+$lang["giftcards_sales_tax_1"] = "Umsatzsteuer 1";
+$lang["giftcards_sales_tax_2"] = "Umsatzsteuer 2";
+$lang["giftcards_serialized_giftcards"] = "Serialisierte Gutscheine";
+$lang["giftcards_successful_adding"] = "Hinzufügen erfolgreich";
+$lang["giftcards_successful_bulk_edit"] = "Sie haben die gewählten Gutscheine erfolgreich geändert";
+$lang["giftcards_successful_deleted"] = "Löschung erfolgreich";
+$lang["giftcards_successful_updating"] = "Änderung erfolgreich";
+$lang["giftcards_supplier"] = "Lieferant";
+$lang["giftcards_tax_1"] = "MWSt 1";
+$lang["giftcards_tax_2"] = "MWSt 2";
+$lang["giftcards_tax_percent"] = "Prozent";
+$lang["giftcards_tax_percents"] = "Prozente";
+$lang["giftcards_unit_price"] = "Preis";
+$lang["giftcards_upc_database"] = "UPC Datenbank";
+$lang["giftcards_update"] = "Gutschein ändern";
+$lang["giftcards_use_inventory_menu"] = "Verwende Lager Menu";
+$lang["giftcards_value"] = "Gutschein-Wert muss eine Zahl sein";
+$lang["giftcards_value_required"] = "Gutschein-Wert erforderlich";

application/language/de-CH/item_kits_lang.php

@@ -0,0 +1,21 @@
+<?php 
+
+$lang["item_kits_add_item"] = "Neuer Artikel";
+$lang["item_kits_cannot_be_deleted"] = "Konnte Artikel-Set(s) nicht löschen";
+$lang["item_kits_confirm_delete"] = "Wollen Sie die gewählten Artikel-Sets wirklich löschen?";
+$lang["item_kits_description"] = "Beschreibung Artikel-Set";
+$lang["item_kits_error_adding_updating"] = "Fehler beim Hinzufügen/Ändern";
+$lang["item_kits_info"] = "Artikel-Set Information";
+$lang["item_kits_item"] = "Artikel";
+$lang["item_kits_items"] = "Artikel";
+$lang["item_kits_kit"] = "Set-ID";
+$lang["item_kits_name"] = "Name";
+$lang["item_kits_new"] = "Neues Artikel-Set";
+$lang["item_kits_no_item_kits_to_display"] = "Keine Artikel-Sets zum Anzeigen";
+$lang["item_kits_none_selected"] = "Sie haben keine Artikel-Sets ausgewählt";
+$lang["item_kits_one_or_multiple"] = "Artikel-Set(s)";
+$lang["item_kits_quantity"] = "Menge";
+$lang["item_kits_successful_adding"] = "Artikel-Set erfolgreich hinzugefügt";
+$lang["item_kits_successful_deleted"] = "Löschung erfolgreich";
+$lang["item_kits_successful_updating"] = "Änderung erfolgreich";
+$lang["item_kits_update"] = "Artikel-Set ändern";

application/language/de-CH/items_lang.php

@@ -0,0 +1,87 @@
+<?php 
+
+$lang["items_add_minus"] = "Bestandsänderung";
+$lang["items_allow_alt_desciption"] = "Erlaube Alt. Bez.";
+$lang["items_allow_alt_description"] = "Erlaube Alt. Bez.";
+$lang["items_amazon"] = "Amazon";
+$lang["items_basic_information"] = "Artikelinformation";
+$lang["items_bulk_edit"] = "Sammeländerung";
+$lang["items_buy_price_required"] = "Einkaufspreis ist erforderlich";
+$lang["items_cannot_be_deleted"] = "Gewählte Artikel können nicht gelöscht werden, einer odere mehrere weisen Verkäufe auf";
+$lang["items_cannot_find_item"] = "Konnte Artikel nicht finden";
+$lang["items_category"] = "Kategorie";
+$lang["items_category_required"] = "Kategorie ist erforderlich";
+$lang["items_change_all_to_allow_alt_desc"] = "Ändere alle zu Erlaube Alt. Bez.";
+$lang["items_change_all_to_not_allow_allow_desc"] = "Ändere alle zu NICHT Erlaube Alt. Bez.";
+$lang["items_change_all_to_serialized"] = "Ändere alle zu serialisiert";
+$lang["items_change_all_to_unserialized"] = "Ändere alle zu nicht serialisiert";
+$lang["items_confirm_bulk_edit"] = "Wollen Sie alle gewählten Artikel ändern?";
+$lang["items_confirm_delete"] = "Wollen Sie alle gewählten Artikel löschen?";
+$lang["items_cost_price"] = "Einstandspreis";
+$lang["items_cost_price_number"] = "Einstandspresi muss eine Zahl sein";
+$lang["items_cost_price_required"] = "Einstandspreis ist erforderlich";
+$lang["items_count"] = "Ändere Bestand";
+$lang["items_current_quantity"] = "Aktuelle Menge";
+$lang["items_description"] = "Bezeichnung";
+$lang["items_details_count"] = "Lagerbestandsdetails";
+$lang["items_do_nothing"] = "Tue nichts";
+$lang["items_edit_fields_you_want_to_update"] = "Ändern Sie die Felder für ALLE gewählten Artikel?";
+$lang["items_edit_multiple_items"] = "Sammeländerung";
+$lang["items_error_adding_updating"] = "Fehler beim Hinzufügen/Ändern";
+$lang["items_error_updating_multiple"] = "Fehler beim Ändern";
+$lang["items_excel_import_failed"] = "Excel Import fehlerhaft";
+$lang["items_generate_barcodes"] = "Generiere Barcodes";
+$lang["items_image"] = "Bild";
+$lang["items_info_provided_by"] = "Info provided by";
+$lang["items_inventory"] = "Lagerbestand";
+$lang["items_inventory_comments"] = "Bemerkungen";
+$lang["items_is_deleted"] = "Gelöscht";
+$lang["items_is_serialized"] = "Artikel hat Serien-Nr.";
+$lang["items_item"] = "Artikel";
+$lang["items_item_number"] = "UPC/EAN/ISBN";
+$lang["items_item_number_duplicate"] = "Die Artikelnummer existiert bereits in der Datenbank";
+$lang["items_location"] = "Ort";
+$lang["items_empty_upc_items"] = "Leere UPC Artikel";
+$lang["items_low_inventory_items"] = "nicht am Lager";
+$lang["items_manually_editing_of_quantity"] = "Manuelle Bestandesänderung";
+$lang["items_must_select_item_for_barcode"] = "Sie müssen mindestens einen Artikel wählen, um Barcodes zu generieren";
+$lang["items_name"] = "Artikelname";
+$lang["items_name_required"] = "Artikelname ist erforderlich";
+$lang["items_new"] = "Neuer Artikel";
+$lang["items_no_description_items"] = "Artikel ohne Bezeichnung";
+$lang["items_no_items_to_display"] = "Keine Artikel zum Anzeigen";
+$lang["items_none"] = "Nichts";
+$lang["items_none_selected"] = "Sie haben keine Artikel zum Ändern gewählt";
+$lang["items_number_information"] = "Artikelnummer";
+$lang["items_number_required"] = "UPC/EAN/ISBN ist erforderlich";
+$lang["items_one_or_multiple"] = "Artikel";
+$lang["items_quantity"] = "Menge";
+$lang["items_quantity_number"] = "Menge muss eine Zahl sein";
+$lang["items_quantity_required"] = "Menge ist erforderlich";
+$lang["items_receiving_quantity"] = "Eingangsmenge";
+$lang["items_reorder_level"] = "Mindestbestand";
+$lang["items_reorder_level_number"] = "Mindestbestand muss eine Zahl sein";
+$lang["items_reorder_level_required"] = "Mindestbestand ist erforderlich";
+$lang["items_retrive_item_info"] = "Artikelinformation";
+$lang["items_sales_tax_1"] = "Umsatzsteuer 1";
+$lang["items_sales_tax_2"] = "Umsatzsteuer 2";
+$lang["items_search_custom_items"] = "Suche in Zusatzfeldern";
+$lang["items_serialized_items"] = "Serialisierte Artikel";
+$lang["items_stock_location"] = "Lagerort";
+$lang["items_successful_adding"] = "Artikel erfolgreich hinzugefügt";
+$lang["items_successful_bulk_edit"] = "Die gewählten Artikel wurden erforlgreich geändert";
+$lang["items_successful_deleted"] = "Löschung erfolgreich";
+$lang["items_successful_updating"] = "Änderung erfolgreich";
+$lang["items_supplier"] = "Lieferant";
+$lang["items_tax_1"] = "MWSt 1";
+$lang["items_tax_2"] = "MWSt 2";
+$lang["items_tax_percent"] = "MWSt %";
+$lang["items_tax_percent_required"] = "MWSt % ist erforderlich";
+$lang["items_tax_percents"] = "Steuerprozent(e)";
+$lang["items_unit_price"] = "Preis";
+$lang["items_unit_price_number"] = "Preis muss eine Zahl sein";
+$lang["items_unit_price_required"] = "Preis ist erforderlich";
+$lang["items_upc_database"] = "UPC Datenbank";
+$lang["items_update"] = "Ändere Artikel";
+$lang["items_use_inventory_menu"] = "Verwende Bestandesmenu";
+$lang["items_import_items_excel"] = "Importiere Artikel mit Excel Datei";

application/language/de-CH/login_lang.php

@@ -0,0 +1,8 @@
+<?php 
+
+$lang["login_go"] = "Start";
+$lang["login_invalid_username_and_password"] = "Ungültiger Benutzername/Passwort";
+$lang["login_login"] = "Login";
+$lang["login_password"] = "Passwort";
+$lang["login_username"] = "Benutzername";
+$lang["login_welcome_message"] = "Willkommen bei Open Source Point Of Sales. Zum Starten bitte auf ein Modul klicken";

application/language/de-CH/module_lang.php

@@ -0,0 +1,23 @@
+<?php 
+
+$lang["module_config"] = "Einstellungen";
+$lang["module_config_desc"] = "Einstellungen ändern";
+$lang["module_customers"] = "Kunden";
+$lang["module_customers_desc"] = "Hinzufügen, Ändern, Löschen und Suchen";
+$lang["module_employees"] = "Mitarbeiter";
+$lang["module_employees_desc"] = "Hinzufügen, Ändern, Löschen und Suchen";
+$lang["module_giftcards"] = "Gutscheine";
+$lang["module_giftcards_desc"] = "Hinzufügen, Ändern, Löschen und Suchen";
+$lang["module_home"] = "Home";
+$lang["module_item_kits"] = "Artikel-Sets";
+$lang["module_item_kits_desc"] = "Hinzufügen, Ändern, Löschen und Suchen";
+$lang["module_items"] = "Artikel";
+$lang["module_items_desc"] = "Hinzufügen, Ändern, Löschen und Suchen";
+$lang["module_receivings"] = "Eingänge";
+$lang["module_receivings_desc"] = "Hinzufügen, Ändern, Löschen und Suchen";
+$lang["module_reports"] = "Berichte";
+$lang["module_reports_desc"] = "Hinzufügen, Ändern, Löschen und Suchen";
+$lang["module_sales"] = "Verkauf";
+$lang["module_sales_desc"] = "Hinzufügen, Ändern, Löschen und Suchen";
+$lang["module_suppliers"] = "Lieferanten";
+$lang["module_suppliers_desc"] = "Hinzufügen, Ändern, Löschen und Suchen";

application/language/de-CH/receivings_lang.php

@@ -0,0 +1,51 @@
+<?php 
+
+$lang["receivings_transaction_failed"] = "Eingangstransaktion fehlerhaft";
+$lang["recvs_basic_information"] = "Eingangsbestellung";
+$lang["recvs_cancel_receiving"] = "Abbrechen";
+$lang["recvs_cannot_be_deleted"] = "Eingangsbestellung(en) konnten nicht gelöscht werden";
+$lang["recvs_comments"] = "Kommentare";
+$lang["recvs_complete_receiving"] = "Abschliessen";
+$lang["recvs_confirm_cancel_receiving"] = "Wollen Siesen Wareneingang annullieren? Alle Einträge werden gelöscht.";
+$lang["recvs_confirm_finish_receiving"] = "Wollen Sie diesen Wareneingang verabeiten? Dieser Schritt kann nicht rückgängig gemacht werden.";
+$lang["recvs_cost"] = "Kosten";
+$lang["recvs_date"] = "Eingangsdatum";
+$lang["recvs_date_required"] = "Ein korrektes Datum ist erforderlich";
+$lang["recvs_date_type"] = "Datum ist erforderlich";
+$lang["recvs_delete_confirmation"] = "Wollen Sie diesen Eingang wirklich löschen? Rückgängig nicht möglich";
+$lang["recvs_delete_entire_sale"] = "Wareneingang löschen";
+$lang["recvs_discount"] = "Rabatt %";
+$lang["recvs_edit"] = "Ändern";
+$lang["recvs_edit_sale"] = "Wareneingang ändern";
+$lang["recvs_employee"] = "Mitarbeiter";
+$lang["recvs_error_editing_item"] = "Fehler beim Ändern des Artikels";
+$lang["recvs_error_requisition"] = "Kann Bestand nicht von oder zum gleichen Lagerort ändern";
+$lang["recvs_find_or_scan_item"] = "Finde/Scanne Artikel";
+$lang["recvs_find_or_scan_item_or_receipt"] = "Finde/Scanne Artikel oder Quittung";
+$lang["recvs_id"] = "Eingangs-Nr.";
+$lang["recvs_invoice_enable"] = "Erzeuge Rechnung";
+$lang["recvs_invoice_number"] = "Rechnungs-Nr.";
+$lang["recvs_invoice_number_duplicate"] = "Bitte geben Sie eine eindeutige Rechnungs-Nr. ein";
+$lang["recvs_item_name"] = "Artikelname";
+$lang["recvs_mode"] = "Eingangsmodus";
+$lang["recvs_new_supplier"] = "Neuer Lieferant";
+$lang["recvs_one_or_multiple"] = "Wareneingäng(e)";
+$lang["recvs_print_after_sale"] = "Drucke Bon nach Verkauf";
+$lang["recvs_quantity"] = "Menge";
+$lang["recvs_receipt"] = "Eingangsquittung";
+$lang["recvs_receipt_number"] = "Eingangs-Nr.";
+$lang["recvs_receiving"] = "Eingang";
+$lang["recvs_register"] = "Wareneingang";
+$lang["recvs_requisition"] = "Bedarf";
+$lang["recvs_return"] = "Retoure";
+$lang["recvs_select_supplier"] = "Wählen Sie Lieferanten (optional)";
+$lang["recvs_start_typing_supplier_name"] = "Lieferantenname eingeben";
+$lang["recvs_stock_destination"] = "Lagerort (Ziel)";
+$lang["recvs_stock_locaiton"] = "Lagerort";
+$lang["recvs_stock_source"] = "Lagerort (Quelle)";
+$lang["recvs_successfully_deleted"] = "Löschung erfolgreich";
+$lang["recvs_successfully_updated"] = "Änderung erfolgreich";
+$lang["recvs_supplier"] = "Lieferant";
+$lang["recvs_total"] = "Total";
+$lang["recvs_unable_to_add_item"] = "Kann Artikel nicht zum Eingang hinzufügen";
+$lang["recvs_unsuccessfully_updated"] = "Eingang nicht erfolgreich geändert";

application/language/de-CH/reports_lang.php

@@ -0,0 +1,108 @@
+<?php 
+
+$lang["reports_all"] = "Alle";
+$lang["reports_all_time"] = "Von Beginn weg";
+$lang["reports_categories"] = "Kategorien";
+$lang["reports_categories_summary_report"] = "Bericht: Kategorien (summarisch)";
+$lang["reports_category"] = "Kategorie";
+$lang["reports_comments"] = "Kommentare";
+$lang["reports_count"] = "Anzahl";
+$lang["reports_customer"] = "Kunde";
+$lang["reports_customers"] = "Kunden";
+$lang["reports_customers_summary_report"] = "Bericht: Kunden (summarisch)";
+$lang["reports_date"] = "Datum";
+$lang["reports_date_range"] = "Zeitraum";
+$lang["reports_description"] = "Bezeichnung";
+$lang["reports_detailed_receivings_report"] = "Bericht: Wareneingänge (detailliert)";
+$lang["reports_detailed_reports"] = "Berichte (detailliert)";
+$lang["reports_detailed_requisition_report"] = "Bericht: Bedarf (detailliert)";
+$lang["reports_detailed_sales_report"] = "Bericht: Verkäufe (detailliert)";
+$lang["reports_discount"] = "Rabatt";
+$lang["reports_discount_percent"] = "Rabatt %";
+$lang["reports_discounts"] = "Rabatte";
+$lang["reports_discounts_summary_report"] = "Bericht: Rabatte (summarisch)";
+$lang["reports_employee"] = "Mitarbeiter";
+$lang["reports_employees"] = "Mitarbeiter";
+$lang["reports_employees_summary_report"] = "Bericht: Mitarbeiter (summarisch)";
+$lang["reports_graphical_reports"] = "Grafische Berichte";
+$lang["reports_inventory"] = "Lager";
+$lang["reports_inventory_low"] = "Lager mit Unterbestand";
+$lang["reports_inventory_low_report"] = "Bericht: Lager mit Unterbestand";
+$lang["reports_inventory_reports"] = "Berichte: Lager";
+$lang["reports_inventory_summary"] = "Lager (summarisch)";
+$lang["reports_inventory_summary_report"] = "Bericht: Lager (summarisch)";
+$lang["reports_item"] = "Artikel";
+$lang["reports_item_name"] = "Artikelname";
+$lang["reports_item_number"] = "Artikelnummer";
+$lang["reports_items"] = "Artikel";
+$lang["reports_items_purchased"] = "Gekaufte Artikel";
+$lang["reports_items_received"] = "Erhaltene Artikel";
+$lang["reports_items_summary_report"] = "Bericht: Artikel (summarisch)";
+$lang["reports_last_7"] = "Letzte 7 Tage";
+$lang["reports_last_month"] = "Letzter Monat";
+$lang["reports_last_year"] = "Letztes Jahr";
+$lang["reports_low_inventory"] = "Lager mit Unterbestand";
+$lang["reports_low_inventory_report"] = "Bericht: Inventar";
+$lang["reports_name"] = "Name";
+$lang["reports_payment_type"] = "Zahlungsart";
+$lang["reports_payments"] = "Zahlungen";
+$lang["reports_payments_summary_report"] = "Bericht: Zahlungen (summarisch)";
+$lang["reports_profit"] = "Gewinn";
+$lang["reports_cost"] = "Kosten";
+$lang["reports_quantity_purchased"] = "Menge gekauft";
+$lang["reports_received_by"] = "Erhalten von";
+$lang["reports_receiving_id"] = "Einangs-ID";
+$lang["reports_receiving_type"] = "Eingangstyp";
+$lang["reports_receivings"] = "Eingänge";
+$lang["reports_reorder_level"] = "Mindestbestand";
+$lang["reports_report"] = "Bericht";
+$lang["reports_report_input"] = "Berichtsdefinition";
+$lang["reports_reports"] = "Berichte";
+$lang["reports_requisition"] = "Bedarf";
+$lang["reports_requisition_by"] = "Bedarf durch";
+$lang["reports_requisition_id"] = "Bedarfs-ID";
+$lang["reports_requisition_item"] = "Artikel";
+$lang["reports_requisition_item_quantity"] = "Menge";
+$lang["reports_requisition_related_item"] = "Artikelverweis";
+$lang["reports_requisition_related_item_total_quantity"] = "Gesamtmenge Bedarf";
+$lang["reports_requisition_related_item_unit_quantity"] = "Bedarfsmenge";
+$lang["reports_requisitions"] = "Bedarf";
+$lang["reports_returns"] = "Retoure";
+$lang["reports_revenue"] = "Einkommen";
+$lang["reports_sale_id"] = "Verkaufs-ID";
+$lang["reports_sale_type"] = "Verkaufs-Typ";
+$lang["reports_sales"] = "Verkäufe";
+$lang["reports_sales_amount"] = "Umsatz";
+$lang["reports_sales_summary_report"] = "Bericht: Umsatz (summarisch)";
+$lang["reports_serial_number"] = "Seriennummer";
+$lang["reports_sold_by"] = "Verkauft durch";
+$lang["reports_sold_to"] = "Verkauft an";
+$lang["reports_stock_location"] = "Lagerort";
+$lang["reports_subtotal"] = "Zwischensumme";
+$lang["reports_summary_reports"] = "Berichte (summarisch)";
+$lang["reports_supplied_by"] = "Geliefert von";
+$lang["reports_supplier"] = "Lieferant";
+$lang["reports_suppliers"] = "Lieferanten";
+$lang["reports_suppliers_summary_report"] = "Bericht: Lieferanten (summarisch)";
+$lang["reports_tax"] = "MWSt";
+$lang["reports_tax_percent"] = "MWSt %";
+$lang["reports_taxes"] = "Steuern";
+$lang["reports_taxes_summary_report"] = "Bericht: Steuern (summarisch)";
+$lang["reports_this_month"] = "Dieser Monat";
+$lang["reports_this_month_last_year"] = "Dieser Monat letzten Jahres";
+$lang["reports_this_month_to_today"] = "Dieser Monat bis heute";
+$lang["reports_this_month_to_today_last_year"] = "Dieser Monat bis Heute letzten Jahres";
+$lang["reports_this_year"] = "Dieses Jahr";
+$lang["reports_today"] = "Heute";
+$lang["reports_today_last_year"] = "Heute letzten Jahres";
+$lang["reports_total"] = "Total";
+$lang["reports_type"] = "Typ";
+$lang["reports_welcome_message"] = "Willkommen bei Berichtsmodul";
+$lang["reports_yesterday"] = "Gestern";
+$lang["reports_item_count"] = "Filter nach Artikelzahl";
+$lang["reports_cost_price"] = "Einstandspreis";
+$lang["reports_unit_price"] = "Verkaufspreis";
+$lang["reports_sub_total_value"] = "Zwischentotal";
+$lang["reports_total_inventory_value"] = "Total Inventarwert";
+$lang["reports_zero_and_less"] = "Null und weniger";
+$lang["reports_more_than_zero"] = "Mehr als Null";

application/language/de-CH/sales_lang.php

@@ -0,0 +1,116 @@
+<?php 
+
+$lang["sales_add_payment"] = "Zahlung";
+$lang["sales_amount_due"] = "fälliger Betrag";
+$lang["sales_amount_tendered"] = "Erhalten";
+$lang["sales_basic_information"] = "Quittung";
+$lang["sales_cancel_sale"] = "Annullieren";
+$lang["sales_cash"] = "Bar";
+$lang["sales_change_due"] = "Wechselgeld";
+$lang["sales_check"] = "Scheck";
+$lang["sales_check_balance"] = "Scheck-Differenz";
+$lang["sales_comment"] = "Bemerkung";
+$lang["sales_comments"] = "Bemerkungen";
+$lang["sales_complete_sale"] = "Abschliessen";
+$lang["sales_confirm_cancel_sale"] = "Wollen Sie diesen Verkauf abschliessen? Alle Artikeleinträge werden entfernt";
+$lang["sales_confirm_delete"] = "Wollen Sie die gewählten Aufträge löschen?";
+$lang["sales_confirm_finish_sale"] = "Wollen Sie diesen Auftrag verarbeiten? Rückgängig unmöglich";
+$lang["sales_confirm_suspend_sale"] = "Wollen Sie diesen Auftrag pendent halten?";
+$lang["sales_credit"] = "Kreditkarte";
+$lang["sales_customer"] = "Kunde";
+$lang["sales_date"] = "Datum";
+$lang["sales_date_required"] = "Ein korrektas Datum ist erforderlich";
+$lang["sales_date_type"] = "Datum ist erforderlich";
+$lang["sales_debit"] = "Debitkarte";
+$lang["sales_delete_confirmation"] = "Wollen Sie diesen Auftrag löschen? Rückgängig unmöglich";
+$lang["sales_delete_entire_sale"] = "Auftrag löschen";
+$lang["sales_delete_successful"] = "Löschung erfolgreich";
+$lang["sales_delete_unsuccessful"] = "Löschung nicht erfolgreich";
+$lang["sales_description_abbrv"] = "Bez.";
+$lang["sales_discount"] = "%";
+$lang["sales_discount_included"] = "Rabatt %";
+$lang["sales_discount"] = "Rabatt";
+$lang["sales_discount_short"] = "%";
+$lang["sales_edit"] = "Ändern";
+$lang["sales_edit_item"] = "Ändere Art.";
+$lang["sales_edit_sale"] = "Auftrag ändern";
+$lang["sales_email_receipt"] = "Quittung per E-Mail";
+$lang["sales_employee"] = "Mitarbeiter";
+$lang["sales_error_editing_item"] = "Fehler beim Ändern des Artikels";
+$lang["sales_find_or_scan_item"] = "Finde/Scanne Artikel";
+$lang["sales_find_or_scan_item_or_receipt"] = "Finde/Scanne Artikel oder Quittung";
+$lang["sales_giftcard"] = "Gutschein";
+$lang["sales_giftcard_balance"] = "Gutschein Restwert";
+$lang["sales_giftcard_number"] = "Gutschein Nr.";
+$lang["sales_id"] = "ID";
+$lang["sales_invoice"] = "Rechnung";
+$lang["sales_invoice_confirm"] = "Diese rechnung wird gesendet an";
+$lang["sales_invoice_enable"] = "Erzeuge Rechnung";
+$lang["sales_invoice_filter"] = "Rechnungen";
+$lang["sales_cash_filter"] = "Bar";
+$lang["sales_invoice_no_email"] = "Dieser Kunde hat keine gültige Email Adresse";
+$lang["sales_invoice_number"] = "Rechnungs-Nr.";
+$lang["sales_invoice_number_duplicate"] = "Bitte geben Sie eine eindeutige Rechnungsnummer ein";
+$lang["sales_invoice_sent"] = "Rechnung gesendet an";
+$lang["sales_invoice_unsent"] = "Rechnung nicht gesendet";
+$lang["sales_invoice_update"] = "Aktualisieren";
+$lang["sales_item_insufficient_of_stock"] = "Artikel hat Unterbestand";
+$lang["sales_item_name"] = "Artikelname";
+$lang["sales_item_number"] = "Artikel-Nr.";
+$lang["sales_item_out_of_stock"] = "Artikel ist nicht am Lager";
+$lang["sales_mode"] = "Verkaufstyp";
+$lang["sales_must_enter_numeric"] = "Eingabe muss eine Zahl sein";
+$lang["sales_must_enter_numeric_giftcard"] = "Gutschein-Nr. muss eine Zahl sein";
+$lang["sales_new_customer"] = "Neuer Kunde";
+$lang["sales_new_item"] = "Neuer Artikel";
+$lang["sales_no_description"] = "nichts";
+$lang["sales_no_filter"] = "Alle";
+$lang["sales_no_items_in_cart"] = "Warenkorb ist leer";
+$lang["sales_no_sales_to_display"] = "Keine Artikel zum Anzeigen";
+$lang["sales_one_or_multiple"] = "Verkäufe";
+$lang["sales_takings"] = "Einnahmen";
+$lang["sales_payment"] = "Zahlungsart";
+$lang["sales_payment_amount"] = "Betrag";
+$lang["sales_payment_not_cover_total"] = "Betrag deckt Rechnungsbetrag nicht";
+$lang["sales_payment_type"] = "Typ";
+$lang["sales_payments_total"] = "Zahlung Total";
+$lang["sales_price"] = "Preis";
+$lang["sales_print_after_sale"] = "Drucke Bon nach Verkauf";
+$lang["sales_quantity"] = "Menge";
+$lang["sales_quantity_less_than_zero"] = "Warnung: Gewünschte Menge ist nicht verfügbar. Sie können den Verkauf fortsetzen, dennoch prüfen Sie bitte den Lagerbestand.";
+$lang["sales_receipt"] = "Quittung";
+$lang["sales_receipt_number"] = "Quittung Nr.";
+$lang["sales_register"] = "Kasse";
+$lang["sales_remove_customer"] = "Entferne Kunde";
+$lang["sales_return"] = "Retoure";
+$lang["sales_sale"] = "Verkauf";
+$lang["sales_sale_for_customer"] = "Kunde:";
+$lang["sales_sale_time"] = "Zeit";
+$lang["sales_select_customer"] = "Wähle Kunde (optional)";
+$lang["sales_send_invoice"] = "Sende Rechnung";
+$lang["sales_serial"] = "Seriennummer";
+$lang["sales_show_invoice"] = "Rechnung";
+$lang["sales_show_receipt"] = "Quittung";
+$lang["sales_start_typing_customer_name"] = "Geben Sie den Kundennamen ein...";
+$lang["sales_start_typing_item_name"] = "Geben Sie den Artikel ein oder scannen Sie ihn...";
+$lang["sales_stock_location"] = "Lagerort";
+$lang["sales_sub_total"] = "Zwischentotal";
+$lang["sales_successfully_deleted"] = "Löschung erfolgreich";
+$lang["sales_successfully_suspended_sale"] = "Auftrag wurde erfolgreich pendent gehalten";
+$lang["sales_successfully_updated"] = "Änderung erfolgreich";
+$lang["sales_suspend_sale"] = "->Pendent";
+$lang["sales_suspended_sale_id"] = "ID";
+$lang["sales_suspended_sales"] = "Pendente Aufträge";
+$lang["sales_tax"] = "MWSt";
+$lang["sales_tax_percent"] = "MWSt %";
+$lang["sales_total"] = "Total";
+$lang["sales_total_tax_exclusive"] = "Total exkl. MWSt.";
+$lang["sales_transaction_failed"] = "Verarbeitung fehlerhaft";
+$lang["sales_unable_to_add_item"] = "Kann Artikel nicht zum Auftrag hinzufügen";
+$lang["sales_unsuccessfully_deleted"] = "Löschung nicht erfolgreich";
+$lang["sales_unsuccessfully_updated"] = "Änderung nicht erfolgreich";
+$lang["sales_unsuspend"] = "Aktivieren";
+$lang["sales_unsuspend_and_delete"] = "Aktivieren und löschen";
+$lang["sales_update"] = "Ändere Auftrag";
+$lang["sales_date_range"] = "Zeitrahmen";
+$lang["sales_none_selected"] = "Sie haben keinen Auftrag zum Löschen ausgewählt";

application/language/de-CH/suppliers_lang.php

@@ -0,0 +1,19 @@
+<?php 
+
+$lang["suppliers_account_number"] = "Konto-Nr.";
+$lang["suppliers_basic_information"] = "Lieferanten-Information";
+$lang["suppliers_cannot_be_deleted"] = "Kann gewählte Lieferanten nicht löschen, einer oder mehrere weisen Verkäufe aus.";
+$lang["suppliers_company_name"] = "Firmenname";
+$lang["suppliers_company_name_required"] = "Firmenname ist erforderlich";
+$lang["suppliers_agency_name"] = "Name der Agentur";
+$lang["suppliers_confirm_delete"] = "Wollen Sie die gewählten Lieferanten löschen?";
+$lang["suppliers_error_adding_updating"] = "Fehler beim Hinzufügen/Ändern";
+$lang["suppliers_new"] = "Neuer Lieferant";
+$lang["suppliers_none_selected"] = "Sie haben keinen Lieferanten zum Löschen ausgewählt";
+$lang["suppliers_one_or_multiple"] = "Lieferanten";
+$lang["suppliers_successful_adding"] = "Erfolgreich hinzugefügt";
+$lang["suppliers_successful_deleted"] = "Löschung erfolgreich";
+$lang["suppliers_successful_updating"] = "Änderung erfolgreich";
+$lang["suppliers_supplier"] = "Lieferant";
+$lang["suppliers_supplier_id"] = "ID";
+$lang["suppliers_update"] = "Ändere Lieferant";

application/language/en/common_lang.php

@@ -9,6 +9,7 @@ $lang["common_confirm_search"] = "You have selected one or more rows, these will
 $lang["common_country"] = "Country";
 $lang["common_date"] = "Date";
 $lang["common_delete"] = "Delete";
+$lang["common_print"] = "Print";
 $lang["common_det"] = "details";
 $lang["common_edit"] = "edit";
 $lang["common_email"] = "E-Mail";
@@ -24,7 +25,7 @@ $lang["common_inv"] = "inv";
 $lang["common_last_name"] = "Last Name";
 $lang["common_last_name_required"] = "The last name is a required field";
 $lang["common_last_page"] = "Last";
-$lang["common_learn_about_project"] = "to learn the lastest information about the project";
+$lang["common_learn_about_project"] = "to learn the latest information about the project";
 $lang["common_list_of"] = "List of";
 $lang["common_logout"] = "Logout";
 $lang["common_new"] = "New";

application/language/en/config_lang.php

@@ -24,6 +24,7 @@ $lang["config_barcode_second_row"] = "Row 2";
 $lang["config_barcode_third_row"] = "Row 3";
 $lang["config_barcode_type"] = "Barcode Type";
 $lang["config_barcode_width"] = "Width (px)";
+$lang["config_barcode_generate_if_empty"] = "Generate if empty";
 $lang["config_company"] = "Company Name";
 $lang["config_company_logo"] = "Company Logo";
 $lang["config_company_required"] = "Company name is a required field";
@@ -115,3 +116,6 @@ $lang["config_thousands_separator"] = "Thousands Separator";
 $lang["config_timezone"] = "Timezone";
 $lang["config_use_invoice_template"] = "Use invoice template";
 $lang["config_website"] = "Website";
+$lang["config_locale_configuration"] = "Localisation Configuration";
+$lang["config_locale_info"] = "Localisation Configuration Information";
+$lang["config_datetimeformat"] = "Date and Time format";

application/language/en/item_kits_lang.php

@@ -8,6 +8,7 @@ $lang["item_kits_error_adding_updating"] = "Error adding/updating Item Kit";
 $lang["item_kits_info"] = "Item Kit Info";
 $lang["item_kits_item"] = "Item";
 $lang["item_kits_items"] = "Items";
+$lang["item_kits_kit"] = "Kit Id";
 $lang["item_kits_name"] = "Item Kit Name";
 $lang["item_kits_new"] = "New Item Kit";
 $lang["item_kits_no_item_kits_to_display"] = "No item kits to display";

application/language/en/items_lang.php

@@ -41,6 +41,7 @@ $lang["items_item"] = "Item";
 $lang["items_item_number"] = "UPC/EAN/ISBN";
 $lang["items_item_number_duplicate"] = "The item number is already present in the database";
 $lang["items_location"] = "Location";
+$lang["items_empty_upc_items"] = "Empty UPC Items";
 $lang["items_low_inventory_items"] = "Out Of Stock Items";
 $lang["items_manually_editing_of_quantity"] = "Manual Edit of Quantity";
 $lang["items_must_select_item_for_barcode"] = "You must select at least 1 item to generate barcodes";

application/language/en/module_lang.php

@@ -1,7 +1,7 @@
 <?php 
 
 $lang["module_config"] = "Store Config";
-$lang["module_config_desc"] = "Change the store\'s configuration";
+$lang["module_config_desc"] = "Change the store's configuration";
 $lang["module_customers"] = "Customers";
 $lang["module_customers_desc"] = "Add, Update, Delete, and Search customers";
 $lang["module_employees"] = "Employees";

application/language/en/reports_lang.php

@@ -48,6 +48,7 @@ $lang["reports_payment_type"] = "Payment Type";
 $lang["reports_payments"] = "Payments";
 $lang["reports_payments_summary_report"] = "Payments Summary Report";
 $lang["reports_profit"] = "Profit";
+$lang["reports_cost"] = "Cost";
 $lang["reports_quantity_purchased"] = "Quantity Purchased";
 $lang["reports_received_by"] = "Received By";
 $lang["reports_receiving_id"] = "Receiving ID";
@@ -76,7 +77,7 @@ $lang["reports_sales_summary_report"] = "Sales Summary Report";
 $lang["reports_serial_number"] = "Serial #";
 $lang["reports_sold_by"] = "Sold By";
 $lang["reports_sold_to"] = "Sold To";
-$lang["reports_stock_location"] = "Stock location";
+$lang["reports_stock_location"] = "Stock Location";
 $lang["reports_subtotal"] = "Subtotal";
 $lang["reports_summary_reports"] = "Summary Reports";
 $lang["reports_supplied_by"] = "Supplied by";
@@ -88,9 +89,20 @@ $lang["reports_tax_percent"] = "Tax Percent";
 $lang["reports_taxes"] = "Taxes";
 $lang["reports_taxes_summary_report"] = "Taxes Summary Report";
 $lang["reports_this_month"] = "This Month";
+$lang["reports_this_month_last_year"] = "This Month Last Year";
+$lang["reports_this_month_to_today"] = "This Month To Today";
+$lang["reports_this_month_to_today_last_year"] = "This Month To Today Last Year";
 $lang["reports_this_year"] = "This Year";
 $lang["reports_today"] = "Today";
+$lang["reports_today_last_year"] = "Today Last Year";
 $lang["reports_total"] = "Total";
 $lang["reports_type"] = "Type";
 $lang["reports_welcome_message"] = "Welcome to the reports panel. Please select a report to view.";
 $lang["reports_yesterday"] = "Yesterday";
+$lang["reports_item_count"] = "Filter Item Count";
+$lang["reports_cost_price"] = "Cost Price";
+$lang["reports_unit_price"] = "Retail Price";
+$lang["reports_sub_total_value"] = "Sub Total";
+$lang["reports_total_inventory_value"] = "Total Inventory Value";
+$lang["reports_zero_and_less"] = "Zero and less";
+$lang["reports_more_than_zero"] = "More than zero";

application/language/en/sales_lang.php

@@ -47,6 +47,7 @@ $lang["sales_invoice"] = "Invoice";
 $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";
@@ -67,7 +68,7 @@ $lang["sales_no_filter"] = "All";
 $lang["sales_no_items_in_cart"] = "There are no items in the cart";
 $lang["sales_no_sales_to_display"] = "No sales to display";
 $lang["sales_one_or_multiple"] = "sale(s)";
-$lang["sales_overview"] = "Overview";
+$lang["sales_takings"] = "Takings";
 $lang["sales_payment"] = "Payment Type";
 $lang["sales_payment_amount"] = "Amount";
 $lang["sales_payment_not_cover_total"] = "Payment Amount does not cover Total";
@@ -111,3 +112,5 @@ $lang["sales_unsuccessfully_updated"] = "Sale unsuccessfully updated";
 $lang["sales_unsuspend"] = "Unsuspend";
 $lang["sales_unsuspend_and_delete"] = "";
 $lang["sales_update"] = "Edit Sale";
+$lang["sales_date_range"] = "Date Range";
+$lang["sales_none_selected"] = "You have not selected any sales to delete";

application/language/en/suppliers_lang.php

@@ -5,6 +5,7 @@ $lang["suppliers_basic_information"] = "Supplier Information";
 $lang["suppliers_cannot_be_deleted"] = "Could not deleted selected suppliers, one or more of the selected suppliers has sales.";
 $lang["suppliers_company_name"] = "Company Name";
 $lang["suppliers_company_name_required"] = "Company Name is a required field";
+$lang["suppliers_agency_name"] = "Agency Name";
 $lang["suppliers_confirm_delete"] = "Are you sure you want to delete the selected suppliers?";
 $lang["suppliers_error_adding_updating"] = "Error adding/updating supplier";
 $lang["suppliers_new"] = "New Supplier";
@@ -14,4 +15,5 @@ $lang["suppliers_successful_adding"] = "You have successfully added supplier";
 $lang["suppliers_successful_deleted"] = "You have successfully deleted";
 $lang["suppliers_successful_updating"] = "You have successfully updated supplier";
 $lang["suppliers_supplier"] = "Supplier";
+$lang["suppliers_supplier_id"] = "Id";
 $lang["suppliers_update"] = "Update Supplier";

application/language/es/common_lang.php

@@ -9,6 +9,7 @@ $lang["common_confirm_search"] = "Has seleccionado una o más filas. Éstas no e
 $lang["common_country"] = "País";
 $lang["common_date"] = "Date";
 $lang["common_delete"] = "Borrar";
+$lang["common_print"] = "Print";
 $lang["common_det"] = "detalles";
 $lang["common_edit"] = "editar";
 $lang["common_email"] = "E-Mail";
@@ -23,7 +24,7 @@ $lang["common_gender_male"] = "M";
 $lang["common_inv"] = "inv";
 $lang["common_last_name"] = "Apellidos";
 $lang["common_last_name_required"] = "Apellidos es un campo requerido";
-$lang["common_last_page"] = "Última";
+$lang["common_last_page"] = "<EFBFBD>ltima";
 $lang["common_learn_about_project"] = "para leer la información más reciente acerca del proyecto";
 $lang["common_list_of"] = "Lista de";
 $lang["common_logout"] = "Salir";

application/language/es/config_lang.php

@@ -24,6 +24,7 @@ $lang["config_barcode_second_row"] = "Fila 1";
 $lang["config_barcode_third_row"] = "Fila 2";
 $lang["config_barcode_type"] = "Tipo de Código de Barra";
 $lang["config_barcode_width"] = "Ancho (px)";
+$lang["config_barcode_generate_if_empty"] = "Generate if empty";
 $lang["config_company"] = "Nombre del Comercio";
 $lang["config_company_logo"] = "Logotipo del Comercio";
 $lang["config_company_required"] = "Nombre del Comercio es requerido";
@@ -115,3 +116,6 @@ $lang["config_thousands_separator"] = "Separador de miles";
 $lang["config_timezone"] = "Zona Horaria";
 $lang["config_use_invoice_template"] = "Use plantilla de factura";
 $lang["config_website"] = "Sitio Web";
+$lang["config_locale_configuration"] = "Localisation Configuration";
+$lang["config_locale_info"] = "Localisation Configuration Information";
+$lang["config_datetimeformat"] = "Date and Time format";

application/language/es/item_kits_lang.php

@@ -8,6 +8,7 @@ $lang["item_kits_error_adding_updating"] = "Error agregando/actualizando el Kit
 $lang["item_kits_info"] = "Info de Kit de Artículos";
 $lang["item_kits_item"] = "Artículo";
 $lang["item_kits_items"] = "Artículos";
+$lang["item_kits_kit"] = "Kit Id";
 $lang["item_kits_name"] = "Nombre del Kit de Artículos";
 $lang["item_kits_new"] = "Nuevo Kit de Artículos";
 $lang["item_kits_no_item_kits_to_display"] = "No hay kits de artículos para mostrar";

application/language/es/items_lang.php

@@ -41,6 +41,7 @@ $lang["items_item"] = "Artículo";
 $lang["items_item_number"] = "UPC/EAN/ISBN";
 $lang["items_item_number_duplicate"] = "El número de artículo ya esta presente en la base de datos";
 $lang["items_location"] = "Ubicación";
+$lang["items_empty_upc_items"] = "Empty UPC Items";
 $lang["items_low_inventory_items"] = "Artículos de Inventario Escaso";
 $lang["items_manually_editing_of_quantity"] = "Edición Manual de Cantidad";
 $lang["items_must_select_item_for_barcode"] = "Debes seleccionar al menos 1 artículo para generar códigos de barras";

application/language/es/reports_lang.php

@@ -48,6 +48,7 @@ $lang["reports_payment_type"] = "Tipo de Pago";
 $lang["reports_payments"] = "Pagos";
 $lang["reports_payments_summary_report"] = "Reporte de Resumen de Pagos";
 $lang["reports_profit"] = "Ganancia";
+$lang["reports_cost"] = "Cost";
 $lang["reports_quantity_purchased"] = "Cantidad Comprada";
 $lang["reports_received_by"] = "Recibido por";
 $lang["reports_receiving_id"] = "ID de Recepción";
@@ -88,9 +89,20 @@ $lang["reports_tax_percent"] = "Porcentaje de Impuestos";
 $lang["reports_taxes"] = "Impuestos";
 $lang["reports_taxes_summary_report"] = "Reporte de Resumen de Impuestos";
 $lang["reports_this_month"] = "Este Mes";
+$lang["reports_this_month_last_year"] = "This Month Last Year";
+$lang["reports_this_month_to_today"] = "This Month To Today";
+$lang["reports_this_month_to_today_last_year"] = "This Month To Today Last Year";
 $lang["reports_this_year"] = "Este Año";
 $lang["reports_today"] = "Hoy";
+$lang["reports_today_last_year"] = "Today Last Year";
 $lang["reports_total"] = "Total";
 $lang["reports_type"] = "Tipo";
 $lang["reports_welcome_message"] = "Bienvenido(a) al panel de reportes. Selecciona un reporte para verlo.";
 $lang["reports_yesterday"] = "Ayer";
+$lang["reports_item_count"] = "Filter Item Count";
+$lang["reports_cost_price"] = "Precio de Compra";
+$lang["reports_unit_price"] = "Precio de Venta";
+$lang["reports_sub_total_value"] = "Subtotal";
+$lang["reports_total_inventory_value"] = "Total Inventory Value";
+$lang["reports_zero_and_less"] = "Zero and less";
+$lang["reports_more_than_zero"] = "More than zero";

application/language/es/sales_lang.php

@@ -47,6 +47,7 @@ $lang["sales_invoice"] = "tarjeta de Crédito";
 $lang["sales_invoice_confirm"] = "Esta factura sera enviada a";
 $lang["sales_invoice_enable"] = "Crear factura";
 $lang["sales_invoice_filter"] = "Facturas";
+$lang["sales_cash_filter"] = "Efectivo";
 $lang["sales_invoice_no_email"] = "Este cliente no tiene un email válido";
 $lang["sales_invoice_number"] = "Factura #";
 $lang["sales_invoice_number_duplicate"] = "Por favor ingrese un número de factura único";
@@ -67,7 +68,7 @@ $lang["sales_no_filter"] = "Todos";
 $lang["sales_no_items_in_cart"] = "No hay artículos en el carrito";
 $lang["sales_no_sales_to_display"] = "No hay ventas que mostrar";
 $lang["sales_one_or_multiple"] = "venta(s)";
-$lang["sales_overview"] = "Resumen";
+$lang["sales_takings"] = "Resumen";
 $lang["sales_payment"] = "Tipo de Pago";
 $lang["sales_payment_amount"] = "Cantidad";
 $lang["sales_payment_not_cover_total"] = "La Cantidad Recibida no cubre el pago total";
@@ -111,3 +112,5 @@ $lang["sales_unsuccessfully_updated"] = "Ha fallado la actualización de la vent
 $lang["sales_unsuspend"] = "Retomar";
 $lang["sales_unsuspend_and_delete"] = "Retomar y Borrar";
 $lang["sales_update"] = "Editar Venta";
+$lang["sales_date_range"] = "Rango de Fecha";
+$lang["sales_none_selected"] = "No has seleccionado venta para editar";

application/language/es/suppliers_lang.php

@@ -5,6 +5,7 @@ $lang["suppliers_basic_information"] = "Información de Proveedores";
 $lang["suppliers_cannot_be_deleted"] = "No se pudo borrar los proveedores seleccionados. Uno o más de los seleccionados tiene ventas.";
 $lang["suppliers_company_name"] = "Nombre de la Compañía";
 $lang["suppliers_company_name_required"] = "Nombre de la Compañía es requerido";
+$lang["suppliers_agency_name"] = "Nombre de la Agency";
 $lang["suppliers_confirm_delete"] = "¿Seguro(a) de querer borrar los proveedores seleccionados?";
 $lang["suppliers_error_adding_updating"] = "Error agregando/actualizando proveedor";
 $lang["suppliers_new"] = "Nuevo Proveedor";
@@ -14,4 +15,5 @@ $lang["suppliers_successful_adding"] = "Has agregado el proveedor satisfactoriam
 $lang["suppliers_successful_deleted"] = "Has borrado satisfactoriamente a";
 $lang["suppliers_successful_updating"] = "Has actualizado el proveedor satisfactoriamente";
 $lang["suppliers_supplier"] = "Proveedor";
+$lang["suppliers_supplier_id"] = "Id";
 $lang["suppliers_update"] = "Actualizar Proveedor";

application/language/fr/common_lang.php

@@ -9,6 +9,7 @@ $lang["common_confirm_search"] = "Vous avez sélectionné une ou plusieurs ligne
 $lang["common_country"] = "Pays";
 $lang["common_date"] = "Date";
 $lang["common_delete"] = "Effacer";
+$lang["common_print"] = "Imprimer";
 $lang["common_det"] = "détails";
 $lang["common_edit"] = "éditer";
 $lang["common_email"] = "E-Mail";

application/language/fr/config_lang.php

@@ -24,6 +24,7 @@ $lang["config_barcode_second_row"] = "Row 3";
 $lang["config_barcode_third_row"] = "Row 4";
 $lang["config_barcode_type"] = "Barcode Type";
 $lang["config_barcode_width"] = "Width (px)";
+$lang["config_barcode_generate_if_empty"] = "Generate if empty";
 $lang["config_company"] = "Nome de l\'Entreprise";
 $lang["config_company_logo"] = "Company Logo";
 $lang["config_company_required"] = "Le nom d\'entreprise est requis";
@@ -115,3 +116,6 @@ $lang["config_thousands_separator"] = "Thousands Separator";
 $lang["config_timezone"] = "Fuseau Horaire";
 $lang["config_use_invoice_template"] = "Use invoice template";
 $lang["config_website"] = "Site-web";
+$lang["config_locale_configuration"] = "Localisation Configuration";
+$lang["config_locale_info"] = "Localisation Configuration Information";
+$lang["config_datetimeformat"] = "Date and Time format";

application/language/fr/item_kits_lang.php

@@ -8,6 +8,7 @@ $lang["item_kits_error_adding_updating"] = "Érreur d\'ajout/édition de Kit";
 $lang["item_kits_info"] = "Détails du Kit";
 $lang["item_kits_item"] = "Item";
 $lang["item_kits_items"] = "Items";
+$lang["item_kits_kit"] = "Kit Id";
 $lang["item_kits_name"] = "Nom du Kit";
 $lang["item_kits_new"] = "Nouveau Kit";
 $lang["item_kits_no_item_kits_to_display"] = "Aucun kit à afficher";

application/language/fr/items_lang.php

@@ -41,6 +41,7 @@ $lang["items_item"] = "Item";
 $lang["items_item_number"] = "UPC/EAN/ISBN";
 $lang["items_item_number_duplicate"] = "The item number is already present in the database";
 $lang["items_location"] = "Location";
+$lang["items_empty_upc_items"] = "Empty UPC Items";
 $lang["items_low_inventory_items"] = "Items à Stock Faible";
 $lang["items_manually_editing_of_quantity"] = "Édition Manuelle de Quantité";
 $lang["items_must_select_item_for_barcode"] = "Vous devez sélectionner au moins un item";

application/language/fr/reports_lang.php

@@ -48,6 +48,7 @@ $lang["reports_payment_type"] = "Type Paiement";
 $lang["reports_payments"] = "Paiements";
 $lang["reports_payments_summary_report"] = "Rapport: Résumé des Paiements";
 $lang["reports_profit"] = "Bénéfice";
+$lang["reports_cost"] = "Cost";
 $lang["reports_quantity_purchased"] = "Quantité Achetée";
 $lang["reports_received_by"] = "Recu par";
 $lang["reports_receiving_id"] = "";
@@ -88,9 +89,20 @@ $lang["reports_tax_percent"] = "Pourcentage d\'imposition";
 $lang["reports_taxes"] = "Taxes";
 $lang["reports_taxes_summary_report"] = "Rapport: Résumé Taxes";
 $lang["reports_this_month"] = "Ce mois";
+$lang["reports_this_month_last_year"] = "This Month Last Year";
+$lang["reports_this_month_to_today"] = "This Month To Today";
+$lang["reports_this_month_to_today_last_year"] = "This Month To Today Last Year";
 $lang["reports_this_year"] = "Cette Année";
 $lang["reports_today"] = "Aujourd\'hui";
+$lang["reports_today_last_year"] = "Today Last Year";
 $lang["reports_total"] = "Total";
 $lang["reports_type"] = "Type";
 $lang["reports_welcome_message"] = "Bienvenue à la page des rapports. Veuillez sélectionner un rapport à visualiser.";
 $lang["reports_yesterday"] = "Hier";
+$lang["reports_item_count"] = "Filter Item Count";
+$lang["reports_cost_price"] = "Prix de Gros";
+$lang["reports_unit_price"] = "Prix au Détail";
+$lang["reports_sub_total_value"] = "Sous-Total";
+$lang["reports_total_inventory_value"] = "Total Inventory Value";
+$lang["reports_zero_and_less"] = "Zero and less";
+$lang["reports_more_than_zero"] = "More than zero";

application/language/fr/sales_lang.php

@@ -47,6 +47,7 @@ $lang["sales_invoice"] = "Invoice";
 $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";
@@ -67,7 +68,7 @@ $lang["sales_no_filter"] = "All";
 $lang["sales_no_items_in_cart"] = "Il n\'y a rien dans votre panier";
 $lang["sales_no_sales_to_display"] = "No sales to display";
 $lang["sales_one_or_multiple"] = "";
-$lang["sales_overview"] = "Overview";
+$lang["sales_takings"] = "Takings";
 $lang["sales_payment"] = "Type Paiement";
 $lang["sales_payment_amount"] = "Somme";
 $lang["sales_payment_not_cover_total"] = "Le Paiement ne couvre pas le Total";
@@ -111,3 +112,5 @@ $lang["sales_unsuccessfully_updated"] = "Échec d\'édition";
 $lang["sales_unsuspend"] = "Débloquer";
 $lang["sales_unsuspend_and_delete"] = "";
 $lang["sales_update"] = "Edit Sale";
+$lang["sales_date_range"] = "Plage de dates";
+$lang["sales_none_selected"] = "Vous n\\\'avez sélectionné aucun élément";

application/language/fr/suppliers_lang.php

@@ -5,6 +5,7 @@ $lang["suppliers_basic_information"] = "Informations fournisseur";
 $lang["suppliers_cannot_be_deleted"] = "Impossible de supprimer le(s) fournisseur(s) sélectionné(s). Un ou plusieurs ont des ventes.";
 $lang["suppliers_company_name"] = "Nom d\'Entreprise";
 $lang["suppliers_company_name_required"] = "Le Nom d\'Entreprise est un champ requis";
+$lang["suppliers_agency_name"] = "Nom d\'Agence";
 $lang["suppliers_confirm_delete"] = "Etes vous sûr(e) de vouloir supprimer ce(s) fournisseur(s)?";
 $lang["suppliers_error_adding_updating"] = "Error lors de l\'ajout/suppression de fournisseur";
 $lang["suppliers_new"] = "Nouveau Fournisseur";
@@ -14,4 +15,5 @@ $lang["suppliers_successful_adding"] = "Fournisseur ajouté avec succès";
 $lang["suppliers_successful_deleted"] = "Suppression réussie";
 $lang["suppliers_successful_updating"] = "Fournisseur édité avec succès";
 $lang["suppliers_supplier"] = "Fournisseur";
+$lang["suppliers_supplier_id"] = "Id";
 $lang["suppliers_update"] = "Éditer Fournisseur";

application/language/id/common_lang.php

@@ -9,6 +9,7 @@ $lang["common_confirm_search"] = "Anda telah memilih satu atau lebih baris, ini
 $lang["common_country"] = "Negara";
 $lang["common_date"] = "Date";
 $lang["common_delete"] = "Hapus";
+$lang["common_print"] = "Print";
 $lang["common_det"] = "Detail";
 $lang["common_edit"] = "Ubah";
 $lang["common_email"] = "E-Mail";

application/language/id/config_lang.php

@@ -24,6 +24,7 @@ $lang["config_barcode_second_row"] = "Row 8";
 $lang["config_barcode_third_row"] = "Row 9";
 $lang["config_barcode_type"] = "Barcode Type";
 $lang["config_barcode_width"] = "Width (px)";
+$lang["config_barcode_generate_if_empty"] = "Generate if empty";
 $lang["config_company"] = "Nama Perusahaan";
 $lang["config_company_logo"] = "Company Logo";
 $lang["config_company_required"] = "Nama Perusahaan wajib diisi";
@@ -115,3 +116,6 @@ $lang["config_thousands_separator"] = "Pemisah Ribuan";
 $lang["config_timezone"] = "Zona Waktu";
 $lang["config_use_invoice_template"] = "Use invoice template";
 $lang["config_website"] = "Situs Perusahaan";
+$lang["config_locale_configuration"] = "Localisation Configuration";
+$lang["config_locale_info"] = "Localisation Configuration Information";
+$lang["config_datetimeformat"] = "Date and Time format";

application/language/id/item_kits_lang.php

@@ -8,6 +8,7 @@ $lang["item_kits_error_adding_updating"] = "Tambah/Ubah Item Paket tidak berhasi
 $lang["item_kits_info"] = "Item Paket Info";
 $lang["item_kits_item"] = "Item Barang";
 $lang["item_kits_items"] = "Item Barang";
+$lang["item_kits_kit"] = "Kit Id";
 $lang["item_kits_name"] = "Nama Item Paket";
 $lang["item_kits_new"] = "Item Paket Baru";
 $lang["item_kits_no_item_kits_to_display"] = "Tidak ada Item Paket yang ditampilkan";

application/language/id/items_lang.php

@@ -41,6 +41,7 @@ $lang["items_item"] = "Item";
 $lang["items_item_number"] = "Kode Barang";
 $lang["items_item_number_duplicate"] = "The item number is already present in the database";
 $lang["items_location"] = "Lokasi Barang";
+$lang["items_empty_upc_items"] = "Empty UPC Items";
 $lang["items_low_inventory_items"] = "Daftar Stock Rendah";
 $lang["items_manually_editing_of_quantity"] = "Perubahan jumlah Stok secara manual";
 $lang["items_must_select_item_for_barcode"] = "Anda harus memilih minimal 1 item untuk membuat barcode";

application/language/id/reports_lang.php

@@ -48,6 +48,7 @@ $lang["reports_payment_type"] = "Tipe Pembayaran";
 $lang["reports_payments"] = "Pembayaran";
 $lang["reports_payments_summary_report"] = "Laporan Ringkasan Pembayaran";
 $lang["reports_profit"] = "Keuntungan/Laba";
+$lang["reports_cost"] = "";
 $lang["reports_quantity_purchased"] = "Jumlah Dibeli";
 $lang["reports_received_by"] = "Diterima Oleh";
 $lang["reports_receiving_id"] = "Id Penerima";
@@ -88,9 +89,20 @@ $lang["reports_tax_percent"] = "Persentase Pajak";
 $lang["reports_taxes"] = "Pajak";
 $lang["reports_taxes_summary_report"] = "Laporan Ringkasan Pajak";
 $lang["reports_this_month"] = "Bulan ini";
+$lang["reports_this_month_last_year"] = "This Month Last Year";
+$lang["reports_this_month_to_today"] = "This Month To Today";
+$lang["reports_this_month_to_today_last_year"] = "This Month To Today Last Year";
 $lang["reports_this_year"] = "Tahun ini";
 $lang["reports_today"] = "Hari ini";
+$lang["reports_today_last_year"] = "Today Last Year";
 $lang["reports_total"] = "Total";
 $lang["reports_type"] = "Tipe";
 $lang["reports_welcome_message"] = "Selamat Datang ke panel laporan. Silakan pilih laporan untuk melihat/cetak.";
 $lang["reports_yesterday"] = "Kemarin";
+$lang["reports_item_count"] = "";
+$lang["reports_cost_price"] = "Harga Pokok";
+$lang["reports_unit_price"] = "Harga Jual";
+$lang["reports_sub_total_value"] = "Sub Total";
+$lang["reports_total_inventory_value"] = "Total Nilai Persediaan";
+$lang["reports_zero_and_less"] = "Stok habis dan minus";
+$lang["reports_more_than_zero"] = "Stok belum habis";

application/language/id/sales_lang.php

@@ -47,6 +47,7 @@ $lang["sales_invoice"] = "Invoice";
 $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"] = "Nomor Nota";
 $lang["sales_invoice_number_duplicate"] = "Nomor Nota Double";
@@ -67,7 +68,7 @@ $lang["sales_no_filter"] = "All";
 $lang["sales_no_items_in_cart"] = "Tidak ada Item dalam Keranjang Belanja";
 $lang["sales_no_sales_to_display"] = "No sales to display";
 $lang["sales_one_or_multiple"] = "";
-$lang["sales_overview"] = "Overview";
+$lang["sales_takings"] = "Takings";
 $lang["sales_payment"] = "Type Pembayaran";
 $lang["sales_payment_amount"] = "Amount";
 $lang["sales_payment_not_cover_total"] = "Jumlah pembayaran tidak mencakup Total";
@@ -111,3 +112,5 @@ $lang["sales_unsuccessfully_updated"] = "Penjualan tidak berhasil diperbarui";
 $lang["sales_unsuspend"] = "Batal Penangguhan";
 $lang["sales_unsuspend_and_delete"] = "Batalkan dan hapus penangguhan";
 $lang["sales_update"] = "Edit Sale";
+$lang["sales_date_range"] = "Rentang Tanggal";
+$lang["sales_none_selected"] = "Anda belum memilih item untuk diubah";

application/language/id/suppliers_lang.php

@@ -5,6 +5,7 @@ $lang["suppliers_basic_information"] = "Informasi Pemasok ";
 $lang["suppliers_cannot_be_deleted"] = "Tidak bisa dihapus pemasok yang dipilih, satu atau lebih dari pemasok yang dipilih memiliki penjualan.";
 $lang["suppliers_company_name"] = "Nama Perusahaan";
 $lang["suppliers_company_name_required"] = "Nama Perusahaan wajib diisi";
+$lang["suppliers_agency_name"] = "Nama";
 $lang["suppliers_confirm_delete"] = "Apakah Anda yakin ingin menghapus pemasok yang dipilih?";
 $lang["suppliers_error_adding_updating"] = "Kesalahan Menambah / memperbarui data pemasok";
 $lang["suppliers_new"] = "Pemasok Baru";
@@ -14,4 +15,5 @@ $lang["suppliers_successful_adding"] = "Anda telah berhasil menambahkan data pem
 $lang["suppliers_successful_deleted"] = "Anda telah berhasil menghapus data pemasok";
 $lang["suppliers_successful_updating"] = "Anda telah berhasil memperbarui data pemasok";
 $lang["suppliers_supplier"] = "Pemasok";
+$lang["suppliers_supplier_id"] = "Id";
 $lang["suppliers_update"] = "Ubah data Pemasok";

application/language/nl-BE/common_lang.php

@@ -9,6 +9,7 @@ $lang["common_confirm_search"] = "U hebt een of meerdere rijen geselecteerd, dez
 $lang["common_country"] = "Land";
 $lang["common_date"] = "Datum";
 $lang["common_delete"] = "Verwijder";
+$lang["common_print"] = "Print";
 $lang["common_det"] = "details";
 $lang["common_edit"] = "bewerk";
 $lang["common_email"] = "Email";

application/language/nl-BE/config_lang.php

@@ -24,6 +24,7 @@ $lang["config_barcode_second_row"] = "Rij 2";
 $lang["config_barcode_third_row"] = "Rij 3";
 $lang["config_barcode_type"] = "Barcode Type";
 $lang["config_barcode_width"] = "Breedte (px)";
+$lang["config_barcode_generate_if_empty"] = "Genereer indien leeg";
 $lang["config_company"] = "Bedrijfsnaam";
 $lang["config_company_logo"] = "Logo";
 $lang["config_company_required"] = "De bedrijfsnaam moet ingevuld worden";
@@ -115,3 +116,6 @@ $lang["config_thousands_separator"] = "Thousands Separator";
 $lang["config_timezone"] = "Tijdzone";
 $lang["config_use_invoice_template"] = "Gebruik template voor facturen";
 $lang["config_website"] = "Website";
+$lang["config_locale_configuration"] = "Localisation Configuration";
+$lang["config_locale_info"] = "Localisation Configuration Information";
+$lang["config_datetimeformat"] = "Date and Time format";

application/language/nl-BE/employees_lang.php

@@ -25,4 +25,4 @@ $lang["employees_update"] = "Update Werknemer";
 $lang["employees_username"] = "Gebruikersnaam";
 $lang["employees_username_minlength"] = "Gebruikersnaam moet minstens 5 characters lang zijn";
 $lang["employees_username_required"] = "Gebruikersnaam moet ingevuld worden";
-$lang["employees_subpermission_required"] = "Selecteer minstens <EFBFBD><EFBFBD>n permissie voor elke module";
+$lang["employees_subpermission_required"] = "Selecteer minstens één permissie voor elke module";

application/language/nl-BE/item_kits_lang.php

@@ -8,6 +8,7 @@ $lang["item_kits_error_adding_updating"] = "Fout bij het toevoegen/aanpassen van
 $lang["item_kits_info"] = "Product Set Info";
 $lang["item_kits_item"] = "Product";
 $lang["item_kits_items"] = "Producten";
+$lang["item_kits_kit"] = "Kit Id";
 $lang["item_kits_name"] = "Naam";
 $lang["item_kits_new"] = "Nieuwe Set";
 $lang["item_kits_no_item_kits_to_display"] = "Geen sets gevonden";

application/language/nl-BE/items_lang.php

@@ -41,7 +41,8 @@ $lang["items_item"] = "Product";
 $lang["items_item_number"] = "UPC/EAN/ISBN";
 $lang["items_item_number_duplicate"] = "De barcode nummer is reeds aanwezig in de database";
 $lang["items_location"] = "Locatie";
-$lang["items_low_inventory_items"] = "Producten niet in stock";
+$lang["items_empty_upc_items"] = "Zonder barcode";
+$lang["items_low_inventory_items"] = "Niet in stock";
 $lang["items_manually_editing_of_quantity"] = "Manuele aanpassing hoeveelheid";
 $lang["items_must_select_item_for_barcode"] = "U moet ten minste 1 product selecteren om een barcode te genereren";
 $lang["items_name"] = "Productnaam";

application/language/nl-BE/reports_lang.php

@@ -48,6 +48,7 @@ $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_quantity_purchased"] = "Aangekochte Hoeveelheid";
 $lang["reports_received_by"] = "Ontvangen door";
 $lang["reports_receiving_id"] = "";
@@ -76,7 +77,7 @@ $lang["reports_sales_summary_report"] = "Overzicht Verkoop";
 $lang["reports_serial_number"] = "Nummer";
 $lang["reports_sold_by"] = "Werknemer";
 $lang["reports_sold_to"] = "Klant";
-$lang["reports_stock_location"] = "";
+$lang["reports_stock_location"] = "Stock Locatie";
 $lang["reports_subtotal"] = "Subtotaal";
 $lang["reports_summary_reports"] = "Overzicht Rapporten";
 $lang["reports_supplied_by"] = "Geleverd door";
@@ -88,9 +89,20 @@ $lang["reports_tax_percent"] = "VAT Percentage";
 $lang["reports_taxes"] = "Belastingen";
 $lang["reports_taxes_summary_report"] = "Rapport Overzicht Belastingen";
 $lang["reports_this_month"] = "Deze Maand";
+$lang["reports_this_month_last_year"] = "This Month Last Year";
+$lang["reports_this_month_to_today"] = "This Month To Today";
+$lang["reports_this_month_to_today_last_year"] = "This Month To Today Last Year";
 $lang["reports_this_year"] = "Dit Jaar";
 $lang["reports_today"] = "Vandaag";
+$lang["reports_today_last_year"] = "Today Last Year";
 $lang["reports_total"] = "Totaal";
 $lang["reports_type"] = "Type";
 $lang["reports_welcome_message"] = "Welkom bij de rapporten. Selecteer hier een rapport.";
 $lang["reports_yesterday"] = "Gisteren";
+$lang["reports_item_count"] = "Filter Item Count";
+$lang["reports_cost_price"] = "Aankoopprijs";
+$lang["reports_unit_price"] = "Verkoopprijs";
+$lang["reports_sub_total_value"] = "Subtotaal";
+$lang["reports_total_inventory_value"] = "Totale waarde stock";
+$lang["reports_zero_and_less"] = "Nul en minder";
+$lang["reports_more_than_zero"] = "Meer dan nul";

application/language/nl-BE/sales_lang.php

@@ -47,6 +47,7 @@ $lang["sales_invoice"] = "Factuur";
 $lang["sales_invoice_confirm"] = "Deze factuur zal verstuurd worden naar";
 $lang["sales_invoice_enable"] = "Maak Factuur";
 $lang["sales_invoice_filter"] = "Facturen";
+$lang["sales_cash_filter"] = "Contant";
 $lang["sales_invoice_no_email"] = "Er werd geen email adres gevonden voor deze klant";
 $lang["sales_invoice_number"] = "Factuur #";
 $lang["sales_invoice_number_duplicate"] = "Vul een unieke nummer in";
@@ -67,7 +68,7 @@ $lang["sales_no_filter"] = "Alle";
 $lang["sales_no_items_in_cart"] = "Er zijn geen aankopen geselecteerd";
 $lang["sales_no_sales_to_display"] = "Er werden geen aankopen gevonden";
 $lang["sales_one_or_multiple"] = "aankopen verwijderd";
-$lang["sales_overview"] = "Overzicht";
+$lang["sales_takings"] = "Overzicht";
 $lang["sales_payment"] = "Betaalmethode";
 $lang["sales_payment_amount"] = "Bedrag";
 $lang["sales_payment_not_cover_total"] = "Betaalde hoeveelheid is onvoldoende";
@@ -111,3 +112,5 @@ $lang["sales_unsuccessfully_updated"] = "Fout bij het bewaren van ticket";
 $lang["sales_unsuspend"] = "Hervat";
 $lang["sales_unsuspend_and_delete"] = "";
 $lang["sales_update"] = "Bewerk Ticket";
+$lang["sales_date_range"] = "Periode";
+$lang["sales_none_selected"] = "U hebt geen aankopen geselecteerd";

application/language/nl-BE/suppliers_lang.php

@@ -3,8 +3,9 @@
 $lang["suppliers_account_number"] = "Btw nummer";
 $lang["suppliers_basic_information"] = "Informatie Leverancier";
 $lang["suppliers_cannot_be_deleted"] = "De geselecteeerde leveranciers konden niet worden verwijderd. Eén of meerdere leveranciers hebben ordergegevens in de database zitten.";
-$lang["suppliers_company_name"] = "Bedrijfsnaam";
+$lang["suppliers_company_name"] = "Leverancier";
 $lang["suppliers_company_name_required"] = "Bedrijfsnaam moet ingevuld worden";
+$lang["suppliers_agency_name"] = "Agencynaam";
 $lang["suppliers_confirm_delete"] = "Bent u zeker dat u de geselecteerde leveranciers wil verwijderen?";
 $lang["suppliers_error_adding_updating"] = "Fout bij het toevoegen/aanpassen van een leverancier";
 $lang["suppliers_new"] = "N. Leverancier";
@@ -14,4 +15,5 @@ $lang["suppliers_successful_adding"] = "Leverancier succesvol toegevoegd";
 $lang["suppliers_successful_deleted"] = "Er werd(en)";
 $lang["suppliers_successful_updating"] = "Wijzigingen leveranciersgegevens bewaard";
 $lang["suppliers_supplier"] = "Leverancier";
+$lang["suppliers_supplier_id"] = "Id";
 $lang["suppliers_update"] = "Bewerk Leverancier";

application/language/ru/common_lang.php

@@ -9,6 +9,7 @@ $lang["common_confirm_search"] = "Вы выбрали одну или неско
 $lang["common_country"] = "Страна";
 $lang["common_date"] = "Date";
 $lang["common_delete"] = "Удалить";
+$lang["common_print"] = "Print";
 $lang["common_det"] = "детали";
 $lang["common_edit"] = "редактировать";
 $lang["common_email"] = "Электронная почта";

application/language/ru/config_lang.php

@@ -24,6 +24,7 @@ $lang["config_barcode_second_row"] = "Row 5";
 $lang["config_barcode_third_row"] = "Row 6";
 $lang["config_barcode_type"] = "Barcode Type";
 $lang["config_barcode_width"] = "Width (px)";
+$lang["config_barcode_generate_if_empty"] = "Generate if empty";
 $lang["config_company"] = "Название Компании";
 $lang["config_company_logo"] = "Company Logo";
 $lang["config_company_required"] = "Имя Компании обязательный пробел";
@@ -115,3 +116,6 @@ $lang["config_thousands_separator"] = "Thousands Separator";
 $lang["config_timezone"] = "Часовой пояс";
 $lang["config_use_invoice_template"] = "Use invoice template";
 $lang["config_website"] = "Веб-сайт";
+$lang["config_locale_configuration"] = "Localisation Configuration";
+$lang["config_locale_info"] = "Localisation Configuration Information";
+$lang["config_datetimeformat"] = "Date and Time format";

application/language/ru/item_kits_lang.php

@@ -8,6 +8,7 @@ $lang["item_kits_error_adding_updating"] = "Ошибка при добавлен
 $lang["item_kits_info"] = "Информация о товаре комплекта";
 $lang["item_kits_item"] = "товар";
 $lang["item_kits_items"] = "товары";
+$lang["item_kits_kit"] = "Kit Id";
 $lang["item_kits_name"] = "Наименование товара комплект";
 $lang["item_kits_new"] = "Новый товар комплект";
 $lang["item_kits_no_item_kits_to_display"] = "Нет товара комплекты для отображения";

application/language/ru/items_lang.php

@@ -41,6 +41,7 @@ $lang["items_item"] = "Товар";
 $lang["items_item_number"] = "UPC/EAN/ISBN";
 $lang["items_item_number_duplicate"] = "The item number is already present in the database";
 $lang["items_location"] = "место";
+$lang["items_empty_upc_items"] = "Empty UPC Items";
 $lang["items_low_inventory_items"] = "Низкий инвентаризации товары";
 $lang["items_manually_editing_of_quantity"] = "Руководство Изменить количество";
 $lang["items_must_select_item_for_barcode"] = "Вы должны выбрать хотя бы 1 товар для создания штрих-кодов";

application/language/ru/reports_lang.php

@@ -48,6 +48,7 @@ $lang["reports_payment_type"] = "Вид оплаты";
 $lang["reports_payments"] = "Оплаты";
 $lang["reports_payments_summary_report"] = "Платежей Сводный отчет";
 $lang["reports_profit"] = "прибыль";
+$lang["reports_cost"] = "Cost";
 $lang["reports_quantity_purchased"] = "купенный количество";
 $lang["reports_received_by"] = "получило за";
 $lang["reports_receiving_id"] = "";
@@ -88,9 +89,20 @@ $lang["reports_tax_percent"] = "процент налога";
 $lang["reports_taxes"] = "Налоги";
 $lang["reports_taxes_summary_report"] = "Сводный отчет налоги";
 $lang["reports_this_month"] = "В этом месяце";
+$lang["reports_this_month_last_year"] = "This Month Last Year";
+$lang["reports_this_month_to_today"] = "This Month To Today";
+$lang["reports_this_month_to_today_last_year"] = "This Month To Today Last Year";
 $lang["reports_this_year"] = "В этом году";
 $lang["reports_today"] = "сегодня";
+$lang["reports_today_last_year"] = "Today Last Year";
 $lang["reports_total"] = "сумма";
 $lang["reports_type"] = "тип";
 $lang["reports_welcome_message"] = "Добро пожаловать в панель отчетов. Пожалуйста, выберите отчет для просмотра.";
 $lang["reports_yesterday"] = "вчера";
+$lang["reports_item_count"] = "Filter Item Count";
+$lang["reports_cost_price"] = "Оптовая Цена";
+$lang["reports_unit_price"] = "Розничная Цена";
+$lang["reports_sub_total_value"] = "промежуточный итог";
+$lang["reports_total_inventory_value"] = "Total Inventory Value";
+$lang["reports_zero_and_less"] = "Zero and less";
+$lang["reports_more_than_zero"] = "More than zero";

application/language/ru/sales_lang.php

@@ -47,6 +47,7 @@ $lang["sales_invoice"] = "Invoice";
 $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";
@@ -67,7 +68,7 @@ $lang["sales_no_filter"] = "All";
 $lang["sales_no_items_in_cart"] = "Там нет товаров в корзине";
 $lang["sales_no_sales_to_display"] = "No sales to display";
 $lang["sales_one_or_multiple"] = "";
-$lang["sales_overview"] = "Overview";
+$lang["sales_takings"] = "Takings";
 $lang["sales_payment"] = "Вид оплаты";
 $lang["sales_payment_amount"] = "количество";
 $lang["sales_payment_not_cover_total"] = "оплачиваемая сумма недостаточно";
@@ -111,3 +112,5 @@ $lang["sales_unsuccessfully_updated"] = "Продажа безуспешно о
 $lang["sales_unsuspend"] = "Разблокировать";
 $lang["sales_unsuspend_and_delete"] = "Разблокировать и удалить";
 $lang["sales_update"] = "Edit Sale";
+$lang["sales_date_range"] = "размах числа";
+$lang["sales_none_selected"] = "Вы не выбрали ни одной товари для редактирования";

application/language/ru/suppliers_lang.php

@@ -5,6 +5,7 @@ $lang["suppliers_basic_information"] = "Информация о поставщи
 $lang["suppliers_cannot_be_deleted"] = "Не удалось удалить выбранные поставщиков, один или более из выбранных поставщиков имеет продаж.";
 $lang["suppliers_company_name"] = "Название компании";
 $lang["suppliers_company_name_required"] = "Название компании является обязательным полем";
+$lang["suppliers_agency_name"] = " ";
 $lang["suppliers_confirm_delete"] = "Вы уверены, что хотите удалить выбранных поставщиков?";
 $lang["suppliers_error_adding_updating"] = "Ошибка при добавлении/обновлении поставщиком";
 $lang["suppliers_new"] = "Новый поставщик";
@@ -14,4 +15,5 @@ $lang["suppliers_successful_adding"] = "Вы успешно добавили п
 $lang["suppliers_successful_deleted"] = "Вы успешно удален";
 $lang["suppliers_successful_updating"] = "Вы успешно обновляли поставщиком";
 $lang["suppliers_supplier"] = "поставщик";
+$lang["suppliers_supplier_id"] = "Id";
 $lang["suppliers_update"] = "Обновить поставщика";

application/language/th/common_lang.php

@@ -9,6 +9,7 @@ $lang["common_confirm_search"] = "คุณเลือกมากกว่า
 $lang["common_country"] = "ประเทศ";
 $lang["common_date"] = "Date";
 $lang["common_delete"] = "ลบ";
+$lang["common_print"] = "พิมพ์";
 $lang["common_det"] = "สรุป";
 $lang["common_edit"] = "แก้ไข";
 $lang["common_email"] = "E-Mail";
@@ -16,24 +17,24 @@ $lang["common_email_invalid_format"] = "e-mail address ไม่ถูกต้
 $lang["common_fields_required_message"] = "ช่องสีแดงต้องกรอก";
 $lang["common_first_name"] = "ชื่อ";
 $lang["common_first_name_required"] = "ชื่อต้องกรอก";
-$lang["common_first_page"] = "First";
-$lang["common_gender"] = "";
-$lang["common_gender_female"] = "V";
-$lang["common_gender_male"] = "";
+$lang["common_first_page"] = "อันดับแรก";
+$lang["common_gender"] = "เพศ";
+$lang["common_gender_female"] = "หญิง";
+$lang["common_gender_male"] = "ชาย";
 $lang["common_inv"] = "ยอด";
 $lang["common_last_name"] = "นามสกุล";
 $lang["common_last_name_required"] = "นามสกุลต้องกรอก";
 $lang["common_last_page"] = "Last";
 $lang["common_learn_about_project"] = "เพื่อศึกษาข้อมูลล่าสุดของโครงการ";
 $lang["common_list_of"] = "รายการ";
-$lang["common_logout"] = "";
+$lang["common_logout"] = "ออกจากระบบ";
 $lang["common_new"] = "New";
 $lang["common_no_persons_to_display"] = "ไม่พบข้อมูลตัวบุคคล";
-$lang["common_or"] = "";
+$lang["common_or"] = "หรือ";
 $lang["common_phone_number"] = "โทรศัพท์";
-$lang["common_phone_number_required"] = "";
+$lang["common_phone_number_required"] = "ต้องกรอกเบอร์โทร";
 $lang["common_please_visit_my"] = "เยี่ยมชมที่";
-$lang["common_powered_by"] = "";
+$lang["common_powered_by"] = "จัดทำโดย";
 $lang["common_price"] = "ราคา";
 $lang["common_remove"] = "ลบ";
 $lang["common_return_policy"] = "นโยบายคืนสินค้า";
@@ -42,15 +43,15 @@ $lang["common_search_options"] = "Search options";
 $lang["common_searched_for"] = "ค้นหาสำหรับ";
 $lang["common_state"] = "จังหวัด";
 $lang["common_submit"] = "ส่งข้อมูล";
-$lang["common_view_recent_sales"] = "สำรวจการขายเมื่อเร็วๆนี้";
+$lang["common_view_recent_sales"] = "การขายล่าสุด";
 $lang["common_website"] = "website";
-$lang["common_welcome"] = "";
+$lang["common_welcome"] = "ยินดีต้อนรับ";
 $lang["common_welcome_message"] = "Opensource Point of sale. กรุณาเลือกคำสั่งเมนูด้านล่าง ";
 $lang["common_you_are_using_ospos"] = "คุณกำลังใช้ Opensource Point of Sales รุ่น";
 $lang["common_zip"] = "รหัสไปรษณีย์";
-$lang["common_import"] = "Import";
+$lang["common_import"] = "นำเข้า";
 $lang["common_download_import_template"] = "Download Import Excel Template (CSV)";
 $lang["common_import_file_path"] = "file path";
 $lang["common_import_excel"] = "Excel Import";
 $lang["common_import_full_path"] = "Full path to excel file required";
-$lang["common_required"] = "Required";
+$lang["common_required"] = "ต้องกรอก";

application/language/th/config_lang.php

@@ -2,34 +2,35 @@
 
 $lang["config_address"] = "ที่อยู่";
 $lang["config_address_required"] = "ที่อยู่ต้องกรอก";
-$lang["config_backup_button"] = "Backup";
-$lang["config_backup_database"] = "Backup Database";
+$lang["config_backup_button"] = "สำรองข้อมูล";
+$lang["config_backup_database"] = "สำรองฐานข้อมูล";
 $lang["config_barcode_company"] = "ชื่อร้านค้า";
-$lang["config_barcode_configuration"] = "Barcode Configuration";
-$lang["config_barcode_content"] = "Barcode Content";
-$lang["config_barcode_first_row"] = "";
-$lang["config_barcode_font"] = "";
-$lang["config_barcode_height"] = "";
-$lang["config_barcode_id"] = "Item Id";
-$lang["config_barcode_info"] = "";
-$lang["config_barcode_layout"] = "";
-$lang["config_barcode_name"] = "Name";
+$lang["config_barcode_configuration"] = "ตั้งค่าระบบบาร์โค้ด";
+$lang["config_barcode_content"] = "รหัสที่พิมพ์";
+$lang["config_barcode_first_row"] = "แถว 1";
+$lang["config_barcode_font"] = "แบบอักษร";
+$lang["config_barcode_height"] = "สูง (px)";
+$lang["config_barcode_id"] = "รหัสสินค้า/ชื่อสินค้า";
+$lang["config_barcode_info"] = "ตั้งค่าบาร์โค้ด";
+$lang["config_barcode_layout"] = "โครงร่างการพิมพ์";
+$lang["config_barcode_name"] = "สินค้า";
 $lang["config_barcode_number"] = "UPC/EAN/ISBN";
-$lang["config_barcode_number_in_row"] = "";
-$lang["config_barcode_page_cellspacing"] = "";
-$lang["config_barcode_page_width"] = "";
-$lang["config_barcode_price"] = "Price";
-$lang["config_barcode_quality"] = "";
-$lang["config_barcode_second_row"] = "";
-$lang["config_barcode_third_row"] = "";
-$lang["config_barcode_type"] = "";
-$lang["config_barcode_width"] = "";
+$lang["config_barcode_number_in_row"] = "จำนวนดวงใน 1 แถว";
+$lang["config_barcode_page_cellspacing"] = "ระยะห่างต่อดวง";
+$lang["config_barcode_page_width"] = "ความกว้างในหน้า";
+$lang["config_barcode_price"] = "ราคา";
+$lang["config_barcode_quality"] = "คุณภาพ (1-100)";
+$lang["config_barcode_second_row"] = "แถว 2";
+$lang["config_barcode_third_row"] = "แถว 3";
+$lang["config_barcode_type"] = "ประเภทบาร์โค้ด";
+$lang["config_barcode_width"] = "กว้าง (px)";
+$lang["config_barcode_generate_if_empty"] = "Generate if empty";
 $lang["config_company"] = "ชื่อร้านค้า";
-$lang["config_company_logo"] = "Company Logo";
+$lang["config_company_logo"] = "ภาพโลโก้";
 $lang["config_company_required"] = "ชื่อร้านค้าต้องกรอก";
 $lang["config_company_website_url"] = "เว็บไซต์ร้านค้าไม่ถูกต้อง";
 $lang["config_currency_side"] = "ด้านขวา";
-$lang["config_currency_symbol"] = "ลัญลักษณ์ค่าเงิน";
+$lang["config_currency_symbol"] = "สัญลักษณ์ค่าเงิน";
 $lang["config_custom1"] = "พื้นที่เพิ่มเติม 1";
 $lang["config_custom10"] = "พื้นที่เพิ่มเติม 10";
 $lang["config_custom2"] = "พื้นที่เพิ่มเติม 2";
@@ -40,7 +41,7 @@ $lang["config_custom6"] = "พื้นที่เพิ่มเติม 6";
 $lang["config_custom7"] = "พื้นที่เพิ่มเติม 7";
 $lang["config_custom8"] = "พื้นที่เพิ่มเติม 8";
 $lang["config_custom9"] = "พื้นที่เพิ่มเติม 9";
-$lang["config_decimal_point"] = "Decimal Point";
+$lang["config_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";
@@ -63,8 +64,8 @@ $lang["config_default_tax_rate_1"] = "อัตราภาษี 1";
 $lang["config_default_tax_rate_2"] = "อัตราภาษี 2";
 $lang["config_default_tax_rate_number"] = "อัตราภาษีเริ่มต้นต้องเป็นตัวเลข";
 $lang["config_default_tax_rate_required"] = "อัตราภาษีเริ่มต้นต้องกรอก";
-$lang["config_fax"] = "แฟ็ก";
-$lang["config_general_configuration"] = "General Configuration";
+$lang["config_fax"] = "แฟ็กซ์";
+$lang["config_general_configuration"] = "ตั้งค่าทั่วไป";
 $lang["config_info"] = "ข้อมูลร้านค้า";
 $lang["config_invoice_default_comments"] = "Default Invoice Comments";
 $lang["config_invoice_email_message"] = "Invoice Email Template";
@@ -77,7 +78,7 @@ $lang["config_lines_per_page_required"] = "The lines per page is a required fiel
 $lang["config_location_configuration"] = "Stock Locations";
 $lang["config_location_info"] = "Location Configuration Information";
 $lang["config_logout"] = "Don't you want to make a backup before logging out?";
-$lang["config_number_format"] = "Number Format";
+$lang["config_number_format"] = "รูปแบบตัวเลข";
 $lang["config_phone"] = "เบอร์โทรศัพท์";
 $lang["config_phone_required"] = "เบอร์โทรต้องกรอก";
 $lang["config_print_bottom_margin"] = "Margin Bottom";
@@ -111,7 +112,10 @@ $lang["config_stock_location_duplicate"] = "";
 $lang["config_stock_location_invalid_chars"] = "The stock location name can not contain '_'";
 $lang["config_stock_location_required"] = "จำเป็นต้องระบุสถานที่เก็บ";
 $lang["config_tax_included"] = "รวมภาษีแล้ว";
-$lang["config_thousands_separator"] = "Thousands Separator";
-$lang["config_timezone"] = "Timezone";
+$lang["config_thousands_separator"] = "ตัวคั่นหลักพัน";
+$lang["config_timezone"] = "โซนเวลา";
 $lang["config_use_invoice_template"] = "Use invoice template";
 $lang["config_website"] = "เว็บไซต์";
+$lang["config_locale_configuration"] = "ตั้งค่าภาษา";
+$lang["config_locale_info"] = "Localisation Configuration Information";
+$lang["config_datetimeformat"] = "รูปแบบวันเวลา";

application/language/th/item_kits_lang.php

@@ -8,6 +8,7 @@ $lang["item_kits_error_adding_updating"] = "เพิ่ม/ปรับปร
 $lang["item_kits_info"] = "ข้อมูลสินค้าหมู่";
 $lang["item_kits_item"] = "สินค้า";
 $lang["item_kits_items"] = "สินค้า";
+$lang["item_kits_kit"] = "Kit Id";
 $lang["item_kits_name"] = "ชื่อสินค้าหมู่";
 $lang["item_kits_new"] = "สร้างสินค้าหมู่";
 $lang["item_kits_no_item_kits_to_display"] = "ไม่มีสินค้าแสดง";

application/language/th/items_lang.php

@@ -2,9 +2,9 @@
 
 $lang["items_add_minus"] = "เพิ่ม/ลบ จำนวนสินค้าคงคลัง";
 $lang["items_allow_alt_desciption"] = "Allow Alt Description";
-$lang["items_allow_alt_description"] = "";
+$lang["items_allow_alt_description"] = "แสดงข้อมูลเพิ่มเติม";
 $lang["items_amazon"] = "Amazon";
-$lang["items_basic_information"] = "ข้อมูลสินค้ส";
+$lang["items_basic_information"] = "ข้อมูลสินค้า";
 $lang["items_bulk_edit"] = "แก้ไขความจุ";
 $lang["items_buy_price_required"] = "ราคาซื้อขายต้องกรอก";
 $lang["items_cannot_be_deleted"] = "ไม่สามารถลบสินค้าที่เลือก, สินค้าที่เลือกถูกขายไปแล้ว.";
@@ -30,17 +30,18 @@ $lang["items_edit_multiple_items"] = "แก้ใขสินค้าต่า
 $lang["items_error_adding_updating"] = "เพิ่ม/ปรับแต่ง สินค้าล้มเหลว";
 $lang["items_error_updating_multiple"] = "ปรับแต่งสินค้าล้มเหลว";
 $lang["items_excel_import_failed"] = "นำเข้าข้อมูล Excel ล้มเหลว";
-$lang["items_generate_barcodes"] = "สร้างบาร์โค๊ด";
-$lang["items_image"] = "Avatar";
+$lang["items_generate_barcodes"] = "พิมพ์บาร์โค๊ด";
+$lang["items_image"] = "รูป";
 $lang["items_info_provided_by"] = "จัดเตรียมข้อมูลโดย";
 $lang["items_inventory"] = "สินค้าคงเหลือ";
 $lang["items_inventory_comments"] = "คำอธิบาย";
 $lang["items_is_deleted"] = "ถูกลบแล้ว";
-$lang["items_is_serialized"] = "สินค้ามีซีเรียวนัมเบอร์";
+$lang["items_is_serialized"] = "สินค้ามีซีเรียลนัมเบอร์";
 $lang["items_item"] = "สินค้า";
 $lang["items_item_number"] = "โค๊ด";
 $lang["items_item_number_duplicate"] = "The item number is already present in the database";
 $lang["items_location"] = "ที่ตั้ง";
+$lang["items_empty_upc_items"] = "Empty UPC Items";
 $lang["items_low_inventory_items"] = "สินค้าคงเหลือน้อย";
 $lang["items_manually_editing_of_quantity"] = "แก้ไขจำนวน";
 $lang["items_must_select_item_for_barcode"] = "คุต้องเลือกสินค้าอย่างน้อยหนึ่งอย่างเพื่อจะสร้างบาร์โค๊ด";

application/language/th/reports_lang.php

@@ -48,6 +48,7 @@ $lang["reports_payment_type"] = "ชนิดของการจ่าย";
 $lang["reports_payments"] = "รายจ่าย";
 $lang["reports_payments_summary_report"] = "รายงานสรุปการจ่าย";
 $lang["reports_profit"] = "กำไร";
+$lang["reports_cost"] = "Cost";
 $lang["reports_quantity_purchased"] = "จำนวนการช์้อ";
 $lang["reports_received_by"] = "รับโดย";
 $lang["reports_receiving_id"] = "IDรับสินค้า";
@@ -88,9 +89,20 @@ $lang["reports_tax_percent"] = "เปอร์เซ็นภาษี";
 $lang["reports_taxes"] = "ภาษี";
 $lang["reports_taxes_summary_report"] = "รายงานสรุปภาษี";
 $lang["reports_this_month"] = "เดือนนี้";
+$lang["reports_this_month_last_year"] = "This Month Last Year";
+$lang["reports_this_month_to_today"] = "This Month To Today";
+$lang["reports_this_month_to_today_last_year"] = "This Month To Today Last Year";
 $lang["reports_this_year"] = "ปีนี้";
 $lang["reports_today"] = "วันนี้";
+$lang["reports_today_last_year"] = "Today Last Year";
 $lang["reports_total"] = "ยอดรวม";
 $lang["reports_type"] = "ชนิด";
 $lang["reports_welcome_message"] = "ยินดีต้อนรับเข้าสู่รายงาน. โปรดเลือกชนิดของรายงาน.";
 $lang["reports_yesterday"] = "เมื่อวานนี้";
+$lang["reports_item_count"] = "Filter Item Count";
+$lang["reports_cost_price"] = "ราคาทุน";
+$lang["reports_unit_price"] = "ราคาขาย";
+$lang["reports_sub_total_value"] = "ยอดรวมหักภาษี ";
+$lang["reports_total_inventory_value"] = "Total Inventory Value";
+$lang["reports_zero_and_less"] = "Zero and less";
+$lang["reports_more_than_zero"] = "More than zero";

application/language/th/sales_lang.php

@@ -1,27 +1,27 @@
 <?php 
 
 $lang["sales_add_payment"] = "เพิ่มบิล";
-$lang["sales_amount_due"] = "";
-$lang["sales_amount_tendered"] = "จำนวนประมูล";
+$lang["sales_amount_due"] = "ยอดต้องชำระ";
+$lang["sales_amount_tendered"] = "ชำระเข้ามา";
 $lang["sales_basic_information"] = "";
 $lang["sales_cancel_sale"] = "ยกเลิกการขาย";
 $lang["sales_cash"] = "เงินสด";
 $lang["sales_change_due"] = "เงินทอน";
-$lang["sales_check"] = "เช็ก";
+$lang["sales_check"] = "เช็ค";
 $lang["sales_check_balance"] = "Check remainder";
 $lang["sales_comment"] = "หมายเหตุ";
 $lang["sales_comments"] = "หมายเหตุ";
-$lang["sales_complete_sale"] = "สำเร็จการขาย";
+$lang["sales_complete_sale"] = "จบการขาย";
 $lang["sales_confirm_cancel_sale"] = "แน่ใจหรือไม่ที่จะล้างรายการขาย? สินค้าทุกอย่างจะถูกลบจากบอร์ด.";
 $lang["sales_confirm_delete"] = "Are you sure you want to delete the selected sales?";
 $lang["sales_confirm_finish_sale"] = "แน่ใจหรือไม่ที่จะสำเร็จการขาย? ไม่สามารถย้อนกลับได้.";
 $lang["sales_confirm_suspend_sale"] = "แน่ใจหรือไม่ที่จะระงับการขาย?";
-$lang["sales_credit"] = "เครดิทการ์ด";
+$lang["sales_credit"] = "เครดิตการ์ด";
 $lang["sales_customer"] = "ลูกค้า";
 $lang["sales_date"] = "วันที่ขาย";
 $lang["sales_date_required"] = "A correct date needs to be filled in";
 $lang["sales_date_type"] = "Date field is required";
-$lang["sales_debit"] = "เดบิทการ์ด";
+$lang["sales_debit"] = "เดบิตการ์ด";
 $lang["sales_delete_confirmation"] = "แน่ใจหรือไม่ที่จะลบรายการขายนี้, ลบแล้วไม่สามารถเรียกกลับคืนใด้";
 $lang["sales_delete_entire_sale"] = "ลบการขายทั้งหมด";
 $lang["sales_delete_successful"] = "คุณลบการขายสำเร็จ";
@@ -29,7 +29,7 @@ $lang["sales_delete_unsuccessful"] = "คุณลบการขายไม่
 $lang["sales_description_abbrv"] = "Desc";
 $lang["sales_discount"] = "ส่วนลด %";
 $lang["sales_discount_included"] = "% Discount";
-$lang["sales_discount"] = "Discount";
+$lang["sales_discount"] = "ส่วนลด";
 $lang["sales_discount_short"] = "";
 $lang["sales_edit"] = "แก้ไข";
 $lang["sales_edit_item"] = "แก้ไขสินค้า";
@@ -43,16 +43,17 @@ $lang["sales_giftcard"] = "Gift Card";
 $lang["sales_giftcard_balance"] = "Giftcard Balance";
 $lang["sales_giftcard_number"] = "เลขที่ Gift Card";
 $lang["sales_id"] = "เลขที่ขาย";
-$lang["sales_invoice"] = "Invoice";
+$lang["sales_invoice"] = "ใบแจ้งหนี้";
 $lang["sales_invoice_confirm"] = "This invoice will be sent to";
-$lang["sales_invoice_enable"] = "Create Invoice";
-$lang["sales_invoice_filter"] = "Invoices";
+$lang["sales_invoice_enable"] = "ออกใบแจ้งหนี้";
+$lang["sales_invoice_filter"] = "ใบแจ้งหนี้";
+$lang["sales_cash_filter"] = "เงินสด";
 $lang["sales_invoice_no_email"] = "This customer does not have a valid email address";
-$lang["sales_invoice_number"] = "Invoice #";
+$lang["sales_invoice_number"] = "เลขใบแจ้งหนี้";
 $lang["sales_invoice_number_duplicate"] = "Please enter an unique invoice number";
 $lang["sales_invoice_sent"] = "Invoice sent to";
 $lang["sales_invoice_unsent"] = "Invoice failed to be sent to";
-$lang["sales_invoice_update"] = "Recount";
+$lang["sales_invoice_update"] = "คำนวณใหม่";
 $lang["sales_item_insufficient_of_stock"] = "จำนวนสินค้าไม่เพียงพอ";
 $lang["sales_item_name"] = "ชื่อสินค้า";
 $lang["sales_item_number"] = "สินค้า #";
@@ -67,39 +68,39 @@ $lang["sales_no_filter"] = "All";
 $lang["sales_no_items_in_cart"] = "ไม่พบสินค้าในตระกร้า";
 $lang["sales_no_sales_to_display"] = "No sales to display";
 $lang["sales_one_or_multiple"] = "";
-$lang["sales_overview"] = "Overview";
+$lang["sales_takings"] = "ประวัติ";
 $lang["sales_payment"] = "รูปแบบชำระเงิน";
 $lang["sales_payment_amount"] = "";
 $lang["sales_payment_not_cover_total"] = " ปริมาณการจ่ายที่ไม่เพียงพอกะยอดรวม";
-$lang["sales_payment_type"] = "";
-$lang["sales_payments_total"] = "";
+$lang["sales_payment_type"] = "ชำระโดย";
+$lang["sales_payments_total"] = "ยอดชำระแล้ว";
 $lang["sales_price"] = "ราคา";
 $lang["sales_print_after_sale"] = "พิมพ์บิลหลังการขาย";
 $lang["sales_quantity"] = "จำนวน";
 $lang["sales_quantity_less_than_zero"] = "คำเตือน ถ้าจำนวนของไม่เพียงพอกับความต้องการหรือไม่ตรงกับยอดในบันชี ก็สามารถทำการขายได้ แต่ต้องเชคปริมานสินค้าคงคลัง";
 $lang["sales_receipt"] = "บิลขาย";
-$lang["sales_receipt_number"] = "";
+$lang["sales_receipt_number"] = "จุดขาย#";
 $lang["sales_register"] = "ลงทะเบียนขาย";
 $lang["sales_remove_customer"] = "ลบลูกค้า";
 $lang["sales_return"] = "คืน";
-$lang["sales_sale"] = "";
+$lang["sales_sale"] = "ขาย";
 $lang["sales_sale_for_customer"] = "ลูกค้า:";
-$lang["sales_sale_time"] = "";
+$lang["sales_sale_time"] = "เวลา";
 $lang["sales_select_customer"] = "เลือกลูกค้า (Optional)";
-$lang["sales_send_invoice"] = "Send Invoice";
+$lang["sales_send_invoice"] = "ส่งใบแจ้งหนี้";
 $lang["sales_serial"] = "Serial";
-$lang["sales_show_invoice"] = "invoice";
-$lang["sales_show_receipt"] = "receipt";
+$lang["sales_show_invoice"] = "ใบแจ้งหนี้";
+$lang["sales_show_receipt"] = "ใบเสร็จ";
 $lang["sales_start_typing_customer_name"] = "เริ่มต้นพิมพ์ชื่อลูกค้า...";
 $lang["sales_start_typing_item_name"] = "เริ่มต้นพิมพ์ชื่อสินค้า หรือ สแกนบาร์โค๊ด...";
-$lang["sales_stock_location"] = "";
+$lang["sales_stock_location"] = "ที่เก็บ";
 $lang["sales_sub_total"] = "ยอดรวมหักภาษี ";
 $lang["sales_successfully_deleted"] = "ลบการขายสมยูรณ์";
 $lang["sales_successfully_suspended_sale"] = "การขายของคุณถูกระงับเรียบร้อย";
 $lang["sales_successfully_updated"] = "อัพเดทการขายสมบูรณ์";
-$lang["sales_suspend_sale"] = "ระงับการขายชั่วคราว";
-$lang["sales_suspended_sale_id"] = "รหัสการขายที่ถูกระงับ";
-$lang["sales_suspended_sales"] = "การขายที่ถูกระงับ";
+$lang["sales_suspend_sale"] = "พักรายการ";
+$lang["sales_suspended_sale_id"] = "รหัสการขายที่ถูกพัก";
+$lang["sales_suspended_sales"] = "การขายที่พักไว้";
 $lang["sales_tax"] = "ภาษี";
 $lang["sales_tax_percent"] = "ภาษี %";
 $lang["sales_total"] = "ยอดรวม";
@@ -110,4 +111,6 @@ $lang["sales_unsuccessfully_deleted"] = "ลบการขายไม่สำ
 $lang["sales_unsuccessfully_updated"] = "อัพเดทการขายไม่สมบูรณ์";
 $lang["sales_unsuspend"] = "ยกเลิกการระงับ";
 $lang["sales_unsuspend_and_delete"] = "ยกเลิกการระงับ และ ลบ";
-$lang["sales_update"] = "Edit Sale";
+$lang["sales_update"] = "แก้ไขการขาย";
+$lang["sales_date_range"] = "ระหว่างวันที่";
+$lang["sales_none_selected"] = "กรุณาเลือสินค้าที่ต้องการแก้ไข";

application/language/th/suppliers_lang.php

@@ -5,6 +5,7 @@ $lang["suppliers_basic_information"] = "ข้อมูลผู้ผลิต"
 $lang["suppliers_cannot_be_deleted"] = "ลบผู้ผลิตที่ถูกเลือกไม่ได้, one or more of the selected suppliers has sales.";
 $lang["suppliers_company_name"] = "ชื่อบริษัท";
 $lang["suppliers_company_name_required"] = "ชื่อบริษัทต้องกรอก";
+$lang["suppliers_agency_name"] = " ";
 $lang["suppliers_confirm_delete"] = "แน่ใจหรือไม่ที่จะลบผู้ผลิตที่ถููกเลือก?";
 $lang["suppliers_error_adding_updating"] = "เพิ่ม/แก้ไข ผู้ผลิต ล้มเหลว";
 $lang["suppliers_new"] = "ผู้ผลิตรายใหม่";
@@ -14,4 +15,5 @@ $lang["suppliers_successful_adding"] = "เพิ่มผู้ผลิตส
 $lang["suppliers_successful_deleted"] = "ลบสำเร็จ";
 $lang["suppliers_successful_updating"] = "ปรับปรุงผู้ผลิตสำเร็จ";
 $lang["suppliers_supplier"] = "ผู้ผลิต";
+$lang["suppliers_supplier_id"] = "Id";
 $lang["suppliers_update"] = "ปรับปรุงผู้ผลิต";

application/language/tr/common_lang.php

@@ -9,6 +9,7 @@ $lang["common_confirm_search"] = "Birden fazla satır seçtiniz, arama yaptığ
 $lang["common_country"] = "Ülke";
 $lang["common_date"] = "Date";
 $lang["common_delete"] = "Sil";
+$lang["common_print"] = "Print";
 $lang["common_det"] = "Detaylar";
 $lang["common_edit"] = "düzenle";
 $lang["common_email"] = "E-Posta";

application/language/tr/config_lang.php

@@ -24,6 +24,7 @@ $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_company"] = "Şirket Adı";
 $lang["config_company_logo"] = "Company Logo";
 $lang["config_company_required"] = "Şirket Adı zorunlu alandır";
@@ -115,3 +116,6 @@ $lang["config_thousands_separator"] = "Thousands Separator";
 $lang["config_timezone"] = "Saat Dilimi";
 $lang["config_use_invoice_template"] = "Use invoice template";
 $lang["config_website"] = "Website";
+$lang["config_locale_configuration"] = "Localisation Configuration";
+$lang["config_locale_info"] = "Localisation Configuration Information";
+$lang["config_datetimeformat"] = "Date and Time format";

application/language/tr/item_kits_lang.php

@@ -8,6 +8,7 @@ $lang["item_kits_error_adding_updating"] = "Ürün seti ekleme/güncelleme hatas
 $lang["item_kits_info"] = "Ürün Seti Bilgisi";
 $lang["item_kits_item"] = "Ürün";
 $lang["item_kits_items"] = "Ürünler";
+$lang["item_kits_kit"] = "Kit Id";
 $lang["item_kits_name"] = "Ürün Seti İsmi";
 $lang["item_kits_new"] = "Yeni Ürün Seti";
 $lang["item_kits_no_item_kits_to_display"] = "Gösterecek ürün seti yok";

application/language/tr/items_lang.php

@@ -41,6 +41,7 @@ $lang["items_item"] = "Ürün";
 $lang["items_item_number"] = "UPC/EAN/ISBN";
 $lang["items_item_number_duplicate"] = "The item number is already present in the database";
 $lang["items_location"] = "Yer";
+$lang["items_empty_upc_items"] = "Empty UPC Items";
 $lang["items_low_inventory_items"] = "";
 $lang["items_manually_editing_of_quantity"] = "Elle adet düzeltme";
 $lang["items_must_select_item_for_barcode"] = "Barkod üretmek için en az bir ürün seçmelisiniz";

application/language/tr/reports_lang.php

@@ -48,6 +48,7 @@ $lang["reports_payment_type"] = "Ödeme Türü";
 $lang["reports_payments"] = "Ödemeler";
 $lang["reports_payments_summary_report"] = "Ödeme Özet Raporu";
 $lang["reports_profit"] = "Kâr";
+$lang["reports_cost"] = "";
 $lang["reports_quantity_purchased"] = "Satın Alınan Adet";
 $lang["reports_received_by"] = "Alım Yapan";
 $lang["reports_receiving_id"] = "Alım No";
@@ -88,9 +89,20 @@ $lang["reports_tax_percent"] = "Vergi Oranı";
 $lang["reports_taxes"] = "Vergiler";
 $lang["reports_taxes_summary_report"] = "Vergi Özet Raporu";
 $lang["reports_this_month"] = "Bu Ay";
+$lang["reports_this_month_last_year"] = "This Month Last Year";
+$lang["reports_this_month_to_today"] = "This Month To Today";
+$lang["reports_this_month_to_today_last_year"] = "This Month To Today Last Year";
 $lang["reports_this_year"] = "Bu Yıl";
 $lang["reports_today"] = "Bugün";
+$lang["reports_today_last_year"] = "Today Last Year";
 $lang["reports_total"] = "Toplam";
 $lang["reports_type"] = "Tür";
 $lang["reports_welcome_message"] = "Rapor paneline hoş geldiniz. Görmek istediğiniz raporu seçiniz.";
 $lang["reports_yesterday"] = "Dün";
+$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";

application/language/tr/sales_lang.php

@@ -47,6 +47,7 @@ $lang["sales_invoice"] = "Invoice";
 $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";
@@ -67,7 +68,7 @@ $lang["sales_no_filter"] = "All";
 $lang["sales_no_items_in_cart"] = "Sepette Ürün Yok";
 $lang["sales_no_sales_to_display"] = "No sales to display";
 $lang["sales_one_or_multiple"] = "";
-$lang["sales_overview"] = "Overview";
+$lang["sales_takings"] = "Takings";
 $lang["sales_payment"] = "Ödeme Türü";
 $lang["sales_payment_amount"] = "Tutar";
 $lang["sales_payment_not_cover_total"] = "Ödemeler toplam tutarı karşılamıyor";
@@ -111,3 +112,5 @@ $lang["sales_unsuccessfully_updated"] = "Satış düzenlenemedi";
 $lang["sales_unsuspend"] = "Satışa Al";
 $lang["sales_unsuspend_and_delete"] = "";
 $lang["sales_update"] = "Edit Sale";
+$lang["sales_date_range"] = "Tarih Aralığı";
+$lang["sales_none_selected"] = "Düzenlemek için ürün seçmediniz";

application/language/tr/suppliers_lang.php

@@ -5,6 +5,7 @@ $lang["suppliers_basic_information"] = "Sağlayıcı Bilgisi";
 $lang["suppliers_cannot_be_deleted"] = "Sağlayıcı silinemedi, bazı sağlayıcıların satışı var.";
 $lang["suppliers_company_name"] = "Şirket Adı";
 $lang["suppliers_company_name_required"] = "Şirket Adı zorunlu alandır";
+$lang["suppliers_agency_name"] = " ";
 $lang["suppliers_confirm_delete"] = "Seçili sağlayıcıları düzenlemek istiyor musunuz?";
 $lang["suppliers_error_adding_updating"] = "Sağlayıcı ekleme/düzenleme hatası";
 $lang["suppliers_new"] = "Yeni Sağlayıcı";
@@ -14,4 +15,5 @@ $lang["suppliers_successful_adding"] = "Sağlayıcı eklendi";
 $lang["suppliers_successful_deleted"] = "Sağlayıcı silindi";
 $lang["suppliers_successful_updating"] = "Sağlayıcı düzenlendi";
 $lang["suppliers_supplier"] = "Sağlayıcı";
+$lang["suppliers_supplier_id"] = "Id";
 $lang["suppliers_update"] = "Sağlayıcıyı Düzenle";

application/language/zh/common_lang.php

@@ -9,6 +9,7 @@ $lang["common_confirm_search"] = "您已經選擇一行或多行，在搜索後
 $lang["common_country"] = "國家";
 $lang["common_date"] = "Date";
 $lang["common_delete"] = "刪除";
+$lang["common_print"] = "Print";
 $lang["common_det"] = "更多";
 $lang["common_edit"] = "編輯";
 $lang["common_email"] = "E-Mail";

application/language/zh/config_lang.php

@@ -24,6 +24,7 @@ $lang["config_barcode_second_row"] = "Row 4";
 $lang["config_barcode_third_row"] = "Row 5";
 $lang["config_barcode_type"] = "Barcode Type";
 $lang["config_barcode_width"] = "Width (px)";
+$lang["config_barcode_generate_if_empty"] = "Generate if empty";
 $lang["config_company"] = "公司名稱";
 $lang["config_company_logo"] = "Company Logo";
 $lang["config_company_required"] = "公司名稱為必填";
@@ -115,3 +116,6 @@ $lang["config_thousands_separator"] = "Thousands Separator";
 $lang["config_timezone"] = "時區";
 $lang["config_use_invoice_template"] = "Use invoice template";
 $lang["config_website"] = "網站";
+$lang["config_locale_configuration"] = "Localisation Configuration";
+$lang["config_locale_info"] = "Localisation Configuration Information";
+$lang["config_datetimeformat"] = "Date and Time format";