Bump to 3.3.6

Added Shortcuts/Hotkeys to Register

ESC 	Cancels Current Quote/Invoice/Sale
ALT + 1 	Item Search
ALT + 2 	Customer Search
ALT + 3 	Suspend Current Sale
ALT + 4 	Show Suspended Sales
ALT + 5 	Edit Amount Tendered
ALT + 6 	Add Payment
ALT + 7 	Add Payment and Complete Invoice/Sale
ALT + 8 	Finish Quote/Invoice witdout payment
ALT + 9 	Open Shortcuts Window

Layout / Responsiveness

F11 Full Screen mode
CTRL + Zoom in
CTRL - Zoom out
CTRL 0 Reset Zoom

CTRL P Print out current page
CTRL F Search reports tables

.github/stale.yml

@@ -0,0 +1,18 @@
+# Number of days of inactivity before an issue becomes stale
+daysUntilStale: 30
+# Number of days of inactivity before a stale issue is closed
+daysUntilClose: 7
+# Issues with these labels will never be considered stale
+exemptLabels:
+  - enhancement
+  - needsowner
+  - bug
+# Label to use when marking an issue as stale
+staleLabel: wontfix
+# Comment to post when marking an issue as stale. Set to `false` to disable
+markComment: >
+  This issue has been automatically marked as stale because it has not had
+  recent activity. It will be closed if no further activity occurs. Thank you
+  for your contributions.
+# Comment to post when closing a stale issue. Set to `false` to disable
+closeComment: false

.github/workflows/codeql-analysis.yml

@@ -0,0 +1,71 @@
+# For most projects, this workflow file will not need changing; you simply need
+# to commit it to your repository.
+#
+# You may wish to alter this file to override the set of languages analyzed,
+# or to provide custom queries or build logic.
+#
+# ******** NOTE ********
+# We have attempted to detect the languages in your repository. Please check
+# the `language` matrix defined below to confirm you have the correct set of
+# supported CodeQL languages.
+#
+name: "CodeQL"
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    # The branches below must be a subset of the branches above
+    branches: [ master ]
+  schedule:
+    - cron: '21 12 * * 3'
+
+jobs:
+  analyze:
+    name: Analyze
+    runs-on: ubuntu-latest
+    permissions:
+      actions: read
+      contents: read
+      security-events: write
+
+    strategy:
+      fail-fast: false
+      matrix:
+        language: [ 'javascript' ]
+        # CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python' ]
+        # Learn more:
+        # https://docs.github.com/en/free-pro-team@latest/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-code-scanning#changing-the-languages-that-are-analyzed
+
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@v2
+
+    # Initializes the CodeQL tools for scanning.
+    - name: Initialize CodeQL
+      uses: github/codeql-action/init@v1
+      with:
+        languages: ${{ matrix.language }}
+        # If you wish to specify custom queries, you can do so here or in a config file.
+        # By default, queries listed here will override any specified in a config file.
+        # Prefix the list here with "+" to use these queries and those in the config file.
+        # queries: ./path/to/local/query, your-org/your-repo/queries@main
+
+    # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
+    # If this step fails, then you should remove it and run the build manually (see below)
+    - name: Autobuild
+      uses: github/codeql-action/autobuild@v1
+
+    # ℹ️ Command-line programs to run using the OS shell.
+    # 📚 https://git.io/JvXDl
+
+    # ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
+    #    and modify them (or add more) to build your code if your project
+    #    uses a compiled language
+
+    #- run: |
+    #   make bootstrap
+    #   make release
+
+    - name: Perform CodeQL Analysis
+      uses: github/codeql-action/analyze@v1

.gitignore

@@ -13,6 +13,7 @@ generate_langauges.php
 dist/
 docs/
 public/bower_components
+npm_modules
 *.patch
 patches/
 translations/
@@ -32,6 +33,7 @@ vendor/
 *.log
 .env
 package-lock.json
+auth.json
 !/docker/.env
 /docker/data/database/db/*
 /docker/data/certbot/conf/*

.htaccess

@@ -1,18 +1,22 @@
 # redirect to public page
-  <IfModule mod_rewrite.c>
-    RewriteEngine On
-    RewriteCond %{REQUEST_URI} !^public$
-    RewriteCond %{REQUEST_URI} !^/.well-known/acme-challenge [NC]
-    RewriteRule "^(.*)$" "/public/" [R=301,L]
-  </IfModule>
+<IfModule mod_rewrite.c>
+  RewriteEngine On
+  RewriteCond %{REQUEST_URI} !^public$
+  RewriteCond %{REQUEST_URI} !^/.well-known/acme-challenge [NC]
+  RewriteRule "^(.*)$" "/public/" [R=301,L]
+</IfModule>
 
 # disable directory browsing
 # For security reasons, Option all cannot be overridden.
-Options +ExecCGI +Includes +IncludesNOEXEC +SymLinksIfOwnerMatch -Indexes
+Options +SymLinksIfOwnerMatch -Indexes
 
 # prevent folder listing
 IndexIgnore *
 
+<IfModule mod_headers.c>
+  Header always set X-Frame-Options "SAMEORIGIN"
+</Ifmodule>
+
 # Apache 2.4
 <IfModule authz_core_module>
   # secure htaccess file

.travis.yml

@@ -1,35 +1,55 @@
 sudo: required
-dist: trusty
-group: deprecated-2017Q4
+if: tag IS blank
+
 branches:
   except:
     - weblate
 services:
   - docker
 before_install:
-  - curl -L https://github.com/docker/compose/releases/download/1.7.1/docker-compose-`uname
-    -s`-`uname -m` > docker-compose
+  - curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo apt-key add -
+  - sudo add-apt-repository "deb [arch=amd64] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable"
+  - sudo apt-get update
+  - sudo apt-get -y -o Dpkg::Options::="--force-confnew" install docker-ce
+  - docker --version
+  - curl -L https://github.com/docker/compose/releases/download/${DOCKER_COMPOSE_VERSION}/docker-compose-`uname -s`-`uname -m` > docker-compose
   - chmod +x docker-compose
   - sudo mv docker-compose /usr/local/bin
-  - date=`date +%Y%m%d%H%M%S` && branch=${TRAVIS_BRANCH} && rev=`git rev-parse --short=6
-    HEAD` && sed -i "s/\$1/\$1.$date.$branch.$rev/g" deployment.json
+
 script:
-  - docker run --rm -v $(pwd):/app composer/composer install
-  - docker run --rm -v $(pwd):/app -w /app lucor/php7-cli php bin/install.php translations
-    develop
+  - echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin
+  - docker run --rm -v $(pwd):/app jekkos/composer composer install
+  - docker run --rm -v $(pwd):/app jekkos/composer php bin/install.php translations develop
   - sed -i "s/'\(dev\)'/'$rev'/g" application/config/config.php
-  - docker run --rm -it -v $(pwd):/app -w /app digitallyseamless/nodejs-bower-grunt
+  - docker run --rm -it -v $(pwd):/app -w /app opensourcepos/node-grunt-bower
     sh -c "npm install && bower install && grunt package"
-  - /bin/bash docker/install-local.sh
+  - docker build . --target ospos -t ospos
+  - docker-compose -f docker-compose.test.yml up --abort-on-container-exit
 env:
+  global:
+  - DOCKER_COMPOSE_VERSION=1.29.1
   - TAG=$(echo ${TRAVIS_BRANCH} | sed s/feature\\///)
-after_success: '[ -n ${DOCKER_USERNAME} ] && docker login -u="$DOCKER_USERNAME" -p="$DOCKER_PASSWORD"
-  && docker tag "opensourcepos_ospos:latest" "jekkos/opensourcepos:$TAG" && docker push "jekkos/opensourcepos:$TAG"'
+  - date=`date +%Y%m%d%H%M%S` && branch=${TRAVIS_BRANCH} && rev=`git rev-parse --short=6 HEAD` 
+after_success:
+  - docker login -u="$DOCKER_USERNAME" -p="$DOCKER_PASSWORD" && docker tag "ospos:latest"
+    "jekkos/opensourcepos:$TAG" && docker push "jekkos/opensourcepos:$TAG"
+before_deploy:
+  - version=$(grep application_version application/config/config.php | sed "s/.*=\s'\(.*\)';/\1/g")
+  - TRAVIS_TAG=$(echo $branch.$version)
+  - git tag -f "$branch.$version"
+  - sudo mv dist/opensourcepos.zip "dist/opensourcepos.$branch.$version.zip"
 deploy:
-  file: deployment.json
-  provider: bintray
+  provider: releases
+  file: "dist/opensourcepos.$branch.$version.zip"
+  name: "OpensourcePos Unstable"
+  release_notes_file: WHATS_NEW.txt
+  prerelease: true
   skip_cleanup: true
-  key: ${BINTRAY_API_KEY}
+
   user: jekkos
+  overwrite: true
+  api_key:
+    secure: Ax25mMRDfHVf/HjRwqxYJe2oMnWC4sc2aKIiUxAOviVJJSCl4GMWhcFlUNnFsDcKIg2ofEGMVD6b9cTBuOwPDvymUDFnLNCCgDWve+vRDdWaTkTipn77Qk4c9UO9VvuzlPSKopChefPHlQ0n1rEmAMiKIXuqjUlNGqybW4FLP4E=
   on:
     all_branches: true
+

Dockerfile

@@ -1,19 +1,38 @@
-FROM php:7.3-apache
-MAINTAINER jekkos
+FROM php:7.4-apache AS ospos
 
 RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y \
     libicu-dev \
     libgd-dev \
     openssl
 
-RUN a2enmod rewrite
+RUN a2enmod rewrite headers
 RUN docker-php-ext-install mysqli bcmath intl gd
 RUN echo "date.timezone = \"\${PHP_TIMEZONE}\"" > /usr/local/etc/php/conf.d/timezone.ini
-RUN echo -e “$(hostname -i)\t$(hostname) $(hostname).localhost” >> /etc/hosts
 
 WORKDIR /app
 COPY . /app
 RUN ln -s /app/*[^public] /var/www && rm -rf /var/www/html && ln -nsf /app/public /var/www/html
-RUN chmod 755 /app/public/uploads && chown -R www-data:www-data /app/public /app/application
+RUN chmod -R 750 /app/public/uploads /app/application/logs && chown -R www-data:www-data /app/public /app/application
 
-RUN [ ! -f test/ospos.js ] || sed -i -e "s/\(localhost\)/web/g" test/ospos.js
+FROM ospos AS ospos_test
+ 
+COPY --from=composer /usr/bin/composer /usr/bin/composer
+ 
+RUN apt-get install -y libzip-dev wget git
+RUN wget https://raw.githubusercontent.com/vishnubob/wait-for-it/master/wait-for-it.sh -O /bin/wait-for-it.sh && chmod +x /bin/wait-for-it.sh
+RUN docker-php-ext-install zip
+RUN composer install -d/app 
+RUN php /app/vendor/kenjis/ci-phpunit-test/install.php -a /app/application -p /app/vendor/codeigniter/framework
+RUN sed -i 's/backupGlobals="true"/backupGlobals="false"/g' /app/application/tests/phpunit.xml
+RUN sed -i '13,17d' /app/application/tests/controllers/Welcome_test.php 
+WORKDIR /app/application/tests
+ 
+CMD ["/app/vendor/phpunit/phpunit/phpunit"]
+
+FROM ospos AS ospos_dev
+
+RUN mkdir -p /app/bower_components && ln -s /app/bower_components /var/www/html/bower_components
+RUN yes | pecl install xdebug \
+    && echo "zend_extension=$(find /usr/local/lib/php/extensions/ -name xdebug.so)" > /usr/local/etc/php/conf.d/xdebug.ini \
+    && echo "xdebug.remote_enable=1" >> /usr/local/etc/php/conf.d/xdebug.ini \
+    && echo "xdebug.remote_autostart=off" >> /usr/local/etc/php/conf.d/xdebug.ini

Dockerfile.dev

@@ -1,9 +0,0 @@
-FROM jekkos/opensourcepos:master
-MAINTAINER jekkos
-
-RUN mkdir -p /app/bower_components && ln -s /app/bower_components /var/www/html/bower_components
-RUN yes | pecl install xdebug \
-    && echo "zend_extension=$(find /usr/local/lib/php/extensions/ -name xdebug.so)" > /usr/local/etc/php/conf.d/xdebug.ini \
-    && echo "xdebug.remote_enable=on" >> /usr/local/etc/php/conf.d/xdebug.ini \
-    && echo "xdebug.remote_autostart=off" >> /usr/local/etc/php/conf.d/xdebug.ini
-

Dockerfile.test

@@ -1,11 +0,0 @@
-FROM digitallyseamless/nodejs-bower-grunt:5
-MAINTAINER jekkos
-
-# apt-get install curl
-
-COPY Gruntfile.js .
-COPY package.json .
-COPY test .
-RUN npm install
-
-CMD ['while ! curl web/index.php | grep username; do sleep 1; done; grunt mochaWebdriver:test']

FUNDING.yml

@@ -0,0 +1,2 @@
+github: jekkos
+custom: ["https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=MUN6AEG7NY6H8"]

Gruntfile.js

@@ -1,6 +1,6 @@
 module.exports = function(grunt) {
 
-    grunt.initConfig({
+	grunt.initConfig({
 		pkg: grunt.file.readJSON('package.json'),
 		wiredep: {
 			task: {
@@ -11,7 +11,15 @@ module.exports = function(grunt) {
 		bower_concat: {
 			all: {
 				mainFiles: {
-					'bootstrap-table': [ "src/bootstrap-table.js", "src/bootstrap-table.css", "dist/extensions/export/bootstrap-table-export.js", "dist/extensions/mobile/bootstrap-table-mobile.js", "dist/extensions/sticky-header/bootstrap-table-sticky-header.js", "dist/extensions/sticky-header/bootstrap-table-sticky-header.css"]
+					'bootstrap-table': [ 
+						"dist/bootstrap-table.min.js", 
+						"dist/bootstrap-table.css", 
+						"dist/extensions/export/bootstrap-table-export.min.js", 
+						"dist/extensions/mobile/bootstrap-table-mobile.min.js", 
+						"dist/extensions/sticky-header/bootstrap-table-sticky-header.min.js", 
+						"dist/extensions/sticky-header/bootstrap-table-sticky-header.css"
+					],
+					'chartist-plugin-axistitle': [ "./dist/chartist-plugin-axistitle.min.js"]
 				},
 				dest: {
 					'js': 'tmp/opensourcepos_bower.js',
@@ -50,10 +58,55 @@ module.exports = function(grunt) {
 				}
 			}
 		},
+		copy: {
+			themes: {
+				files: [
+					{
+						expand: true,
+						cwd: 'node_modules/bootstrap-5/dist/css',
+						src: ['bootstrap.css', 'bootstrap.min.css'],
+						dest: 'public/dist/bootswatch-5/bootstrap/',
+						filter: 'isFile'
+					},
+					{
+						expand: true,
+						cwd: 'node_modules/bootswatch-5/dist',
+						src: ['**/bootstrap.css', '**/bootstrap.min.css'],
+						dest: 'public/dist/bootswatch-5/',
+						filter: 'isFile'
+					}
+				],
+			},
+			licenses: {
+				files: [{
+					expand: true,
+					src: 'LICENSE',
+					dest: 'public/license/',
+					filter: 'isFile',},
+					{
+						expand: true,
+						cwd: 'node_modules/bootstrap-5',
+						src: 'LICENSE',
+						dest: 'public/license/',
+						rename: function(dest, src) { return dest + src.replace('LICENSE', 'bootstrap-5.license'); },
+						filter: 'isFile'
+					},
+					{
+						expand: true,
+						cwd: 'node_modules/bootswatch-5',
+						src: 'LICENSE',
+						dest: 'public/license/',
+						rename: function(dest, src) { return dest + src.replace('LICENSE', 'bootswatch-5.license'); },
+						filter: 'isFile'
+					},
+				],
+			},
+		},
 		cssmin: {
 			target: {
 				files: {
-					'public/dist/<%= pkg.name %>.min.css': ['tmp/opensourcepos_bower.css', 'public/css/*.css', '!public/css/login.css', '!public/css/invoice_email.css', '!public/css/barcode_font.css']
+					'public/dist/<%= pkg.name %>.min.css': ['tmp/opensourcepos_bower.css', 'public/css/*.css', '!public/css/login.css', '!public/css/login.min.css', '!public/css/invoice_email.css', '!public/css/barcode_font.css', '!public/css/darkly.css'],
+					'public/css/login.min.css': ['public/css/login.css']
 				}
 			}
 		},
@@ -63,7 +116,7 @@ module.exports = function(grunt) {
 					separator: ';'
 				},
 				files: {
-					'tmp/<%= pkg.name %>.js': ['tmp/opensourcepos_bower.js', 'public/js/jquery*', 'public/js/*.js']
+					'tmp/<%= pkg.name %>.js': ['public/dist/jquery/jquery.js', 'tmp/opensourcepos_bower.js', 'public/js/*.js']
 				}
 			},
 			sql: {
@@ -106,7 +159,7 @@ module.exports = function(grunt) {
 					closeTag: '<!-- end css template tags -->',
 					ignorePath: '../../../public/'
 				},
-				src: ['public/css/*.css', '!public/css/login.css', '!public/css/invoice_email.css', '!public/css/barcode_font.css'],
+				src: ['public/css/*.css', '!public/css/login.css', '!public/css/login.min.css', '!public/css/invoice_email.css', '!public/css/barcode_font.css', '!public/css/darkly.css'],
 				dest: 'application/views/partial/header.php',
 			},
 			mincss_header: {
@@ -125,9 +178,9 @@ module.exports = function(grunt) {
 					scriptTemplate: '<rel type="text/css" src="{{ path }}"></rel>',
 					openTag: '<!-- start css template tags -->',
 					closeTag: '<!-- end css template tags -->',
-                    ignorePath: '../../public/'
+					ignorePath: '../../public/'
 				},
-				src: ['public/css/login.css'],
+				src: 'public/css/login.min.css',
 				dest: 'application/views/login.php'
 			},
 			js: {
@@ -137,7 +190,7 @@ module.exports = function(grunt) {
 					closeTag: '<!-- end js template tags -->',
 					ignorePath: '../../../public/'
 				},
-				src: ['public/js/jquery*', 'public/js/*.js'],
+				src: ['public/dist/bootstrap/js/*.min.js', 'public/js/jquery*', 'public/js/*.js'],
 				dest: 'application/views/partial/header.php'
 			},
 			minjs: {
@@ -145,24 +198,12 @@ module.exports = function(grunt) {
 					scriptTemplate: '<script type="text/javascript" src="{{ path }}"></script>',
 					openTag: '<!-- start minjs template tags -->',
 					closeTag: '<!-- end minjs template tags -->',
-                    ignorePath: '../../../public/'
+					ignorePath: '../../../public/'
 				},
 				src: ['public/dist/*min.js'],
 				dest: 'application/views/partial/header.php'
 			}
 		},
-		mochaWebdriver: {
-			options: {
-				timeout: 1000 * 60 * 3
-			},
-			test : {
-				options: {
-					usePhantom: true,
-					usePromises: true
-				},
-				src: ['test/**/*.js']
-			}
-		},
 		watch: {
 			files: ['<%= jshint.files %>'],
 			tasks: ['jshint']
@@ -214,15 +255,6 @@ module.exports = function(grunt) {
 				}
 			}
 		},
-		apigen: {
-			generate:{
-				options: {
-					apigenPath: 'vendor/bin/',
-					source: 'application',
-					destination: 'docs'
-				}
-			}
-		},
 		compress: {
 			main: {
 				options: {
@@ -230,23 +262,41 @@ module.exports = function(grunt) {
 					archive: 'dist/opensourcepos.zip'
 				},
 				files: [
-					{src: ['public/**', 'vendor/**', 'application/**', '!/public/images/menubar/png/', '!/public/dist/bootswatch/', '/public/dist/bootswatch/*/*.css', 'database/**', '*.txt', '*.md', 'LICENSE', 'docker*', 'Dockerfile', '**/.htaccess', '*.csv']}
+					{
+						src: [
+							'public/**',
+							'vendor/**',
+							'application/**',
+							'!/application/tests',
+							'!/public/images/menubar/png/',
+							'!/public/dist/bootswatch/',
+							'/public/dist/bootswatch/*/*.css',
+							'!/public/dist/bootswatch-5/',
+							'/public/dist/bootswatch-5/*/*.css',
+							'database/**',
+							'*.txt',
+							'*.md',
+							'LICENSE',
+							'docker*',
+							'docker/**',
+							'Dockerfile',
+							'**/.htaccess',
+							'*.csv'
+						]
+					}
 				]
 			}
 		}
 	});
 
-    require('load-grunt-tasks')(grunt);
-    grunt.loadNpmTasks('grunt-mocha-webdriver');
+	require('load-grunt-tasks')(grunt);
 	grunt.loadNpmTasks('grunt-composer');
-	grunt.loadNpmTasks('grunt-apigen');
-    grunt.loadNpmTasks('grunt-contrib-compress');
-    
-    grunt.registerTask('default', ['wiredep', 'bower_concat', 'bowercopy', 'concat', 'uglify', 'cssmin', 'tags', 'cachebreaker']);
-    grunt.registerTask('update', ['composer:update', 'bower:update']);
-    grunt.registerTask('genlicense', ['clean:license', 'license', 'bower-licensechecker']);
-    grunt.registerTask('package', ['default', 'compress']);
-    grunt.registerTask('packages', ['composer:update']);
-    grunt.registerTask('gendocs', ['apigen:generate']);
+	grunt.loadNpmTasks('grunt-contrib-compress');
+
+	grunt.registerTask('default', ['wiredep', 'bower_concat', 'bowercopy', 'copy', 'concat', 'uglify', 'cssmin', 'tags', 'cachebreaker']);
+	grunt.registerTask('update', ['composer:update', 'bower:update']);
+	grunt.registerTask('genlicense', ['clean:license', 'license', 'bower-licensechecker']);
+	grunt.registerTask('package', ['default', 'compress']);
+	grunt.registerTask('packages', ['composer:update']);
 
 };

INSTALL.md

@@ -1,13 +1,13 @@
 Server Requirements
 -------------------
 
-* PHP version 5.6 to 7.3 are supported. Please note that PHP needs to have `php-gd`, `php-bcmath`, `php-intl`, `php-openssl`, `php-mbstring` and `php-curl` installed and enabled.
+* PHP version 7.2 to 7.4 are supported, PHP version 5.6 and 8.0 are NOT supported. Please note that PHP needs to have `php-gd`, `php-bcmath`, `php-intl`, `php-openssl`, `php-mbstring` and `php-curl` installed and enabled.
 
-* MySQL 5.5, 5.6 and 5.7 are supported, also MariaDB replacement is supported and apparently offering better performance.
+* MySQL 5.5, 5.6 and 5.7 are supported, also MariaDB replacement 10.x is supported and apparently offering better performance.
 
-* Apache 2.2 and 2.4 are supported. Also Nginx has been proven to work fine, see [wiki page here](https://github.com/opensourcepos/opensourcepos/wiki/Local-Deployment-using-LEMP)
+* Apache 2.2 and 2.4 are supported. Also Nginx has been proven to work fine, see [wiki page here](https://github.com/opensourcepos/opensourcepos/wiki/Local-Deployment-using-LEMP).
 
-* Raspberry PI based installations proved to work, see [wiki page here](https://github.com/opensourcepos/opensourcepos/wiki/Installing-on-Raspberry-PI---Orange-PI-(Headless-OSPOS))
+* Raspberry PI based installations proved to work, see [wiki page here](https://github.com/opensourcepos/opensourcepos/wiki/Installing-on-Raspberry-PI---Orange-PI-(Headless-OSPOS)).
 
 * For Windows based installations please read [the wiki](https://github.com/opensourcepos/opensourcepos/wiki) and also existing closed issues as this topic has been covered well in all the variants and issues.
 
@@ -17,7 +17,7 @@ Local install
 
 First of all, if you're seeing the message **'system folder missing'** after launching your browser, then that means you have cloned the repository and have not built the project properly.
 
-1. Dowload the latest [stable release](https://github.com/opensourcepos/opensourcepos/releases) from github or [unstable build](https://bintray.com/jekkos/opensourcepos/opensourcepos/view/files?sort=updated&order=asc#files) from bintray. A regular repository clone will not work unless you are brave enough to build the whole project!
+1. Dowload the latest stable or prerelease for a specific branch [from github](https://github.com/opensourcepos/opensourcepos/releases). A regular repository clone will not work unless you are brave enough to build the whole project!
 2. Create/locate a new mysql database to install open source point of sale into
 3. Execute the file database/database.sql to create the tables needed
 4. unzip and upload Open Source Point of Sale files to web server
@@ -38,31 +38,16 @@ From now onwards OSPOS can be deployed using Docker on Linux and Mac, locally or
 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. Please refer to the docker documentation for instructions on how to set it up on your platform.
 
-Since OSPOS version 3.3.0 the docker installation offers a reverse proxy based on nginx with a (if local) Self signed certificate termination (aka HTTPS connection).
-Behind the reverse proxy you can access OSPOS using https (port 443) and myPhpAdmin using port 8000.
-Port 80 (standard http) is not available for OSPOS, it's only available for a cert manager service in case of server installation.
+***Be aware that this setup is not suited for production usage. Change the default passwords in the compose file before exposing the containers publicly.***
 
-* To build and run the image, download the latest build from bintray.
-* Install envsubst from https://github.com/a8m/envsubst on your machine
-* Issue the following commands in a terminal with docker installed:
+Start the containers using following command
 
 ```
-    docker/install-local.sh
-```
-
-* When required to renew a certificate say (y)es.
-* When the script has terminated to run, wait about a minute before connecting to https://127.0.0.1.
-* The web browser will warn you of a self certificate exception, accept and continue
-* If you do https://127.0.0.1:8000 (port 8000) instead, you would be able to access a phpMyAdmin service connected to OSPOS MariaDB
-
-* To stop the docker issue the following command:
-
-```
-    docker/uninstall.sh
+    docker-compose up
 ```
 
 
-Host install using Docker
+Nginx install using Docker
 -------------------------
 
 Since OSPOS version 3.3.0 the docker installation offers a reverse proxy based on nginx with a Letsencrypt TLS certificate termination (aka HTTPS connection).
@@ -76,13 +61,7 @@ The variable STAGING needs to be set to 0 when you are confident your configurat
 Follow local install steps, but instead of 
 
 ```
-    docker/install-local.sh
-```
-
-use
-
-```
-    docker/install-server.sh
+    docker/install-nginx.sh
 ```
 
 Do not use 
@@ -98,31 +77,5 @@ Cloud install
 -------------
 
 If you choose *DigitalOcean*:
-[Through this link](https://m.do.co/c/ac38c262507b), you will get a *$50 credit* for a first month. [Check the wiki](https://github.com/opensourcepos/opensourcepos/wiki/DOCS-USERS-Getting-Started-installations#cloud-deploy-installation) for further instructions on how to install the necessary components.
+[Through this link](https://m.do.co/c/ac38c262507b), you will get a *$100 credit* for a first month. [Check the wiki](https://github.com/opensourcepos/opensourcepos/wiki/Getting-Started-installations) for further instructions on how to install the necessary components.
 
-
-cPanel & SSH Install
---------------------
-
-If you own on a **VPS**, **Dedicated Server**, or **Shared Hosting** running on **cPanel** with **SSH** access:
-
-You can run our Stand-alone [WS-OSPOS-Installer](https://github.com/WebShells/WS-OSPOS-Installer.git), it will handle:
-
-. Database.php config files generation.<br>
-. Creation of db User & Password depending on user's input of Dbname, Username, Password, & Hostname ( No need for phpmyadmin )<br>
-. Imports default Db SQL files in order to run the project.<br>
-
-Usage in **(SSH)**:
-
-git clone https://github.com/WebShells/WS-OSPOS-Installer.git<br>
-chmod +x WS-OSPOS-Installer/Get-POS<br>
-./WS-OSPOS-Installer/Get-POS<br>
-
-or
-
-wget https://github.com/WebShells/WS-OSPOS-Installer/archive/master.zip<br>
-unzip -qq master.zip<br>
-chmod +x WS-OSPOS-Installer-master/Get-POS<br>
-./WS-OSPOS-Installer-master/Get-POS<br>
-
-Answer **DB required questions** and you are ready to run the project on http://localhost/OSPOS/public (localhost to be replaced by the hostname provided during setup).

LICENSE

@@ -1,49 +1,69 @@
 The MIT License (MIT)
 
-Copyright (c) 2012-2014 pappastech
-Copyright (c) 2012 Alain
-Copyright (c) 2013 Rob Garrison
-Copyright (c) 2013 Parq
-Copyright (c) 2013 Ramel
-Copyright (c) 2013-2019 jekkos
-Copyright (c) 2015-2019 FrancescoUK (aka daN4cat)
-Copyright (c) 2015 Aamir Shahzad (aka asakpke), RoshanTech.com
-Copyright (c) 2015 Toni Haryanto (aka yllumi)
-Copyright (c) 2016-2017 Ramkrishna Mondal (aka RamkrishnaMondal)
-Copyright (c) 2016 Rinaldy@dbarber (aka rnld26)
-Copyright (c) 2016-2017 Jorge Colmenarez (aka jlctmaster), frontuari.com
-Copyright (c) 2017-2019 Steve Ireland
-Copyright (c) 2017-2019 objecttothis
-Copyright (c) 2017-2019 odiea
-Copyright (c) 2017-2019 WebShells / Shady Sh
+Copyright (c) 2013-2021 jekkos
+Copyright (c) 2015-2021 FrancescoUK (aka daN4cat)
+Copyright (c) 2017-2021 Steve Ireland
+Copyright (c) 2017-2021 objecttothis
+Copyright (c) 2017-2021 odiea
+Copyright (c) 2017-2021 WebShells
+Copyright (c) 2020-2021 Andriux1990
+Copyright (c) 2019 Loyd Jayme (aka loydjayme25)
+Copyright (c) 2018 Erasto Marroquin (aka Erastus)
+Copyright (c) 2018 Nathan Sas (aka nathanzky)
+Copyright (c) 2018 Emilio Silva (aka emi-silva)
 Copyright (c) 2017 Jesus Guerrero Botella (aka i92guboj)
 Copyright (c) 2017 Deep Shah (aka deepshah)
 Copyright (c) 2017 Joshua Fernandez (aka joshua1234511)
 Copyright (c) 2017 asadjaved63
-Copyright (c) 2018 Erasto Marroquin (aka Erastus)
-Copyright (c) 2018 Nathan Sas (aka nathanzky)
-Copyright (c) 2018 Emilio Silva (aka emi-silva)
-Copyright (c) 2019 Loyd Jayme (aka loydjayme25)
+Copyright (c) 2016-2017 Ramkrishna Mondal (aka RamkrishnaMondal)
+Copyright (c) 2016-2017 Jorge Colmenarez (aka jlctmaster), frontuari.com
+Copyright (c) 2016 Rinaldy@dbarber (aka rnld26)
+Copyright (c) 2015 Aamir Shahzad (aka asakpke), RoshanTech.com
+Copyright (c) 2015 Toni Haryanto (aka yllumi)
+Copyright (c) 2013 Rob Garrison
+Copyright (c) 2013 Parq
+Copyright (c) 2013 Ramel
+Copyright (c) 2012-2014 pappastech
+Copyright (c) 2012 Alain
 
-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
-the Software without restriction, including without limitation the rights to
-use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
-the Software, and to permit persons to whom the Software is furnished to do so,
-subject to the following conditions:
+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 the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
 
 The above copyright notice and this permission notice shall be included in all
 copies or substantial portions of the Software.
 
 You cannot claim copyright or ownership of the Software.
 
-Footer signatures "You are using Open Source Point Of Sale" and/or "Open Source Point Of Sale"
+Versions ≥ 3.3.2:
+
+Footer signatures "© 2010 - 2021 · opensourcepos.org · 3.3.3 - 6909c8"
+In the format of: "© 2010 - Current Year · opensourcepos.org · Version - Commit"
+
+and/or 
+
+"· opensourcepos.org ·"
+with version, hash and URL link to the official website of the project MUST BE RETAINED, 
+MUST BE VISIBLE IN EVERY PAGE and CANNOT BE MODIFIED.
+
+Versions < 3.3.2:
+
+Footer signatures "You are using Open Source Point Of Sale" 
+
+and/or 
+
+"Open Source Point Of Sale"
+
 with version, hash and URL link to the original distribution of the code MUST BE RETAINED, 
 MUST BE VISIBLE IN EVERY PAGE and CANNOT BE MODIFIED.
 
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-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.
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR 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.

README.md

@@ -1,9 +1,7 @@
-[![Download](https://api.bintray.com/packages/jekkos/opensourcepos/opensourcepos/images/download.svg?version=3.3.0) ](https://bintray.com/jekkos/opensourcepos/opensourcepos/3.3.0/link)
-[![Build Status](https://travis-ci.org/opensourcepos/opensourcepos.svg?branch=master)](https://travis-ci.org/opensourcepos/opensourcepos)
+[![Build Status](https://travis-ci.com/opensourcepos/opensourcepos.svg?branch=master)](https://travis-ci.org/opensourcepos/opensourcepos)
 [![Join the chat at https://gitter.im/opensourcepos](https://badges.gitter.im/jekkos/opensourcepos.svg)](https://gitter.im/opensourcepos?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
-[![devDependency Status](https://david-dm.org/jekkos/opensourcepos/dev-status.svg)](https://david-dm.org/jekkos/opensourcepos#info=dev)
 [![GitHub version](https://badge.fury.io/gh/jekkos%2Fopensourcepos.svg)](https://badge.fury.io/gh/jekkos%2Fopensourcepos)
-[![Translation status](http://weblate.jpeelaer.net/widgets/ospos/-/svg-badge.svg)](http://weblate.jpeelaer.net/engage/ospos/?utm_source=widget)
+[![Translation status](http://translate.opensourcepos.org/widgets/opensourcepos/-/svg-badge.svg)](http://translate.opensourcepos.org/engage/opensourcepos/?utm_source=widget)
 
 
 Introduction
@@ -36,13 +34,11 @@ The main features are:
 The software is written in PHP language, it uses MySQL (or MariaDB) as data storage back-end and has a simple but intuitive user interface.
 
 The latest 3.x version is a complete overhaul of the original software.
-It is now based on Bootstrap 3 using Bootswatch themes, and still uses CodeIgniter 3 as framework.
+It is now based on Bootstrap 3 using Bootswatch themes, and uses CodeIgniter version 3 as framework.
 It also has improved functionality and security.
 
-Deployed to a Cloud it's a SaaS (Software as a Service) solution.
-
-DEMO
-----
+DEMO / DEV
+----------
 
 A demo version of the latest master version can be found on our [Demo server](https://demo.opensourcepos.org). This is a containerized install which will be reinitialized when new functionality is added to the code repository.
 
@@ -50,16 +46,20 @@ LOGIN using
 * username: admin
 * password: pointofsale
 
+Beside this we also have a [Dev server](https://dev.opensourcepos.org) that runs the build that was triggered with the last repository's commit.
+
+In case of any issues, check our status page at [status.opensourcepos.org](https://status.opensourcepos.org) to confirm whether there is a sever outage.
 
 Installation
 ------------
 
-Please **refrain from creating issues** about installation issues **before reading the FAQ and going through existing github issues**. We have a build pipeline that checks the sanity of our latest repository commit and in case the application itself is broken then our build will be as well.
+Please **refrain from creating issues** about installation problems **before having read the FAQ and went through existing github issues**. We have a build pipeline that checks the sanity of our latest repository commit and in case the application itself is broken then our build will be as well.
 
 This application **can be setup in many different ways** and we only **support the ones described in the INSTALL file linked below**.
 
 Read the [INSTALL.md](https://github.com/opensourcepos/opensourcepos/blob/master/INSTALL.md) in our repository.
 
+[Check our wiki](https://github.com/opensourcepos/opensourcepos/wiki/Supported-hardware-datasheet) for info and recommendations on supported receipt printers and barcode scanners.
 
 License
 -------
@@ -96,6 +96,7 @@ If you like the project, and you are making money out of it in some form, then c
 
 [![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)
 
+If you choose to deploy OSPOS in the cloud, you can contribute to the project by using our referral link. [You will get an initial $100 credits](https://m.do.co/c/ac38c262507b) for running OSPOS on a cloud instance with DigitalOcean. 
 
 Language Translations
 ---------------------
@@ -122,10 +123,10 @@ Please **Copy** the info under **System Info tab in configuration section** in o
 Bug reports must follow the below schema:
 
 1. Ospos **version string with git commit hash** (see ospos footer)
-2. OS name and version running your Web Server (e.g. CentOS 6.9, Ubuntu 16.4, Windows 10)
-3. Web Server name and version (e.g. Apache 2.2, Apache 2.4, Nginx 1.12, Nginx 1.13)
-4. Database name and version (e.g. MySQL 5.5, MySQL 5.6, MySQL 5.7, MariaDB 10.0, MariaDB 10.1, MariaDB 10.2)
-5. PHP version (e.g. 5.6, 7.0, 7.1, 7.2, 7.3)
+2. OS name and version running your Web Server (e.g. CentOS 6.9, Ubuntu 20, Windows 10)
+3. Web Server name and version (e.g. Apache 2.4, Nginx 1.12, Nginx 1.13)
+4. Database name and version (e.g. MySQL 5.6, MySQL 5.7, MariaDB 10.2, MariaDB 10.3)
+5. PHP version (e.g. 7.2, 7.3, 7.4)
 6. Language selected in OSPOS (e.g. English, Spanish)
 7. Any configuration of OSPOS that you changed
 8. Exact steps to reproduce the issue (test case)
@@ -138,7 +139,7 @@ If missing information is not provided within a week we will close your issue.
 FAQ
 ---
 
-* If you are seeing the message **system folder missing**, then you have cloned the source using git and you need to run a build *first*. Check [INSTALL.md](https://github.com/opensourcepos/opensourcepos/blob/master/INSTALL.md) for instructions or download latest zip file from [bintray](https://bintray.com/jekkos/opensourcepos/opensourcepos/view/files?sort=updated&order=desc#files) instead.
+* If you are seeing the message **system folder missing**, then you have cloned the source using git and you need to run a build *first*. Check [INSTALL.md](https://github.com/opensourcepos/opensourcepos/blob/master/INSTALL.md) for instructions or download latest zip file from [PLACEHOLDER](https://NEWURL) instead.
 
 * If at login time you read "The installation is not correct, check your php.ini file.", please check the error_log in public folder to understand what's wrong and make sure you read the [INSTALL.md](https://github.com/opensourcepos/opensourcepos/blob/master/INSTALL.md). To know how to enable error_log, please read the comment in [issue 1770](https://github.com/opensourcepos/opensourcepos/issues/1770#issuecomment-355177943).
 
@@ -146,12 +147,16 @@ FAQ
 
 * Apache server configurations are SysAdmin issues and not strictly related to OSPOS. Please make sure you first can show a "hello world" html page before pointing to OSPOS public directory. Make sure .htaccess is correctly configured.
 
-* If the avatar pictures are not shown in Items or at Item save time you get an error, please make sure your public and subdirs are assigned to the correct owner and the access permission is set to 755.
+* If the avatar pictures are not shown in Items or at Item save time you get an error, please make sure your public and subdirs are assigned to the correct owner and the access permission is set to 750.
 
 * If you install ospos in docker behind a proxy that performs ssloffloading, you can enable the url generated to be https instead of http, by activating the environment variable FORCE_HTTPS = 1.
 
 * If you have suhosin installed and face an issue with CSRF, please make sure you read [issue #1492](https://github.com/opensourcepos/opensourcepos/issues/1492).
 
+* PHP 8.0 is not currently supported, see [issue #3051](https://github.com/opensourcepos/opensourcepos/issues/3051).
+
+* PHP 5.5 and 5.6 are no longer supported due to the fact that they have been deprecated and not safe to use from security point of view.
+
 Credits
 -------
 |JetBrains|Travis CI|

SECURITY.md

@@ -0,0 +1,28 @@
+<!-- START doctoc generated TOC please keep comment here to allow auto update -->
+<!-- DON'T EDIT THIS SECTION, INSTEAD RE-RUN doctoc TO UPDATE -->
+
+
+- [Security Policy](#security-policy)
+  - [Supported Versions](#supported-versions)
+  - [Reporting a Vulnerability](#reporting-a-vulnerability)
+
+<!-- END doctoc generated TOC please keep comment here to allow auto update -->
+
+# Security Policy
+
+## Supported Versions
+
+We release patches for security vulnerabilities. Which versions are eligible
+receiving such patches depend on the CVSS v3.0 Rating:
+
+| CVSS v3.0 | Supported Versions                                 |
+| --------- | -------------------------------------------------- |
+| 7.3       | 3.3.5                                              |
+| 9.8       | 3.3.6                                              |
+
+## Reporting a Vulnerability
+
+Please report (suspected) security vulnerabilities to
+**[jekkos](mailto:jekkos@opensourcepos.org)**. You will receive a response from
+us within 48 hours. If the issue is confirmed, we will release a patch as soon
+as possible depending on complexity but historically within a few days.

WHATS_NEW.txt

@@ -1,3 +1,53 @@
+Version 3.3.5
+-------------
++ Translation updates (Romanian, Ukranian, Vietnamese, Thai, Polish, Swedish, Portugese, Arabic, French, Chinese, Dutch, Tamil, Turkish, Spanish)
++ New login page restyle
++ Partial BS5 upgrade
++ Username verification fix on employee insert/update
++ Minor report fixes
++ Attribute encoding fix
++ Grunt/CI updates
++ Database and performance optimizations
++ CSV item import improvements
++ Fix decimal render
++ Translation fallback in other languages than english
++ Fixes for docker to make it run on Windows
+
+Version 3.3.4
+-------------
++ Translation updates (Hungarian, Indonesian, Bosnian, Ukranian, Vietnamese, Spanish)
++ Prevent data wipeout when calling GET directly on save endpoint
++ Cleanup .htaccess
++ Docker compose usability improvements
++ Cookie secure flag fix for Chrome (you can enable csrf protection again now)
++ Use longblob for session storage. This should fix issues preventing a user from adding a large number of items to register
++ Cashrounding bugfixes
++ Fix daily overview cash sale totals
++ Show sale count in transaction report
++ Button disable to prevent double submission
++ Add barcode field to item kits
++ Fix discount register parsing in some specific locales
+
+Version 3.3.3
+-------------
++ PHP 7.4 support
++ Set PHP 7.2 to be the minimum level due to older version deprecations
++ Added email CC and BCC (see config/email.php)
++ Cash rounding to nearest 5 cents
++ Updated composer packages and js plugins
++ Improved security (CSRF protection)
++ Various small improvements and bug fixes
+
+Version 3.3.2
+-------------
++ Fixed `only_full_group_by` issue with MySQL/MariaDB
++ Fixed POS transaction return failure if items are deleted
++ Various bug fixes
+
+Version 3.3.1
+-------------
++ Various bug fixes (please disable `only_full_group_by` option from MySQL/MariaDB to avoid issues)
+
 Version 3.3.0
 -------------
 + New logo

application/config/.env.example

@@ -1,7 +1,8 @@
 CI_ENV="development"
+#CI_ENV="production"
 
 #Database Settings
 MYSQL_HOST_NAME="localhost"
-MYSQL_USERNAME=""
-MYSQL_PASSWORD=""
-MYSQL_DB_NAME=""
+MYSQL_USERNAME="admin"
+MYSQL_PASSWORD="pointofsale"
+MYSQL_DB_NAME="ospos"

application/config/config.php

@@ -8,7 +8,7 @@
 | 
 | 
 */ 
-$config['application_version'] = '3.3.0';
+$config['application_version'] = '3.3.6';
 
 /* 
 |-------------------------------------------------------------------------- 
@@ -65,8 +65,9 @@ $config['db_log_enabled'] = FALSE;
 | a PHP script and you can easily do that on your own.
 |
 */
-$config['base_url'] = ((isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] == 'on') || (isset($_ENV['FORCE_HTTPS']) && $_ENV['FORCE_HTTPS'] == 'true')) ? 'https' : 'http';
-$config['base_url'] .= '://' . $_SERVER['HTTP_HOST'];
+$config['https_on'] = (isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] == 'on') || (isset($_ENV['FORCE_HTTPS']) && $_ENV['FORCE_HTTPS'] == 'true');
+$config['base_url'] = $config['https_on'] ? 'https' : 'http';
+$config['base_url'] .= '://' . ((isset($_SERVER['HTTP_HOST'])) ? $_SERVER['HTTP_HOST'] : 'localhost') ;
 $config['base_url'] .= str_replace(basename($_SERVER['SCRIPT_NAME']), '', $_SERVER['SCRIPT_NAME']);
 
 /*
@@ -437,8 +438,8 @@ $config['sess_regenerate_destroy'] = FALSE;
 $config['cookie_prefix'] = '';
 $config['cookie_domain'] = '';
 $config['cookie_path'] = '/';
-$config['cookie_secure'] = FALSE;
-$config['cookie_httponly'] = FALSE;
+$config['cookie_secure'] = $config['https_on'];
+$config['cookie_httponly'] = TRUE;
 
 /*
 |--------------------------------------------------------------------------

application/config/constants.php

@@ -83,3 +83,75 @@ defined('EXIT_USER_INPUT')     OR define('EXIT_USER_INPUT', 7); // invalid user
 defined('EXIT_DATABASE')       OR define('EXIT_DATABASE', 8); // database error
 defined('EXIT__AUTO_MIN')      OR define('EXIT__AUTO_MIN', 9); // lowest automatically-assigned error code
 defined('EXIT__AUTO_MAX')      OR define('EXIT__AUTO_MAX', 125); // highest automatically-assigned error code
+
+/*
+ | Attribute Related Constants.
+ */
+define('GROUP', 'GROUP');
+define('DROPDOWN', 'DROPDOWN');
+define('DECIMAL', 'DECIMAL');
+define('DATE', 'DATE');
+define('TEXT', 'TEXT');
+define('CHECKBOX', 'CHECKBOX');
+define('NO_DEFINITION_ID', 0);
+define('CATEGORY_DEFINITION_ID', -1);
+
+
+const DEFINITION_TYPES = [GROUP, DROPDOWN, DECIMAL, TEXT, DATE, CHECKBOX];
+
+
+/*
+ | Item Related Constants.
+ */
+define('HAS_STOCK', 0);
+define('HAS_NO_STOCK', 1);
+
+define('ITEM', 0);
+define('ITEM_KIT', 1);
+define('ITEM_AMOUNT_ENTRY', 2);
+define('ITEM_TEMP', 3);
+define('NEW_ITEM', -1);
+
+define('PRINT_ALL', 0);
+define('PRINT_PRICED', 1);
+define('PRINT_KIT', 2);
+
+define('PRINT_YES', 0);
+define('PRINT_NO', 1);
+
+define('PRICE_ALL', 0);
+define('PRICE_KIT', 1);
+define('PRICE_KIT_ITEMS', 2);
+
+define('PRICE_OPTION_ALL', 0);
+define('PRICE_OPTION_KIT', 1);
+define('PRICE_OPTION_KIT_STOCK', 2);
+
+define('NAME_SEPARATOR', ' | ');
+
+/*
+ | Sale Related Constants.
+ */
+define('COMPLETED', 0);
+define('SUSPENDED', 1);
+define('CANCELED', 2);
+
+
+define('SALE_TYPE_POS', 0);
+define('SALE_TYPE_INVOICE', 1);
+define('SALE_TYPE_WORK_ORDER', 2);
+define('SALE_TYPE_QUOTE', 3);
+define('SALE_TYPE_RETURN', 4);
+
+define('PERCENT', 0);
+define('FIXED', 1);
+
+define('PRICE_MODE_STANDARD', 0);
+define('PRICE_MODE_KIT', 1);
+
+define('PAYMENT_TYPE_UNASSIGNED', '--');
+
+define('CASH_ADJUSTMENT_TRUE', 1);
+define('CASH_ADJUSTMENT_FALSE', 0);
+define('CASH_MODE_TRUE', 1);
+define('CASH_MODE_FALSE', 0);

application/config/email.php

@@ -0,0 +1,10 @@
+<?php  if (!defined('BASEPATH')) exit('No direct script access allowed');                                                                                                                                            
+$config['default_email_address'] = "";
+$config['default_cc_address'] = '';
+$config['default_sender_name'] = "";
+$config['default_sender_address'] = "";
+$config['default_bounce_address'] = "";
+$config['charset'] = 'utf-8';
+$config['mailtype'] = 'html';
+$config['wordwrap'] = FALSE;
+

application/config/hooks.php

@@ -26,8 +26,16 @@ $hook['post_controller'] = array(
                                     'filepath' => 'hooks'
                                 );
 
+$hook['pre_controller'][] = array(
+    'class'    => '',
+    'function' => 'validate_method',
+    'filename' => 'method_hook.php',
+    'filepath' => 'hooks'
+);
+
+
 $hook['pre_system'] = function() {
-    $config_path = APPPATH . 'config/';
+    $config_path = APPPATH . (ENVIRONMENT == 'testing') ? 'tests/' : 'config/';
 	try {
 		$dotenv = new Dotenv\Dotenv($config_path);
 		$dotenv->overload();

application/config/migration.php

@@ -69,7 +69,7 @@ $config['migration_auto_latest'] = FALSE;
 | be upgraded / downgraded to.
 |
 */
-$config['migration_version'] = 20171126100000;
+$config['migration_version'] = 20180225100000;
 
 /*
 |--------------------------------------------------------------------------

application/config/routes.php

@@ -73,15 +73,15 @@ $route['reports/(inventory_:any)/([^/]+)'] = 'reports/$1/$2';
 $route['reports/inventory_summary'] = 'reports/inventory_summary_input';
 $route['reports/(inventory_summary)/([^/]+)/([^/]+)/([^/]+)'] = 'reports/$1/$2';
 
-$route['reports/(detailed_sales)/([^/]+)/([^/]+)/([^/]+)'] = 'reports/$1/$2/$3$/$4';
+$route['reports/(detailed_:any)/([^/]+)/([^/]+)/([^/]+)'] = 'reports/$1/$2/$3/$4';
 $route['reports/detailed_sales'] = 'reports/date_input_sales';
-$route['reports/(detailed_receivings)/([^/]+)/([^/]+)/([^/]+)'] = 'reports/$1/$2/$3/$4';
 $route['reports/detailed_receivings'] = 'reports/date_input_recv';
 
 $route['reports/(specific_:any)/([^/]+)/([^/]+)/([^/]+)'] = 'reports/$1/$2/$3/$4';
 $route['reports/specific_customer'] = 'reports/specific_customer_input';
 $route['reports/specific_employee'] = 'reports/specific_employee_input';
 $route['reports/specific_discount'] = 'reports/specific_discount_input';
+$route['reports/specific_supplier'] = 'reports/specific_supplier_input';
 
 $route['404_override'] = '';
 $route['translate_uri_dashes'] = FALSE;

application/controllers/Attributes.php

@@ -1,6 +1,6 @@
 <?php if ( ! defined('BASEPATH')) exit('No direct script access allowed');
 
-require_once("Secure_Controller.php");
+require_once('Secure_Controller.php');
 
 class Attributes extends Secure_Controller
 {
@@ -16,9 +16,9 @@ class Attributes extends Secure_Controller
 		$this->load->view('attributes/manage', $data);
 	}
 
-	/*
-	Returns customer table data rows. This will be called with AJAX.
-	*/
+	/**
+	 * Returns customer table data rows. This will be called with AJAX.
+	 */
 	public function search()
 	{
 		$search = $this->input->get('search');
@@ -30,10 +30,10 @@ class Attributes extends Secure_Controller
 		$attributes = $this->Attribute->search($search, $limit, $offset, $sort, $order);
 		$total_rows = $this->Attribute->get_found_rows($search);
 
-		$data_rows = array();
+		$data_rows = [];
 		foreach($attributes->result() as $attribute)
 		{
-			$attribute->definition_flags = $this->_get_attributes($attribute->definition_flags);
+			$attribute->definition_flags = $this->get_attributes($attribute->definition_flags);
 			$data_rows[] = get_attribute_definition_data_row($attribute, $this);
 		}
 
@@ -42,33 +42,40 @@ class Attributes extends Secure_Controller
 		echo json_encode(array('total' => $total_rows, 'rows' => $data_rows));
 	}
 
-	public function save_attribute_value($attribute_value)
+	public function save_attribute_value()
 	{
- 		$success = $this->Attribute->save_value(urldecode($attribute_value), $this->input->post('definition_id'), $this->input->post('item_id'), $this->input->post('attribute_id'));
+		$success = $this->Attribute->save_value(
+			$this->input->post('attribute_value'),
+			$this->input->post('definition_id'),
+			$this->input->post('item_id'),
+			$this->input->post('attribute_id')
+		);
 
 		echo json_encode(array('success' => $success != 0));
 	}
 
-	public function delete_attribute_value($attribute_value)
+	public function delete_attribute_value()
 	{
-		$success = $this->Attribute->delete_value($attribute_value, $this->input->post('definition_id'));
+		$success = $this->Attribute->delete_value(
+			$this->input->post('attribute_value'),
+			$this->input->post('definition_id')
+		);
 
 		echo json_encode(array('success' => $success));
 	}
 
-	public function save_definition($definition_id = -1)
+	public function save_definition($definition_id = NO_DEFINITION_ID)
 	{
-
 		$definition_flags = 0;
 
-		$flags = (empty($this->input->post('definition_flags'))) ? array() : $this->input->post('definition_flags');
+		$flags = (empty($this->input->post('definition_flags'))) ? [] : $this->input->post('definition_flags');
 
 		foreach($flags as $flag)
 		{
 			$definition_flags |= $flag;
 		}
 
-		//Save definition data
+	//Save definition data
 		$definition_data = array(
 			'definition_name' => $this->input->post('definition_name'),
 			'definition_unit' => $this->input->post('definition_unit') != '' ? $this->input->post('definition_unit') : NULL,
@@ -85,8 +92,8 @@ class Attributes extends Secure_Controller
 
 		if($this->Attribute->save_definition($definition_data, $definition_id))
 		{
-			//New definition
-			if($definition_id == -1)
+		//New definition
+			if($definition_id == 0)
 			{
 				$definition_values = json_decode($this->input->post('definition_values'));
 
@@ -96,15 +103,17 @@ class Attributes extends Secure_Controller
 				}
 
 				echo json_encode(array('success' => TRUE, 'message' => $this->lang->line('attributes_definition_successful_adding').' '.
-                    $definition_name, 'id' => $definition_data['definition_id']));
+					$definition_name, 'id' => $definition_data['definition_id']));
 			}
-			else //Existing definition
+		//Existing definition
+			else
 			{
 				echo json_encode(array('success' => TRUE, 'message' => $this->lang->line('attributes_definition_successful_updating').' '.
-                    $definition_name, 'id' => $definition_id));
+					$definition_name, 'id' => $definition_id));
 			}
 		}
-		else//failure
+	//Failure
+		else
 		{
 			echo json_encode(array('success' => FALSE, 'message' => $this->lang->line('attributes_definition_error_adding_updating', $definition_name), 'id' => -1));
 		}
@@ -120,15 +129,15 @@ class Attributes extends Secure_Controller
 	public function get_row($row_id)
 	{
 		$attribute_definition_info = $this->Attribute->get_info($row_id);
-		$attribute_definition_info->definition_flags = $this->_get_attributes($attribute_definition_info->definition_flags);
+		$attribute_definition_info->definition_flags = $this->get_attributes($attribute_definition_info->definition_flags);
 		$data_row = $this->xss_clean(get_attribute_definition_data_row($attribute_definition_info));
 
 		echo json_encode($data_row);
 	}
 
-	private function _get_attributes($definition_flags = 0)
+	private function get_attributes($definition_flags = 0)
 	{
-		$definition_flag_names = array();
+		$definition_flag_names = [];
 		foreach (Attribute::get_definition_flags() as $id => $term)
 		{
 			if ($id & $definition_flags)
@@ -139,7 +148,7 @@ class Attributes extends Secure_Controller
 		return $definition_flag_names;
 	}
 
-	public function view($definition_id = -1)
+	public function view($definition_id = NO_DEFINITION_ID)
 	{
 		$info = $this->Attribute->get_info($definition_id);
 		foreach(get_object_vars($info) as $property => $value)
@@ -154,11 +163,11 @@ class Attributes extends Secure_Controller
 		$data['definition_info'] = $info;
 
 		$show_all = Attribute::SHOW_IN_ITEMS | Attribute::SHOW_IN_RECEIVINGS | Attribute::SHOW_IN_SALES;
-		$data['definition_flags'] = $this->_get_attributes($show_all);
+		$data['definition_flags'] = $this->get_attributes($show_all);
 		$selected_flags = $info->definition_flags === '' ? $show_all : $info->definition_flags;
-		$data['selected_definition_flags'] = $this->_get_attributes($selected_flags);
+		$data['selected_definition_flags'] = $this->get_attributes($selected_flags);
 
-		$this->load->view("attributes/form", $data);
+		$this->load->view('attributes/form', $data);
 	}
 
 	public function delete_value($attribute_id)
@@ -180,5 +189,4 @@ class Attributes extends Secure_Controller
 			echo json_encode(array('success' => FALSE, 'message' => $this->lang->line('attributes_definition_cannot_be_deleted')));
 		}
 	}
-
-}
+}

application/controllers/Config.php

@@ -7,11 +7,11 @@ class Config extends Secure_Controller
 	public function __construct()
 	{
 		parent::__construct('config');
-		
+
 		$this->load->library('barcode_lib');
 		$this->load->library('sale_lib');
 	}
-	
+
 	/*
 	 * This function loads all the licenses starting with the first one being OSPOS one
 	 */
@@ -21,9 +21,9 @@ class Config extends Secure_Controller
 		$bower = FALSE;
 		$composer = FALSE;
 		$license = array();
-		
+
 		$license[$i]['title'] = 'Open Source Point Of Sale ' . $this->config->item('application_version');
-		
+
 		if(file_exists('license/LICENSE'))
 		{
 			$license[$i]['text'] = $this->xss_clean(file_get_contents('license/LICENSE', NULL, NULL, 0, 2000));
@@ -32,10 +32,9 @@ class Config extends Secure_Controller
 		{
 			$license[$i]['text'] = 'LICENSE file must be in OSPOS license directory. You are not allowed to use OSPOS application until the distribution copy of LICENSE file is present.';
 		}
-		
-		// read all the files in the dir license
-		$dir = new DirectoryIterator('license');
-		
+
+		$dir = new DirectoryIterator('license');	// read all the files in the dir license
+
 		foreach($dir as $fileinfo)
 		{
 			// license files must be in couples: .version (name & version) & .license (license text)
@@ -44,13 +43,13 @@ class Config extends Secure_Controller
 				if($fileinfo->getExtension() == 'version')
 				{
 					++$i;
-					
+
 					$basename = 'license/' . $fileinfo->getBasename('.version');
-					
+
 					$license[$i]['title'] = $this->xss_clean(file_get_contents($basename . '.version', NULL, NULL, 0, 100));
-					
+
 					$license_text_file = $basename . '.license';
-					
+
 					if(file_exists($license_text_file))
 					{
 						$license[$i]['text'] = $this->xss_clean(file_get_contents($license_text_file , NULL, NULL, 0, 2000));
@@ -72,17 +71,17 @@ class Config extends Secure_Controller
 				}
 			}
 		}
-		
+
 		// attach the licenses from the LICENSES file generated by bower
 		if($composer)
 		{
 			++$i;
 			$license[$i]['title'] = 'Composer Libraries';
 			$license[$i]['text'] = '';
-			
+
 			$file = file_get_contents('license/composer.LICENSES');
 			$array = json_decode($file, TRUE);
-			
+
 			foreach($array as $key => $val)
 			{
 				if(is_array($val) && $key == 'dependencies')
@@ -92,18 +91,18 @@ class Config extends Secure_Controller
 						if(is_array($val1))
 						{
 							$license[$i]['text'] .= 'component: ' . $key1 . "\n";
-							
+
 							foreach($val1 as $key2 => $val2)
 							{
 								if(is_array($val2))
 								{
 									$license[$i]['text'] .= $key2 . ': ';
-									
+
 									foreach($val2 as $key3 => $val3)
 									{
 										$license[$i]['text'] .= $val3 . ' ';
 									}
-									
+
 									$license[$i]['text'] .= "\n";
 								}
 								else
@@ -111,7 +110,7 @@ class Config extends Secure_Controller
 									$license[$i]['text'] .= $key2 . ': ' . $val2 . "\n";
 								}
 							}
-							
+
 							$license[$i]['text'] .= "\n";
 						}
 						else
@@ -121,37 +120,37 @@ class Config extends Secure_Controller
 					}
 				}
 			}
-			
+
 			$license[$i]['text'] = $this->xss_clean($license[$i]['text']);
 		}
-		
+
 		// attach the licenses from the LICENSES file generated by bower
 		if($bower)
 		{
 			++$i;
 			$license[$i]['title'] = 'JS Plugins';
 			$license[$i]['text'] = '';
-			
+
 			$file = file_get_contents('license/bower.LICENSES');
 			$array = json_decode($file, TRUE);
-			
+
 			foreach($array as $key => $val)
 			{
 				if(is_array($val))
 				{
 					$license[$i]['text'] .= 'component: ' . $key . "\n";
-					
+
 					foreach($val as $key1 => $val1)
 					{
 						if(is_array($val1))
 						{
 							$license[$i]['text'] .= $key1 . ': ';
-							
+
 							foreach($val1 as $key2 => $val2)
 							{
 								$license[$i]['text'] .= $val2 . ' ';
 							}
-							
+
 							$license[$i]['text'] .= "\n";
 						}
 						else
@@ -159,41 +158,41 @@ class Config extends Secure_Controller
 							$license[$i]['text'] .= $key1 . ': ' . $val1 . "\n";
 						}
 					}
-					
+
 					$license[$i]['text'] .= "\n";
 				}
 			}
-			
+
 			$license[$i]['text'] = $this->xss_clean($license[$i]['text']);
 		}
-		
+
 		return $license;
 	}
-	
+
 	/*
 	 * This function loads all the available themes in the dist/bootswatch directory
 	 */
 	private function _themes()
 	{
 		$themes = array();
-		
+
 		// read all themes in the dist folder
 		$dir = new DirectoryIterator('dist/bootswatch');
-		
+
 		foreach($dir as $dirinfo)
 		{
 			if($dirinfo->isDir() && !$dirinfo->isDot() && $dirinfo->getFileName() != 'fonts')
 			{
 				$file = $this->xss_clean($dirinfo->getFileName());
-				$themes[$file] = $file;
+				$themes[$file] = ucfirst($file);
 			}
 		}
-		
+
 		asort($themes);
-		
+
 		return $themes;
 	}
-	
+
 	public function index()
 	{
 		$data['stock_locations'] = $this->Stock_location->get_all()->result_array();
@@ -209,15 +208,25 @@ class Config extends Secure_Controller
 		$data['tax_category_options'] = $this->tax_lib->get_tax_category_options();
 		$data['tax_jurisdiction_options'] = $this->tax_lib->get_tax_jurisdiction_options();
 		$data['show_office_group'] = $this->Module->get_show_office_group();
-		
+		$data['currency_code'] = $this->config->item('currency_code');
+
 		$data = $this->xss_clean($data);
-		
+
 		// load all the license statements, they are already XSS cleaned in the private function
 		$data['licenses'] = $this->_licenses();
+
 		// load all the themes, already XSS cleaned in the private function
 		$data['themes'] = $this->_themes();
-		
-		$data['mailchimp'] = array();
+
+		//Load General related fields
+		$image_allowed_types 		= array('jpg','jpeg','gif','svg','webp','bmp','png','tif','tiff');
+		$data['image_allowed_types']	= array_combine($image_allowed_types,$image_allowed_types);
+
+		$data['selected_image_allowed_types'] 	= explode('|',$this->config->item('image_allowed_types'));
+
+		//Load Integrations Related fields
+		$data['mailchimp']	= array();
+
 		if($this->_check_encryption())
 		{
 			$data['mailchimp']['api_key'] = $this->encryption->decrypt($this->config->item('mailchimp_api_key'));
@@ -228,18 +237,18 @@ class Config extends Secure_Controller
 			$data['mailchimp']['api_key'] = '';
 			$data['mailchimp']['list_id'] = '';
 		}
-		
+
 		// load mailchimp lists associated to the given api key, already XSS cleaned in the private function
 		$data['mailchimp']['lists'] = $this->_mailchimp();
-		
+
 		$this->load->view("configs/manage", $data);
 	}
-	
+
 	public function save_info()
 	{
 		$upload_success = $this->_handle_logo_upload();
 		$upload_data = $this->upload->data();
-		
+
 		$batch_save_data = array(
 			'company' => $this->input->post('company'),
 			'address' => $this->input->post('address'),
@@ -249,7 +258,7 @@ class Config extends Secure_Controller
 			'website' => $this->input->post('website'),
 			'return_policy' => $this->input->post('return_policy')
 		);
-		
+
 		if(!empty($upload_data['orig_name']))
 		{
 			// XSS file image sanity check
@@ -258,22 +267,23 @@ class Config extends Secure_Controller
 				$batch_save_data['company_logo'] = $upload_data['raw_name'] . $upload_data['file_ext'];
 			}
 		}
-		
+
 		$result = $this->Appconfig->batch_save($batch_save_data);
 		$success = $upload_success && $result ? TRUE : FALSE;
 		$message = $this->lang->line('config_saved_' . ($success ? '' : 'un') . 'successfully');
 		$message = $upload_success ? $message : strip_tags($this->upload->display_errors());
-		
+
 		echo json_encode(array(
 			'success' => $success,
 			'message' => $message
 		));
 	}
-	
+
 	public function save_general()
 	{
 		$batch_save_data = array(
 			'theme' => $this->input->post('theme'),
+			'login_form' => $this->input->post('login_form'),
 			'default_sales_discount_type' => $this->input->post('default_sales_discount_type') != NULL,
 			'default_sales_discount' => $this->input->post('default_sales_discount'),
 			'default_receivings_discount_type' => $this->input->post('default_receivings_discount_type') != NULL,
@@ -283,6 +293,10 @@ class Config extends Secure_Controller
 			'lines_per_page' => $this->input->post('lines_per_page'),
 			'notify_horizontal_position' => $this->input->post('notify_horizontal_position'),
 			'notify_vertical_position' => $this->input->post('notify_vertical_position'),
+			'image_max_width' => $this->input->post('image_max_width'),
+			'image_max_height' => $this->input->post('image_max_height'),
+			'image_max_size' => $this->input->post('image_max_size'),
+			'image_allowed_types' => implode('|', $this->input->post('image_allowed_types')),
 			'gcaptcha_enable' => $this->input->post('gcaptcha_enable') != NULL,
 			'gcaptcha_secret_key' => $this->input->post('gcaptcha_secret_key'),
 			'gcaptcha_site_key' => $this->input->post('gcaptcha_site_key'),
@@ -292,46 +306,71 @@ class Config extends Secure_Controller
 			'giftcard_number' => $this->input->post('giftcard_number'),
 			'derive_sale_quantity' => $this->input->post('derive_sale_quantity') != NULL,
 			'multi_pack_enabled' => $this->input->post('multi_pack_enabled') != NULL,
-			'include_hsn' => $this->input->post('include_hsn') != NULL
+			'include_hsn' => $this->input->post('include_hsn') != NULL,
+			'category_dropdown' => $this->input->post('category_dropdown') != NULL
 		);
-		
+
 		$this->Module->set_show_office_group($this->input->post('show_office_group') != NULL);
-		
+
+		if($batch_save_data['category_dropdown'] == 1)
+		{
+			$definition_data['definition_name'] = 'ospos_category';
+			$definition_data['definition_flags'] = 0;
+			$definition_data['definition_type'] = 'DROPDOWN';
+			$definition_data['definition_id'] = CATEGORY_DEFINITION_ID;
+			$definition_data['deleted'] = 0;
+
+			$this->Attribute->save_definition($definition_data, CATEGORY_DEFINITION_ID);
+		}
+		else if($batch_save_data['category_dropdown'] == NO_DEFINITION_ID)
+		{
+			$this->Attribute->delete_definition(CATEGORY_DEFINITION_ID);
+		}
+
 		$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')
 		));
 	}
-	
+
 	public function ajax_check_number_locale()
 	{
 		$number_locale = $this->input->post('number_locale');
+		$save_number_locale = $this->input->post('save_number_locale');
+
 		$fmt = new \NumberFormatter($number_locale, \NumberFormatter::CURRENCY);
-		$currency_symbol = empty($this->input->post('currency_symbol')) ? $fmt->getSymbol(\NumberFormatter::CURRENCY_SYMBOL) : $this->input->post('currency_symbol');
-		$currency_code = empty($this->input->post('currency_code')) ? $fmt->getTextAttribute(\NumberFormatter::CURRENCY_CODE) : $this->input->post('currency_code');
-		
+		if($number_locale != $save_number_locale)
+		{
+			$currency_symbol = $fmt->getSymbol(\NumberFormatter::CURRENCY_SYMBOL);
+			$currency_code = $fmt->getTextAttribute(\NumberFormatter::CURRENCY_CODE);
+			$save_number_locale = $number_locale;
+		}
+		else
+		{
+			$currency_symbol = empty($this->input->post('currency_symbol')) ? $fmt->getSymbol(\NumberFormatter::CURRENCY_SYMBOL) : $this->input->post('currency_symbol');
+			$currency_code = empty($this->input->post('currency_code')) ? $fmt->getTextAttribute(\NumberFormatter::CURRENCY_CODE) : $this->input->post('currency_code');
+		}
+
 		if($this->input->post('thousands_separator') == 'false')
 		{
 			$fmt->setAttribute(\NumberFormatter::GROUPING_SEPARATOR_SYMBOL, '');
 		}
-		
+
 		$fmt->setSymbol(\NumberFormatter::CURRENCY_SYMBOL, $currency_symbol);
-		$fmt->setTextAttribute(\NumberFormatter::CURRENCY_CODE, $currency_code);
-		
 		$number_local_example = $fmt->format(1234567890.12300);
-		
+
 		echo json_encode(array(
 			'success' => $number_local_example != FALSE,
+			'save_number_locale' => $save_number_locale,
 			'number_locale_example' => $number_local_example,
 			'currency_symbol' => $currency_symbol,
 			'currency_code' => $currency_code,
-			'thousands_separator' => $fmt->getAttribute(\NumberFormatter::GROUPING_SEPARATOR_SYMBOL) != ''
 		));
 	}
-	
+
 	public function save_locale()
 	{
 		$exploded = explode(":", $this->input->post('language'));
@@ -343,7 +382,7 @@ class Config extends Secure_Controller
 			'timezone' => $this->input->post('timezone'),
 			'dateformat' => $this->input->post('dateformat'),
 			'timeformat' => $this->input->post('timeformat'),
-			'thousands_separator' => $this->input->post('thousands_separator'),
+			'thousands_separator' => !empty($this->input->post('thousands_separator')),
 			'number_locale' => $this->input->post('number_locale'),
 			'currency_decimals' => $this->input->post('currency_decimals'),
 			'tax_decimals' => $this->input->post('tax_decimals'),
@@ -355,25 +394,25 @@ class Config extends Secure_Controller
 			'cash_rounding_code' => $this->input->post('cash_rounding_code'),
 			'financial_year' => $this->input->post('financial_year')
 		);
-		
+
 		$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')
 		));
 	}
-	
+
 	public function save_email()
 	{
 		$password = '';
-		
+
 		if($this->_check_encryption())
 		{
 			$password = $this->encryption->encrypt($this->input->post('smtp_pass'));
 		}
-		
+
 		$batch_save_data = array(
 			'protocol' => $this->input->post('protocol'),
 			'mailpath' => $this->input->post('mailpath'),
@@ -384,50 +423,50 @@ class Config extends Secure_Controller
 			'smtp_timeout' => $this->input->post('smtp_timeout'),
 			'smtp_crypto' => $this->input->post('smtp_crypto')
 		);
-		
+
 		$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')
 		));
 	}
-	
+
 	public function save_message()
 	{
 		$password = '';
-		
+
 		if($this->_check_encryption())
 		{
 			$password = $this->encryption->encrypt($this->input->post('msg_pwd'));
 		}
-		
+
 		$batch_save_data = array(
 			'msg_msg' => $this->input->post('msg_msg'),
 			'msg_uid' => $this->input->post('msg_uid'),
 			'msg_pwd' => $password,
 			'msg_src' => $this->input->post('msg_src')
 		);
-		
+
 		$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 function fetches all the available lists from Mailchimp for the given API key
 	 */
 	private function _mailchimp($api_key = '')
 	{
 		$this->load->library('mailchimp_lib', array('api_key' => $api_key));
-		
+
 		$result = array();
-		
+
 		if(($lists = $this->mailchimp_lib->getLists()) !== FALSE)
 		{
 			if(is_array($lists) && !empty($lists['lists']) && is_array($lists['lists']))
@@ -439,10 +478,10 @@ class Config extends Secure_Controller
 				}
 			}
 		}
-		
+
 		return $result;
 	}
-	
+
 	/*
 	 AJAX call from mailchimp config form to fetch the Mailchimp lists when a valid API key is inserted
 	 */
@@ -451,75 +490,75 @@ class Config extends Secure_Controller
 		// load mailchimp lists associated to the given api key, already XSS cleaned in the private function
 		$lists = $this->_mailchimp($this->input->post('mailchimp_api_key'));
 		$success = count($lists) > 0 ? TRUE : FALSE;
-		
+
 		echo json_encode(array(
 			'success' => $success,
 			'message' => $this->lang->line('config_mailchimp_key_' . ($success ? '' : 'un') . 'successfully'),
 			'mailchimp_lists' => $lists
 		));
 	}
-	
+
 	public function save_mailchimp()
 	{
 		$api_key = '';
 		$list_id = '';
-		
+
 		if($this->_check_encryption())
 		{
 			$api_key = $this->encryption->encrypt($this->input->post('mailchimp_api_key'));
 			$list_id = $this->encryption->encrypt($this->input->post('mailchimp_list_id'));
 		}
-		
+
 		$batch_save_data = array(
 			'mailchimp_api_key' => $api_key,
 			'mailchimp_list_id' => $list_id
 		);
-		
+
 		$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')
 		));
 	}
-	
+
 	public function ajax_stock_locations()
 	{
 		$stock_locations = $this->Stock_location->get_all()->result_array();
-		
+
 		$stock_locations = $this->xss_clean($stock_locations);
-		
+
 		$this->load->view('partial/stock_locations', array('stock_locations' => $stock_locations));
 	}
-	
+
 	public function ajax_dinner_tables()
 	{
 		$dinner_tables = $this->Dinner_table->get_all()->result_array();
-		
+
 		$dinner_tables = $this->xss_clean($dinner_tables);
-		
+
 		$this->load->view('partial/dinner_tables', array('dinner_tables' => $dinner_tables));
 	}
-	
+
 	public function ajax_tax_categories()
 	{
 		$tax_categories = $this->Tax->get_all_tax_categories()->result_array();
-		
+
 		$tax_categories = $this->xss_clean($tax_categories);
-		
+
 		$this->load->view('partial/tax_categories', array('tax_categories' => $tax_categories));
 	}
-	
+
 	public function ajax_customer_rewards()
 	{
 		$customer_rewards = $this->Customer_rewards->get_all()->result_array();
-		
+
 		$customer_rewards = $this->xss_clean($customer_rewards);
-		
+
 		$this->load->view('partial/customer_rewards', array('customer_rewards' => $customer_rewards));
 	}
-	
+
 	private function _clear_session_state()
 	{
 		$this->sale_lib->clear_sale_location();
@@ -530,32 +569,33 @@ class Config extends Secure_Controller
 		$this->receiving_lib->clear_stock_destination();
 		$this->receiving_lib->clear_all();
 	}
-	
+
 	public function save_locations()
 	{
 		$this->db->trans_start();
-		
+
 		$not_to_delete = array();
 		foreach($this->input->post() as $key => $value)
 		{
 			if(strstr($key, 'stock_location'))
 			{
-				$location_id = preg_replace("/.*?_(\d+)$/", "$1", $key);
-				
 				// save or update
-				$location_data = array('location_name' => $value);
-				if($this->Stock_location->save($location_data, $location_id))
+				foreach ($value as $location_id => $location_name)
 				{
-					$location_id = $this->Stock_location->get_location_id($value);
-					$not_to_delete[] = $location_id;
-					$this->_clear_session_state();
+					$location_data = array('location_name' => $location_name);
+					if($this->Stock_location->save($location_data, $location_id))
+					{
+						$location_id = $this->Stock_location->get_location_id($location_name);
+						$not_to_delete[] = $location_id;
+						$this->_clear_session_state();
+					}
 				}
 			}
 		}
-		
+
 		// all locations not available in post will be deleted now
 		$deleted_locations = $this->Stock_location->get_all()->result_array();
-		
+
 		foreach($deleted_locations as $location => $location_data)
 		{
 			if(!in_array($location_data['location_id'], $not_to_delete))
@@ -563,25 +603,25 @@ class Config extends Secure_Controller
 				$this->Stock_location->delete($location_data['location_id']);
 			}
 		}
-		
+
 		$this->db->trans_complete();
-		
+
 		$success = $this->db->trans_status();
-		
+
 		echo json_encode(array(
 			'success' => $success,
 			'message' => $this->lang->line('config_saved_' . ($success ? '' : 'un') . 'successfully')
 		));
 	}
-	
+
 	public function save_tables()
 	{
 		$this->db->trans_start();
-		
+
 		$dinner_table_enable = $this->input->post('dinner_table_enable') != NULL;
-		
+
 		$this->Appconfig->save('dinner_table_enable', $dinner_table_enable);
-		
+
 		if($dinner_table_enable)
 		{
 			$not_to_delete = array();
@@ -591,6 +631,7 @@ class Config extends Secure_Controller
 				{
 					$dinner_table_id = preg_replace("/.*?_(\d+)$/", "$1", $key);
 					$not_to_delete[] = $dinner_table_id;
+
 					// save or update
 					$table_data = array('name' => $value);
 					if($this->Dinner_table->save($table_data, $dinner_table_id))
@@ -599,10 +640,10 @@ class Config extends Secure_Controller
 					}
 				}
 			}
-			
+
 			// all tables not available in post will be deleted now
 			$deleted_tables = $this->Dinner_table->get_all()->result_array();
-			
+
 			foreach($deleted_tables as $dinner_tables => $table)
 			{
 				if(!in_array($table['dinner_table_id'], $not_to_delete))
@@ -611,25 +652,25 @@ class Config extends Secure_Controller
 				}
 			}
 		}
-		
+
 		$this->db->trans_complete();
-		
+
 		$success = $this->db->trans_status();
-		
+
 		echo json_encode(array(
 			'success' => $success,
 			'message' => $this->lang->line('config_saved_' . ($success ? '' : 'un') . 'successfully')
 		));
 	}
-	
+
 	public function save_tax()
 	{
 		$this->db->trans_start();
-		
+
 		$batch_save_data = array(
-			'default_tax_1_rate' => parse_decimals($this->input->post('default_tax_1_rate')),
+			'default_tax_1_rate' => parse_tax($this->input->post('default_tax_1_rate')),
 			'default_tax_1_name' => $this->input->post('default_tax_1_name'),
-			'default_tax_2_rate' => parse_decimals($this->input->post('default_tax_2_rate')),
+			'default_tax_2_rate' => parse_tax($this->input->post('default_tax_2_rate')),
 			'default_tax_2_name' => $this->input->post('default_tax_2_name'),
 			'tax_included' => $this->input->post('tax_included') != NULL,
 			'use_destination_based_tax' => $this->input->post('use_destination_based_tax') != NULL,
@@ -638,29 +679,29 @@ class Config extends Secure_Controller
 			'default_tax_jurisdiction' => $this->input->post('default_tax_jurisdiction'),
 			'tax_id' => $this->input->post('tax_id')
 		);
-		
+
 		$success = $this->Appconfig->batch_save($batch_save_data) ? TRUE : FALSE;
-		
+
 		$this->db->trans_complete();
-		
+
 		$success &= $this->db->trans_status();
-		
+
 		$message = $this->lang->line('config_saved_' . ($success ? '' : 'un') . 'successfully');
-		
+
 		echo json_encode(array(
 			'success' => $success,
 			'message' => $message
 		));
 	}
-	
+
 	public function save_rewards()
 	{
 		$this->db->trans_start();
-		
+
 		$customer_reward_enable = $this->input->post('customer_reward_enable') != NULL;
-		
+
 		$this->Appconfig->save('customer_reward_enable', $customer_reward_enable);
-		
+
 		if($customer_reward_enable)
 		{
 			$not_to_delete = array();
@@ -679,7 +720,7 @@ class Config extends Secure_Controller
 					$array_save[$customer_reward_id]['points_percent'] = $value;
 				}
 			}
-			
+
 			if(!empty($array_save))
 			{
 				foreach($array_save as $key => $value)
@@ -689,10 +730,10 @@ class Config extends Secure_Controller
 					$this->Customer_rewards->save($package_data, $key);
 				}
 			}
-			
+
 			// all packages not available in post will be deleted now
 			$deleted_packages = $this->Customer_rewards->get_all()->result_array();
-			
+
 			foreach($deleted_packages as $customer_rewards => $reward_category)
 			{
 				if(!in_array($reward_category['package_id'], $not_to_delete))
@@ -701,17 +742,17 @@ class Config extends Secure_Controller
 				}
 			}
 		}
-		
+
 		$this->db->trans_complete();
-		
+
 		$success = $this->db->trans_status();
-		
+
 		echo json_encode(array(
 			'success' => $success,
 			'message' => $this->lang->line('config_saved_' . ($success ? '' : 'un') . 'successfully')
 		));
 	}
-	
+
 	public function save_barcode()
 	{
 		$batch_save_data = array(
@@ -731,16 +772,16 @@ class Config extends Secure_Controller
 			'barcode_content' => $this->input->post('barcode_content'),
 			'barcode_formats' => json_encode($this->input->post('barcode_formats'))
 		);
-		
+
 		$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')
 		));
 	}
-	
+
 	public function save_receipt()
 	{
 		$batch_save_data = array (
@@ -750,7 +791,8 @@ class Config extends Secure_Controller
 			'email_receipt_check_behaviour' => $this->input->post('email_receipt_check_behaviour'),
 			'print_receipt_check_behaviour' => $this->input->post('print_receipt_check_behaviour'),
 			'receipt_show_company_name' => $this->input->post('receipt_show_company_name') != NULL,
-			'receipt_show_taxes' => $this->input->post('receipt_show_taxes') != NULL,
+			'receipt_show_taxes' => ($this->input->post('receipt_show_taxes') != NULL),
+			'receipt_show_tax_ind' => ($this->input->post('receipt_show_tax_ind') != NULL),
 			'receipt_show_total_discount' => $this->input->post('receipt_show_total_discount') != NULL,
 			'receipt_show_description' => $this->input->post('receipt_show_description') != NULL,
 			'receipt_show_serialnumber' => $this->input->post('receipt_show_serialnumber') != NULL,
@@ -762,21 +804,20 @@ class Config extends Secure_Controller
 			'print_bottom_margin' => $this->input->post('print_bottom_margin'),
 			'print_right_margin' => $this->input->post('print_right_margin')
 		);
-		
+
 		$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')
 		));
 	}
-	
+
 	public function save_invoice()
 	{
 		$batch_save_data = array (
 			'invoice_enable' => $this->input->post('invoice_enable') != NULL,
-			'default_register_mode' => $this->input->post('default_register_mode'),
 			'sales_invoice_format' => $this->input->post('sales_invoice_format'),
 			'sales_quote_format' => $this->input->post('sales_quote_format'),
 			'recv_invoice_format' => $this->input->post('recv_invoice_format'),
@@ -791,10 +832,10 @@ class Config extends Secure_Controller
 			'last_used_work_order_number' => $this->input->post('last_used_work_order_number'),
 			'invoice_type' => $this->input->post('invoice_type')
 		);
-		
+
 		$result = $this->Appconfig->batch_save($batch_save_data);
 		$success = $result ? TRUE : FALSE;
-		
+
 		// Update the register mode with the latest change so that if the user
 		// switches immediately back to the register the mode reflects the change
 		if($success == TRUE)
@@ -808,24 +849,24 @@ class Config extends Secure_Controller
 				$this->sale_lib->set_mode('sale');
 			}
 		}
-		
+
 		echo json_encode(array(
 			'success' => $success,
 			'message' => $this->lang->line('config_saved_' . ($success ? '' : 'un') . 'successfully')
 		));
 	}
-	
+
 	public function remove_logo()
 	{
 		$result = $this->Appconfig->batch_save(array('company_logo' => ''));
-		
+
 		echo json_encode(array('success' => $result));
 	}
-	
+
 	private function _handle_logo_upload()
 	{
 		$this->load->helper('directory');
-		
+
 		// load upload library
 		$config = array('upload_path' => './uploads/',
 			'allowed_types' => 'gif|jpg|png',
@@ -835,71 +876,72 @@ class Config extends Secure_Controller
 			'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>');
 	}
-	
+
 	private function _check_encryption()
 	{
 		$encryption_key = $this->config->item('encryption_key');
-		
+
 		// check if the encryption_key config item is the default one
 		if($encryption_key == '' || $encryption_key == 'YOUR KEY')
 		{
 			// Config path
 			$config_path = APPPATH . 'config/config.php';
-			
+
 			// Open the file
 			$config = file_get_contents($config_path);
-			
+
 			// $key will be assigned a 32-byte (256-bit) hex-encoded random key
 			$key = bin2hex($this->encryption->create_key(32));
-			
+
 			// set the encryption key in the config item
 			$this->config->set_item('encryption_key', $key);
-			
+
 			// replace the empty placeholder with a real randomly generated encryption key
 			$config = preg_replace("/(.*encryption_key.*)('');/", "$1'$key';", $config);
-			
+
 			$result = FALSE;
-			
+
 			// Chmod the file
-			@chmod($config_path, 0777);
-			
+			@chmod($config_path, 0770);
+
 			// Verify file permissions
 			if(is_writable($config_path))
 			{
 				// Write the new config.php file
 				$handle = @fopen($config_path, 'w+');
+
 				// Write the file
 				$result = (fwrite($handle, $config) === FALSE) ? FALSE : TRUE;
-				
+
 				fclose($handle);
 			}
-			
+
 			// Chmod the file
-			@chmod($config_path, 0444);
-			
+			@chmod($config_path, 0440);
+
 			return $result;
 		}
-		
+
 		return TRUE;
 	}
-	
+
 	public function backup_db()
 	{
 		$employee_id = $this->Employee->get_logged_in_employee_info()->person_id;
 		if($this->Employee->has_module_grant('config', $employee_id))
 		{
 			$this->load->dbutil();
-			
+
 			$prefs = array(
 				'format' => 'zip',
 				'filename' => 'ospos.sql'
 			);
-			
+
 			$backup = $this->dbutil->backup($prefs);
-			
+
 			$file_name = 'ospos-' . date("Y-m-d-H-i-s") .'.zip';
 			$save = 'uploads/' . $file_name;
 			$this->load->helper('download');
@@ -907,7 +949,7 @@ class Config extends Secure_Controller
 			{
 				ob_end_clean();
 			}
-			
+
 			force_download($file_name, $backup);
 		}
 		else
@@ -916,4 +958,4 @@ class Config extends Secure_Controller
 		}
 	}
 }
-?>
+?>

application/controllers/Customers.php

@@ -347,25 +347,25 @@ class Customers extends Persons
 	}
 
 	/*
-	Customers import from excel spreadsheet
+	Customers import from csv spreadsheet
 	*/
-	public function excel()
+	public function csv()
 	{
 		$name = 'import_customers.csv';
 		$data = file_get_contents('../' . $name);
 		force_download($name, $data);
 	}
 
-	public function excel_import()
+	public function csv_import()
 	{
-		$this->load->view('customers/form_excel_import', NULL);
+		$this->load->view('customers/form_csv_import', NULL);
 	}
 
-	public function do_excel_import()
+	public function do_csv_import()
 	{
 		if($_FILES['file_path']['error'] != UPLOAD_ERR_OK)
 		{
-			echo json_encode(array('success' => FALSE, 'message' => $this->lang->line('customers_excel_import_failed')));
+			echo json_encode(array('success' => FALSE, 'message' => $this->lang->line('customers_csv_import_failed')));
 		}
 		else
 		{
@@ -446,18 +446,18 @@ class Customers extends Persons
 
 				if(count($failCodes) > 0)
 				{
-					$message = $this->lang->line('customers_excel_import_partially_failed') . ' (' . count($failCodes) . '): ' . implode(', ', $failCodes);
+					$message = $this->lang->line('customers_csv_import_partially_failed') . ' (' . count($failCodes) . '): ' . implode(', ', $failCodes);
 
 					echo json_encode(array('success' => FALSE, 'message' => $message));
 				}
 				else
 				{
-					echo json_encode(array('success' => TRUE, 'message' => $this->lang->line('customers_excel_import_success')));
+					echo json_encode(array('success' => TRUE, 'message' => $this->lang->line('customers_csv_import_success')));
 				}
 			}
 			else
 			{
-				echo json_encode(array('success' => FALSE, 'message' => $this->lang->line('customers_excel_import_nodata_wrongformat')));
+				echo json_encode(array('success' => FALSE, 'message' => $this->lang->line('customers_csv_import_nodata_wrongformat')));
 			}
 		}
 	}

application/controllers/Employees.php

@@ -35,6 +35,13 @@ class Employees extends Persons
 	/*
 	Gives search suggestions based on what is being searched for
 	*/
+	public function suggest()
+	{
+		$suggestions = $this->xss_clean($this->Employee->get_search_suggestions($this->input->get('term'), TRUE));
+
+		echo json_encode($suggestions);
+	}
+
 	public function suggest_search()
 	{
 		$suggestions = $this->xss_clean($this->Employee->get_search_suggestions($this->input->post('term')));
@@ -53,6 +60,7 @@ class Employees extends Persons
 			$person_info->$property = $this->xss_clean($value);
 		}
 		$data['person_info'] = $person_info;
+		$data['employee_id'] = $employee_id;
 
 		$modules = array();
 		foreach($this->Module->get_all_modules()->result() as $module)
@@ -183,5 +191,11 @@ class Employees extends Persons
 			echo json_encode(array('success' => FALSE, 'message' => $this->lang->line('employees_cannot_be_deleted')));
 		}
 	}
+
+	public function check_username($employee_id)
+	{
+		$exists = $this->Employee->username_exists($employee_id, $this->input->get('username'));
+		echo !$exists ? 'true' : 'false';
+	}
 }
 ?>

application/controllers/Home.php

@@ -4,7 +4,7 @@ require_once("Secure_Controller.php");
 
 class Home extends Secure_Controller 
 {
-	function __construct()
+	public function __construct()
 	{
 		parent::__construct(NULL, NULL, 'home');
 	}
@@ -20,7 +20,7 @@ class Home extends Secure_Controller
 	}
 
 	/*
-	Loads the change employee password form
+	Load "change employee password" form
 	*/
 	public function change_password($employee_id = -1)
 	{

application/controllers/Item_kits.php

@@ -100,6 +100,7 @@ class Item_kits extends Secure_Controller
 			$info->price_option = '0';
 			$info->print_option = PRINT_ALL;
 			$info->kit_item_id = 0;
+			$info->item_number = '';
 		}
 		foreach(get_object_vars($info) as $property => $value)
 		{
@@ -131,6 +132,7 @@ class Item_kits extends Secure_Controller
 	{
 		$item_kit_data = array(
 			'name' => $this->input->post('name'),
+			'item_kit_number' => $this->input->post('item_kit_number'),
 			'item_id' => $this->input->post('kit_item_id'),
 			'kit_discount' => $this->input->post('kit_discount'),
 			'kit_discount_type' => $this->input->post('kit_discount_type') == NULL ? PERCENT : $this->input->post('kit_discount_type'),
@@ -141,7 +143,6 @@ class Item_kits extends Secure_Controller
 		
 		if($this->Item_kit->save($item_kit_data, $item_kit_id))
 		{
-			$success = TRUE;
 			$new_item = FALSE;
 			//New item kit
 			if($item_kit_id == -1)
@@ -205,6 +206,12 @@ class Item_kits extends Secure_Controller
 								'message' => $this->lang->line('item_kits_cannot_be_deleted')));
 		}
 	}
+
+	public function check_item_number()
+	{
+		$exists = $this->Item_kit->item_number_exists($this->input->post('item_kit_number'), $this->input->post('item_kit_id'));
+		echo !$exists ? 'true' : 'false';
+	}
 	
 	public function generate_barcodes($item_kit_ids)
 	{

application/controllers/Login.php

@@ -5,6 +5,7 @@ class Login extends CI_Controller
 	public function index()
 	{
 		$this->load->library('migration');
+
 		if($this->Employee->is_logged_in())
 		{
 			redirect('home');
@@ -15,12 +16,6 @@ class Login extends CI_Controller
 
 			$this->form_validation->set_rules('username', 'lang:login_username', 'required|callback_login_check');
 
-
-			if($this->config->item('gcaptcha_enable'))
-			{
-				$this->form_validation->set_rules('g-recaptcha-response', 'lang:login_gcaptcha', 'required|callback_gcaptcha_check');
-			}
-
 			if($this->form_validation->run() == FALSE)
 			{
 				$this->load->view('login');
@@ -34,22 +29,22 @@ class Login extends CI_Controller
 
 	public function login_check($username)
 	{
-		$password = $this->input->post('password');
-
-		if(!$this->_installation_check())
+		if(!$this->installation_check())
 		{
 			$this->form_validation->set_message('login_check', $this->lang->line('login_invalid_installation'));
 
 			return FALSE;
 		}
 
-		if (!$this->migration->is_latest())
+		if(!$this->migration->is_latest())
 		{
-			set_time_limit(1200);
+			set_time_limit(3600);
 			// trigger any required upgrade before starting the application
 			$this->migration->latest();
 		}
 
+		$password = $this->input->post('password');
+
 		if(!$this->Employee->login($username, $password))
 		{
 			$this->form_validation->set_message('login_check', $this->lang->line('login_invalid_username_and_password'));
@@ -57,33 +52,54 @@ class Login extends CI_Controller
 			return FALSE;
 		}
 
-		return TRUE;
-	}
-
-	public function gcaptcha_check($recaptchaResponse)
-	{
-		$url = 'https://www.google.com/recaptcha/api/siteverify?secret=' . $this->config->item('gcaptcha_secret_key') . '&response=' . $recaptchaResponse . '&remoteip=' . $this->input->ip_address();
-
-		$ch = curl_init();
-		curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, FALSE);
-		curl_setopt($ch, CURLOPT_RETURNTRANSFER, TRUE);
-		curl_setopt($ch, CURLOPT_URL, $url);
-		$result = curl_exec($ch);
-		curl_close($ch);
-
-		$status = json_decode($result, TRUE);
-
-		if(empty($status['success']))
+		if($this->config->item('gcaptcha_enable'))
 		{
-			$this->form_validation->set_message('gcaptcha_check', $this->lang->line('login_invalid_gcaptcha'));
+			$g_recaptcha_response = $this->input->post('g-recaptcha-response');
 
-			return FALSE;
+			if(!$this->gcaptcha_check($g_recaptcha_response))
+			{
+				$this->form_validation->set_message('login_check', $this->lang->line('login_invalid_gcaptcha'));
+
+				return FALSE;
+			}
 		}
 
 		return TRUE;
 	}
 
-	private function _installation_check()
+	private function gcaptcha_check($response)
+	{
+		if(!empty($response))
+		{
+			$check = array(
+				'secret'   => $this->config->item('gcaptcha_secret_key'),
+				'response' => $response,
+				'remoteip' => $this->input->ip_address()
+			);
+
+			$ch = curl_init();
+
+			curl_setopt($ch, CURLOPT_URL, "https://www.google.com/recaptcha/api/siteverify");
+			curl_setopt($ch, CURLOPT_POST, TRUE);
+			curl_setopt($ch, CURLOPT_POSTFIELDS, http_build_query($check));
+			curl_setopt($ch, CURLOPT_RETURNTRANSFER, TRUE);
+
+			$result = curl_exec($ch);
+
+			curl_close($ch);
+
+			$status = json_decode($result, TRUE);
+
+			if(!empty($status['success']))
+			{
+				return TRUE;
+			}
+		}
+
+		return FALSE;
+	}
+
+	private function installation_check()
 	{
 		// get PHP extensions and check that the required ones are installed
 		$extensions = implode(', ', get_loaded_extensions());

application/controllers/Messages.php

@@ -37,11 +37,11 @@ class Messages extends Secure_Controller
 
 		if($response)
 		{
-			echo json_encode(array('success' => TRUE, 'message' => $this->lang->line('messages_successfully_sent') . ' ' . $phone));
+			echo json_encode(array('success' => TRUE, 'message' => $this->lang->line('messages_successfully_sent') . ' ' . $this->xss_clean($phone)));
 		}
 		else
 		{
-			echo json_encode(array('success' => FALSE, 'message' => $this->lang->line('messages_unsuccessfully_sent') . ' ' . $phone));
+			echo json_encode(array('success' => FALSE, 'message' => $this->lang->line('messages_unsuccessfully_sent') . ' ' . $this->xss_clean($phone)));
 		}
 	}
 	
@@ -54,11 +54,11 @@ class Messages extends Secure_Controller
 
 		if($response)
 		{
-			echo json_encode(array('success' => TRUE, 'message' => $this->lang->line('messages_successfully_sent') . ' ' . $phone, 'person_id' => $this->xss_clean($person_id)));
+			echo json_encode(array('success' => TRUE, 'message' => $this->lang->line('messages_successfully_sent') . ' ' . $this->xss_clean($phone), 'person_id' => $this->xss_clean($person_id)));
 		}
 		else
 		{
-			echo json_encode(array('success' => FALSE, 'message' => $this->lang->line('messages_unsuccessfully_sent') . ' ' . $phone, 'person_id' => -1));
+			echo json_encode(array('success' => FALSE, 'message' => $this->lang->line('messages_unsuccessfully_sent') . ' ' . $this->xss_clean($phone), 'person_id' => -1));
 		}
 	}
 }

application/controllers/Receivings.php

@@ -9,6 +9,7 @@ class Receivings extends Secure_Controller
 		parent::__construct('receivings');
 
 		$this->load->library('receiving_lib');
+		$this->load->library('token_lib');
 		$this->load->library('barcode_lib');
 	}
 
@@ -90,7 +91,7 @@ class Receivings extends Secure_Controller
 
 		$mode = $this->receiving_lib->get_mode();
 		$item_id_or_number_or_item_kit_or_receipt = $this->input->post('item');
-		$this->barcode_lib->parse_barcode_fields($quantity, $item_id_or_number_or_item_kit_or_receipt);
+		$this->token_lib->parse_barcode($quantity, $price, $item_id_or_number_or_item_kit_or_receipt);
 		$quantity = ($mode == 'receive' || $mode == 'requisition') ? $quantity : -$quantity;
 		$item_location = $this->receiving_lib->get_stock_source();
 		$discount = $this->config->item('default_receivings_discount');
@@ -123,10 +124,10 @@ class Receivings extends Secure_Controller
 		$description = $this->input->post('description');
 		$serialnumber = $this->input->post('serialnumber');
 		$price = parse_decimals($this->input->post('price'));
-		$quantity = parse_decimals($this->input->post('quantity'));
-		$discount = parse_decimals($this->input->post('discount'));
-		$discount_type = parse_decimals($this->input->post('discount_type'));
-		$item_location = $this->input->post('location');
+		$quantity = parse_quantity($this->input->post('quantity'));
+		$discount_type = $this->input->post('discount_type');
+		$discount = $discount_type ? parse_quantity($this->input->post('discount')) : parse_decimals($this->input->post('discount'));
+
 		$receiving_quantity = $this->input->post('receiving_quantity');
 
 		if($this->form_validation->run() != FALSE)
@@ -377,15 +378,17 @@ class Receivings extends Secure_Controller
 		$newdate = $this->input->post('date');
 		
 		$date_formatter = date_create_from_format($this->config->item('dateformat') . ' ' . $this->config->item('timeformat'), $newdate);
+		$receiving_time = $date_formatter->format('Y-m-d H:i:s');
 
 		$receiving_data = array(
-			'receiving_time' => $date_formatter->format('Y-m-d H:i:s'),
+			'receiving_time' => $receiving_time,
 			'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'),
 			'reference' => $this->input->post('reference') != '' ? $this->input->post('reference') : NULL
 		);
-	
+
+		$this->Inventory->update('RECV '.$receiving_id, ['trans_date' => $receiving_time]);
 		if($this->Receiving->update($receiving_data, $receiving_id))
 		{
 			echo json_encode(array('success' => TRUE, 'message' => $this->lang->line('receivings_successfully_updated'), 'id' => $receiving_id));

application/controllers/Reports.php

@@ -51,6 +51,7 @@ class Reports extends Secure_Controller
 		{
 			$tabular_data[] = $this->xss_clean(array(
 				'sale_date' => to_date(strtotime($row['sale_date'])),
+				'sales' => to_quantity_decimals($row['sales']),
 				'quantity' => to_quantity_decimals($row['quantity_purchased']),
 				'subtotal' => to_currency($row['subtotal']),
 				'tax' => to_currency_tax($row['tax']),
@@ -156,6 +157,7 @@ class Reports extends Secure_Controller
 		{
 			$tabular_data[] = $this->xss_clean(array(
 				'customer_name' => $row['customer'],
+				'sales' => to_quantity_decimals($row['sales']),
 				'quantity' => to_quantity_decimals($row['quantity_purchased']),
 				'subtotal' => to_currency($row['subtotal']),
 				'tax' => to_currency_tax($row['tax']),
@@ -228,6 +230,8 @@ class Reports extends Secure_Controller
 		{
 			$tabular_data[] = $this->xss_clean(array(
 				'item_name' => $row['name'],
+				'category' => $row['category'],
+				'unit_price' => $row['unit_price'],
 				'quantity' => to_quantity_decimals($row['quantity_purchased']),
 				'subtotal' => to_currency($row['subtotal']),
 				'tax'  => to_currency_tax($row['tax']),
@@ -264,6 +268,7 @@ class Reports extends Secure_Controller
 		{
 			$tabular_data[] = $this->xss_clean(array(
 				'employee_name' => $row['employee'],
+				'sales' => to_quantity_decimals($row['sales']),
 				'quantity' => to_quantity_decimals($row['quantity_purchased']),
 				'subtotal' => to_currency($row['subtotal']),
 				'tax' => to_currency_tax($row['tax']),
@@ -299,6 +304,7 @@ class Reports extends Secure_Controller
 		foreach($report_data as $row)
 		{
 			$tabular_data[] = $this->xss_clean(array(
+				'tax_name' => $row['name'],
 				'tax_percent' => $row['percent'],
 				'report_count' => $row['count'],
 				'subtotal' => to_currency($row['subtotal']),
@@ -418,7 +424,7 @@ class Reports extends Secure_Controller
 				$tabular_data[] = array(
 					'trans_group' => '--',
 					'trans_type' => '--',
-					'trans_count' => '--',
+					'trans_sales' => '--',
 					'trans_amount' => '--',
 					'trans_payments' => '--',
 					'trans_refunded' => '--',
@@ -435,7 +441,7 @@ class Reports extends Secure_Controller
 				$tabular_data[] = $this->xss_clean(array(
 					'trans_group' => $row['trans_group'],
 					'trans_type' => $row['trans_type'],
-					'trans_count' => $row['trans_count'],
+					'trans_sales' => $row['trans_sales'],
 					'trans_amount' => to_currency($row['trans_amount']),
 					'trans_payments' => to_currency($row['trans_payments']),
 					'trans_refunded' => to_currency($row['trans_refunded']),
@@ -850,9 +856,9 @@ class Reports extends Secure_Controller
 	}
 
 	//Graphical summary payments report
-	public function graphical_summary_payments($start_date, $end_date, $sale_type)
+	public function graphical_summary_payments($start_date, $end_date, $sale_type, $location_id = 'all')
 	{
-		$inputs = array('start_date' => $start_date, 'end_date' => $end_date, 'sale_type' => $sale_type);
+		$inputs = array('start_date' => $start_date, 'end_date' => $end_date, 'sale_type' => $sale_type, 'location_id' => $location_id);
 
 		$this->load->model('reports/Summary_payments');
 		$model = $this->Summary_payments;
@@ -866,8 +872,11 @@ class Reports extends Secure_Controller
 		{
 			$row = $this->xss_clean($row);
 
-			$labels[] = $row['payment_type'];
-			$series[] = array('meta' => $row['payment_type'] . ' ' . round($row['payment_amount'] / $summary['total'] * 100, 2) . '%', 'value' => $row['payment_amount']);
+			if($row['trans_group'] == $this->lang->line('reports_trans_payments') && !empty($row['trans_amount']))
+			{
+				$labels[] = $row['trans_type'];
+				$series[] = array('meta' => $row['trans_type'] . ' ' . round($row['trans_amount'] / $summary['total'] * 100, 2) . '%', 'value' => $row['trans_amount']);
+			}
 		}
 
 		$data = array(
@@ -950,7 +959,7 @@ class Reports extends Secure_Controller
 			$summary_data[] = $this->xss_clean(array(
 				'id' => $row['sale_id'],
 				'type_code' => $row['type_code'],
-				'sale_date' => to_date(strtotime($row['sale_date'])),
+				'sale_time' => to_datetime(strtotime($row['sale_time'])),
 				'quantity' => to_quantity_decimals($row['items_purchased']),
 				'employee_name' => $row['employee_name'],
 				'subtotal' => to_currency($row['subtotal']),
@@ -969,7 +978,7 @@ class Reports extends Secure_Controller
 				$details_data[$row['sale_id']][] = $this->xss_clean(array(
 					$drow['name'],
 					$drow['category'],
-					$drow['serialnumber'],
+					$drow['item_number'],
 					$drow['description'],
 					to_quantity_decimals($drow['quantity_purchased']),
 					to_currency($drow['subtotal']),
@@ -977,7 +986,8 @@ class Reports extends Secure_Controller
 					to_currency($drow['total']),
 					to_currency($drow['cost']),
 					to_currency($drow['profit']),
-					($drow['discount_type'] == PERCENT)? $drow['discount'].'%':to_currency($drow['discount'])));
+					($drow['discount_type'] == PERCENT)? $drow['discount'].'%':to_currency($drow['discount'])
+				));
 			}
 
 			if(isset($report_data['rewards'][$key]))
@@ -1061,7 +1071,7 @@ class Reports extends Secure_Controller
 			$summary_data[] = $this->xss_clean(array(
 				'id' => $row['sale_id'],
 				'type_code' => $row['type_code'],
-				'sale_date' => to_date(strtotime($row['sale_date'])),
+				'sale_time' => to_datetime(strtotime($row['sale_time'])),
 				'quantity' => to_quantity_decimals($row['items_purchased']),
 				'customer_name' => $row['customer_name'],
 				'subtotal' => to_currency($row['subtotal']),
@@ -1080,7 +1090,7 @@ class Reports extends Secure_Controller
 				$details_data[$row['sale_id']][] = $this->xss_clean(array(
 					$drow['name'],
 					$drow['category'],
-					$drow['serialnumber'],
+					$drow['item_number'],
 					$drow['description'],
 					to_quantity_decimals($drow['quantity_purchased']),
 					to_currency($drow['subtotal']),
@@ -1088,7 +1098,8 @@ class Reports extends Secure_Controller
 					to_currency($drow['total']),
 					to_currency($drow['cost']),
 					to_currency($drow['profit']),
-					($drow['discount_type'] == PERCENT)? $drow['discount'].'%':to_currency($drow['discount'])));
+					($drow['discount_type'] == PERCENT)? $drow['discount'].'%':to_currency($drow['discount'])
+				));
 			}
 
 			if(isset($report_data['rewards'][$key]))
@@ -1168,7 +1179,7 @@ class Reports extends Secure_Controller
 			$summary_data[] = $this->xss_clean(array(
 				'id' => $row['sale_id'],
 				'type_code' => $row['type_code'],
-				'sale_date' => to_date(strtotime($row['sale_date'])),
+				'sale_time' => to_datetime(strtotime($row['sale_time'])),
 				'quantity' => to_quantity_decimals($row['items_purchased']),
 				'employee_name' => $row['employee_name'],
 				'customer_name' => $row['customer_name'],
@@ -1188,7 +1199,7 @@ class Reports extends Secure_Controller
 				$details_data[$row['sale_id']][] = $this->xss_clean(array(
 					$drow['name'],
 					$drow['category'],
-					$drow['serialnumber'],
+					$drow['item_number'],
 					$drow['description'],
 					to_quantity_decimals($drow['quantity_purchased']),
 					to_currency($drow['subtotal']),
@@ -1196,7 +1207,8 @@ class Reports extends Secure_Controller
 					to_currency($drow['total']),
 					to_currency($drow['cost']),
 					to_currency($drow['profit']),
-					($drow['discount_type'] == PERCENT)? $drow['discount'].'%':to_currency($drow['discount'])));
+					($drow['discount_type'] == PERCENT)? $drow['discount'].'%':to_currency($drow['discount'])
+				));
 			}
 
 			if(isset($report_data['rewards'][$key]))
@@ -1245,7 +1257,7 @@ class Reports extends Secure_Controller
 
 		$summary_data = $this->xss_clean(array(
 			'sale_id' => $report_data['sale_id'],
-			'sale_date' => to_date(strtotime($report_data['sale_date'])),
+			'sale_time' => to_datetime(strtotime($row['sale_time'])),
 			'quantity' => to_quantity_decimals($report_data['items_purchased']),
 			'employee_name' => $report_data['employee_name'],
 			'customer_name' => $report_data['customer_name'],
@@ -1263,6 +1275,65 @@ class Reports extends Secure_Controller
 		echo json_encode(array($sale_id => $summary_data));
 	}
 
+	public function specific_supplier_input()
+	{
+		$data = array();
+		$data['specific_input_name'] = $this->lang->line('reports_supplier');
+
+		$supplier = array();
+		foreach($this->Supplier->get_all()->result() as $supplier)
+		{
+			$suppliers[$supplier->person_id] = $this->xss_clean($supplier->company_name . ' (' . $supplier->first_name . ' ' . $supplier->last_name . ')');
+		}
+		$data['specific_input_data'] = $suppliers;
+		$data['sale_type_options'] = $this->get_sale_type_options();
+
+		$this->load->view('reports/specific_input', $data);
+	}
+
+	public function specific_supplier($start_date, $end_date, $supplier_id, $sale_type)
+	{
+		$inputs = array('start_date' => $start_date, 'end_date' => $end_date, 'supplier_id' => $supplier_id, 'sale_type' => $sale_type);
+
+		$this->load->model('reports/Specific_supplier');
+		$model = $this->Specific_supplier;
+
+		$model->create($inputs);
+
+		$report_data = $model->getData($inputs);
+
+		$tabular_data = array();
+		foreach($report_data as $row)
+		{
+			$tabular_data[] = $this->xss_clean(array(
+				'id' => $row['sale_id'],
+				'type_code' => $row['type_code'],
+				'sale_time' => to_datetime(strtotime($row['sale_time'])),
+				'name' => $row['name'],
+				'category' => $row['category'],
+				'item_number' => $row['item_number'],
+				'quantity' => to_quantity_decimals($row['items_purchased']),
+				'subtotal' => to_currency($row['subtotal']),
+				'tax' => to_currency_tax($row['tax']),
+				'total' => to_currency($row['total']),
+				'cost' => to_currency($row['cost']),
+				'profit' => to_currency($row['profit']),
+				'discount' => ($row['discount_type'] == PERCENT)? $row['discount'].'%':to_currency($row['discount'])				
+			));
+		}
+
+		$supplier_info = $this->Supplier->get_info($supplier_id);
+		$data = array(
+			'title' => $this->xss_clean($supplier_info->company_name . ' (' . $supplier_info->first_name . ' ' . $supplier_info->last_name . ') ' . $this->lang->line('reports_report')),
+			'subtitle' => $this->_get_subtitle_report(array('start_date' => $start_date, 'end_date' => $end_date)),
+			'headers' => $this->xss_clean($model->getDataColumns()),
+			'data' => $tabular_data,
+			'summary_data' => $this->xss_clean($model->getSummaryData($inputs))
+		);
+
+		$this->load->view('reports/tabular', $data);
+	}
+
 	public function get_sale_type_options()
 	{
 		$sale_type_options = array();
@@ -1321,7 +1392,7 @@ class Reports extends Secure_Controller
 			$summary_data[] = $this->xss_clean(array(
 				'id' => $row['sale_id'],
 				'type_code' => $row['type_code'],
-				'sale_date' => to_date(strtotime($row['sale_date'])),
+				'sale_time' => to_datetime(strtotime($row['sale_time'])),
 				'quantity' => to_quantity_decimals($row['items_purchased']),
 				'employee_name' => $row['employee_name'],
 				'customer_name' => $row['customer_name'],
@@ -1349,7 +1420,7 @@ class Reports extends Secure_Controller
 				$details_data[$row['sale_id']][] = $this->xss_clean(array_merge(array(
 					$drow['name'],
 					$drow['category'],
-					$drow['serialnumber'],
+					$drow['item_number'],
 					$drow['description'],
 					$quantity_purchased,
 					to_currency($drow['subtotal']),
@@ -1358,7 +1429,6 @@ class Reports extends Secure_Controller
 					to_currency($drow['cost']),
 					to_currency($drow['profit']),
 					($drow['discount_type'] == PERCENT)? $drow['discount'].'%':to_currency($drow['discount'])), $attribute_values));
-
 			}
 
 			if(isset($report_data['rewards'][$key]))
@@ -1396,7 +1466,7 @@ class Reports extends Secure_Controller
 
 		$summary_data = $this->xss_clean(array(
 			'receiving_id' => $report_data['receiving_id'],
-			'receiving_date' => to_date(strtotime($report_data['receiving_date'])),
+			'receiving_time' => to_datetime(strtotime($row['receiving_time'])),
 			'quantity' => to_quantity_decimals($report_data['items_purchased']),
 			'employee_name' => $report_data['employee_name'],
 			'supplier_name' => $report_data['supplier_name'],
@@ -1438,7 +1508,7 @@ class Reports extends Secure_Controller
 		{
 			$summary_data[] = $this->xss_clean(array(
 				'id' => $row['receiving_id'],
-				'receiving_date' => to_date(strtotime($row['receiving_date'])),
+				'receiving_time' => to_datetime(strtotime($row['receiving_time'])),
 				'quantity' => to_quantity_decimals($row['items_purchased']),
 				'employee_name' => $row['employee_name'],
 				'supplier_name' => $row['supplier_name'],

application/controllers/Sales.php

@@ -1,21 +1,18 @@
-<?php if(!defined('BASEPATH')) exit('No direct script access allowed');
+<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed');
 
 require_once("Secure_Controller.php");
 
-define('PRICE_MODE_STANDARD', 0);
-define('PRICE_MODE_KIT', 1);
-define('PAYMENT_TYPE_UNASSIGNED', '--');
-
 class Sales extends Secure_Controller
 {
 	public function __construct()
 	{
 		parent::__construct('sales');
 
+		$this->load->helper('file');
 		$this->load->library('sale_lib');
-		$this->load->library('barcode_lib');
 		$this->load->library('email_lib');
 		$this->load->library('token_lib');
+		$this->load->library('barcode_lib');
 	}
 
 	public function index()
@@ -36,20 +33,11 @@ class Sales extends Secure_Controller
 		{
 			$data['table_headers'] = get_sales_manage_table_headers();
 
-			// filters that will be loaded in the multiselect dropdown
-			if($this->config->item('invoice_enable') == TRUE)
-			{
-				$data['filters'] = array('only_cash' => $this->lang->line('sales_cash_filter'),
-					'only_due' => $this->lang->line('sales_due_filter'),
-					'only_check' => $this->lang->line('sales_check_filter'),
-					'only_invoices' => $this->lang->line('sales_invoice_filter'));
-			}
-			else
-			{
-				$data['filters'] = array('only_cash' => $this->lang->line('sales_cash_filter'),
-					'only_due' => $this->lang->line('sales_due_filter'),
-					'only_check' => $this->lang->line('sales_check_filter'));
-			}
+			$data['filters'] = array('only_cash' => $this->lang->line('sales_cash_filter'),
+				'only_due' => $this->lang->line('sales_due_filter'),
+				'only_check' => $this->lang->line('sales_check_filter'),
+				'only_creditcard' => $this->lang->line('sales_credit_filter'),
+				'only_invoices' => $this->lang->line('sales_invoice_filter'));
 
 			$this->load->view('sales/manage', $data);
 		}
@@ -78,6 +66,7 @@ class Sales extends Secure_Controller
 						 'only_cash' => FALSE,
 						 'only_due' => FALSE,
 						 'only_check' => FALSE,
+						 'only_creditcard' => FALSE,
 						 'only_invoices' => $this->config->item('invoice_enable') && $this->input->get('only_invoices'),
 						 'is_valid_receipt' => $this->Sale->is_valid_receipt($search));
 
@@ -88,7 +77,7 @@ class Sales extends Secure_Controller
 		$sales = $this->Sale->search($search, $filters, $limit, $offset, $sort, $order);
 		$total_rows = $this->Sale->get_found_rows($search, $filters);
 		$payments = $this->Sale->get_payments_summary($search, $filters);
-		$payment_summary = $this->xss_clean(get_sales_manage_payments_summary($payments, $sales));
+		$payment_summary = $this->xss_clean(get_sales_manage_payments_summary($payments));
 
 		$data_rows = array();
 		foreach($sales->result() as $sale)
@@ -200,6 +189,8 @@ class Sales extends Secure_Controller
 			$this->sale_lib->set_sale_location($stock_location);
 		}
 
+		$this->sale_lib->empty_payments();
+
 		$this->_reload();
 	}
 
@@ -241,11 +232,6 @@ class Sales extends Secure_Controller
 		$this->sale_lib->set_invoice_number($this->input->post('sales_invoice_number'));
 	}
 
-	public function set_invoice_number_enabled()
-	{
-		$this->sale_lib->set_invoice_number_enabled($this->input->post('sales_invoice_number_enabled'));
-	}
-
 	public function set_payment_type()
 	{
 		$this->sale_lib->set_payment_type($this->input->post('selected_payment_type'));
@@ -273,7 +259,7 @@ class Sales extends Secure_Controller
 		$data = array();
 
 		$payment_type = $this->input->post('payment_type');
-		if($payment_type != $this->lang->line('sales_giftcard'))
+		if($payment_type !== $this->lang->line('sales_giftcard'))
 		{
 			$this->form_validation->set_rules('amount_tendered', 'lang:sales_amount_tendered', 'trim|required|callback_numeric');
 		}
@@ -284,7 +270,7 @@ class Sales extends Secure_Controller
 
 		if($this->form_validation->run() == FALSE)
 		{
-			if($payment_type == $this->lang->line('sales_giftcard'))
+			if($payment_type === $this->lang->line('sales_giftcard'))
 			{
 				$data['error'] = $this->lang->line('sales_must_enter_numeric_giftcard');
 			}
@@ -295,7 +281,7 @@ class Sales extends Secure_Controller
 		}
 		else
 		{
-			if($payment_type == $this->lang->line('sales_giftcard'))
+			if($payment_type === $this->lang->line('sales_giftcard'))
 			{
 				// in case of giftcard payment the register input amount_tendered becomes the giftcard number
 				$giftcard_num = $this->input->post('amount_tendered');
@@ -326,7 +312,7 @@ class Sales extends Secure_Controller
 					$this->sale_lib->add_payment($payment_type, $amount_tendered);
 				}
 			}
-			elseif($payment_type == $this->lang->line('sales_rewards'))
+			elseif($payment_type === $this->lang->line('sales_rewards'))
 			{
 				$customer_id = $this->sale_lib->get_customer();
 				$package_id = $this->Customer->get_info($customer_id)->package_id;
@@ -358,6 +344,20 @@ class Sales extends Secure_Controller
 					}
 				}
 			}
+			elseif($payment_type === $this->lang->line('sales_cash'))
+			{
+				$amount_due = $this->sale_lib->get_total();
+				$sales_total = $this->sale_lib->get_total(FALSE);
+
+				$amount_tendered = $this->input->post('amount_tendered');
+				$this->sale_lib->add_payment($payment_type, $amount_tendered);
+				$cash_adjustment_amount = $amount_due - $sales_total;
+				if($cash_adjustment_amount <> 0)
+				{
+					$this->session->set_userdata('cash_mode', CASH_MODE_TRUE);
+					$this->sale_lib->add_payment($this->lang->line('sales_cash_adjustment'), $cash_adjustment_amount, CASH_ADJUSTMENT_TRUE);
+				}
+			}
 			else
 			{
 				$amount_tendered = $this->input->post('amount_tendered');
@@ -398,7 +398,7 @@ class Sales extends Secure_Controller
 		}
 
 		$item_id_or_number_or_item_kit_or_receipt = $this->input->post('item');
-		$this->barcode_lib->parse_barcode_fields($quantity, $item_id_or_number_or_item_kit_or_receipt);
+		$this->token_lib->parse_barcode($quantity, $price, $item_id_or_number_or_item_kit_or_receipt);
 		$mode = $this->sale_lib->get_mode();
 		$quantity = ($mode == 'return') ? -$quantity : $quantity;
 		$item_location = $this->sale_lib->get_sale_location();
@@ -411,24 +411,31 @@ class Sales extends Secure_Controller
 		{
 			// Add kit item to order if one is assigned
 			$pieces = explode(' ', $item_id_or_number_or_item_kit_or_receipt);
-			$item_kit_id = $pieces[1];
+
+			$item_kit_id = (count($pieces) > 1) ? $pieces[1] : $item_id_or_number_or_item_kit_or_receipt;
 			$item_kit_info = $this->Item_kit->get_info($item_kit_id);
 			$kit_item_id = $item_kit_info->kit_item_id;
 			$kit_price_option = $item_kit_info->price_option;
 			$kit_print_option = $item_kit_info->print_option; // 0-all, 1-priced, 2-kit-only
 
-			if($item_kit_info->kit_discount != 0 && $item_kit_info->kit_discount > $discount)
+			if($discount_type == $item_kit_info->kit_discount_type)
+			{
+				if($item_kit_info->kit_discount > $discount)
+				{
+					$discount = $item_kit_info->kit_discount;
+				}
+			}
+			else
 			{
 				$discount = $item_kit_info->kit_discount;
 				$discount_type = $item_kit_info->kit_discount_type;
 			}
 
-			$price = NULL;
 			$print_option = PRINT_ALL; // Always include in list of items on invoice
 
 			if(!empty($kit_item_id))
 			{
-				if(!$this->sale_lib->add_item($kit_item_id, $quantity, $item_location, $discount, $discount_type, PRICE_MODE_STANDARD))
+				if(!$this->sale_lib->add_item($kit_item_id, $quantity, $item_location, $discount, $discount_type, PRICE_MODE_KIT, $kit_price_option, $kit_print_option, $price))
 				{
 					$data['error'] = $this->lang->line('sales_unable_to_add_item');
 				}
@@ -451,7 +458,7 @@ class Sales extends Secure_Controller
 		}
 		else
 		{
-			if(!$this->sale_lib->add_item($item_id_or_number_or_item_kit_or_receipt, $quantity, $item_location, $discount, $discount_type, PRICE_MODE_STANDARD))
+			if(!$this->sale_lib->add_item($item_id_or_number_or_item_kit_or_receipt, $quantity, $item_location, $discount, $discount_type, PRICE_MODE_STANDARD, NULL, NULL, $price))
 			{
 				$data['error'] = $this->lang->line('sales_unable_to_add_item');
 			}
@@ -460,6 +467,7 @@ class Sales extends Secure_Controller
 				$data['warning'] = $this->sale_lib->out_of_stock($item_id_or_number_or_item_kit_or_receipt, $item_location);
 			}
 		}
+
 		$this->_reload($data);
 	}
 
@@ -474,9 +482,9 @@ class Sales extends Secure_Controller
 		$description = $this->input->post('description');
 		$serialnumber = $this->input->post('serialnumber');
 		$price = parse_decimals($this->input->post('price'));
-		$quantity = parse_decimals($this->input->post('quantity'));
-		$discount = parse_decimals($this->input->post('discount'));
+		$quantity = parse_quantity($this->input->post('quantity'));
 		$discount_type = $this->input->post('discount_type');
+		$discount = $discount_type ? parse_quantity($this->input->post('discount')) : parse_decimals($this->input->post('discount'));
 
 		$item_location = $this->input->post('location');
 		$discounted_total = $this->input->post('discounted_total') != '' ? $this->input->post('discounted_total') : NULL;
@@ -484,6 +492,8 @@ class Sales extends Secure_Controller
 		if($this->form_validation->run() != FALSE)
 		{
 			$this->sale_lib->edit_item($item_id, $description, $serialnumber, $quantity, $discount, $discount_type, $price, $discounted_total);
+			
+			$this->sale_lib->empty_payments();
 		}
 		else
 		{
@@ -499,6 +509,8 @@ class Sales extends Secure_Controller
 	{
 		$this->sale_lib->delete_item($item_number);
 
+		$this->sale_lib->empty_payments();		
+
 		$this->_reload();
 	}
 
@@ -553,7 +565,6 @@ class Sales extends Secure_Controller
 		$data['price_work_orders'] = $this->sale_lib->is_price_work_orders();
 		$data['email_receipt'] = $this->sale_lib->is_email_receipt();
 		$customer_id = $this->sale_lib->get_customer();
-		$invoice_number_enabled = $this->sale_lib->get_invoice_number_enabled();
 		$invoice_number = $this->sale_lib->get_invoice_number();
 		$data["invoice_number"] = $invoice_number;
 		$work_order_number = $this->sale_lib->get_work_order_number();
@@ -578,22 +589,22 @@ class Sales extends Secure_Controller
 		$data['payments_total'] = $totals['payment_total'];
 		$data['payments_cover_total'] = $totals['payments_cover_total'];
 		$data['cash_rounding'] = $this->session->userdata('cash_rounding');
+		$data['cash_mode'] = $this->session->userdata('cash_mode');
 		$data['prediscount_subtotal'] = $totals['prediscount_subtotal'];
 		$data['cash_total'] = $totals['cash_total'];
 		$data['non_cash_total'] = $totals['total'];
 		$data['cash_amount_due'] = $totals['cash_amount_due'];
 		$data['non_cash_amount_due'] = $totals['amount_due'];
 
-		if($data['cash_rounding'])
+		if($data['cash_mode'])
 		{
-			$data['total'] = $totals['cash_total'];
 			$data['amount_due'] = $totals['cash_amount_due'];
 		}
 		else
 		{
-			$data['total'] = $totals['total'];
 			$data['amount_due'] = $totals['amount_due'];
 		}
+
 		$data['amount_change'] = $data['amount_due'] * -1;
 
 		if($data['amount_change'] > 0)
@@ -613,56 +624,21 @@ class Sales extends Secure_Controller
 
 		$data['print_price_info'] = TRUE;
 
-		$override_invoice_number = NULL;
+		if($this->sale_lib->is_invoice_mode())
+		{
+			$invoice_format = $this->config->item('sales_invoice_format');
 
-		if($this->sale_lib->is_sale_by_receipt_mode() && $invoice_number_enabled )
-		{
-			$pos_invoice = TRUE;
-			$candidate_invoice_number = $invoice_number;
-			if($candidate_invoice_number != NULL && strlen($candidate_invoice_number) > 3)
-			{
-				if(strpos($candidate_invoice_number, '{') == FALSE)
-				{
-					$override_invoice_number = $candidate_invoice_number;
-				}
-			}
-		}
-		else
-		{
-			$pos_invoice = FALSE;
-		}
-
-		if($this->sale_lib->is_invoice_mode() || $pos_invoice)
-		{
 			// generate final invoice number (if using the invoice in sales by receipt mode then the invoice number can be manually entered or altered in some way
-			if($pos_invoice)
+			if(!empty($invoice_format) && $invoice_number == NULL)
 			{
 				// The user can retain the default encoded format or can manually override it.  It still passes through the rendering step.
-				$this->sale_lib->set_invoice_number($this->input->post('invoice_number'), $keep_custom = TRUE);
-				$invoice_format = $this->sale_lib->get_invoice_number();
-				// If the user blanks out the invoice number and doesn't put anything in there then revert back to the default format encoding
-				if(empty($invoice_format))
-				{
-					$invoice_format = $this->config->item('sales_invoice_format');
-				}
-			}
-			else
-			{
-				$invoice_format = $this->config->item('sales_invoice_format');
-			}
-
-			if($override_invoice_number == NULL)
-			{
 				$invoice_number = $this->token_lib->render($invoice_format);
 			}
-			else
-			{
-				$invoice_number = $override_invoice_number;
-			}
+
 
 			if($sale_id == -1 && $this->Sale->check_invoice_number_exists($invoice_number))
 			{
-				$data['error'] = $this->lang->line('sales_invoice_number_duplicate');
+				$data['error'] = $this->lang->line('sales_invoice_number_duplicate', $invoice_number);
 				$this->_reload($data);
 			}
 			else
@@ -826,9 +802,11 @@ class Sales extends Secure_Controller
 				new Token_invoice_count('POS ' . $sale_data['sale_id']),
 				new Token_customer((object)$sale_data));
 			$text = $this->token_lib->render($text, $tokens);
+			$sale_data['mimetype'] = get_mime_by_extension('uploads/' . $this->config->item('company_logo'));
 
 			// generate email attachment: invoice in pdf format
 			$html = $this->load->view("sales/" . $type . "_email", $sale_data, TRUE);
+
 			// load pdf helper
 			$this->load->helper(array('dompdf', 'file'));
 			$filename = sys_get_temp_dir() . '/' . $this->lang->line("sales_" . $type) . '-' . str_replace('/', '-', $number) . '.pdf';
@@ -945,7 +923,9 @@ class Sales extends Secure_Controller
 	private function _load_sale_data($sale_id)
 	{
 		$this->sale_lib->clear_all();
-		$this->sale_lib->reset_cash_flags();
+		$cash_rounding = $this->sale_lib->reset_cash_rounding();
+		$data['cash_rounding'] = $cash_rounding;
+
 		$sale_info = $this->Sale->get_info($sale_id)->row_array();
 		$this->sale_lib->copy_entire_sale($sale_id);
 		$data = array();
@@ -953,7 +933,7 @@ class Sales extends Secure_Controller
 		$data['payments'] = $this->sale_lib->get_payments();
 		$data['selected_payment_type'] = $this->sale_lib->get_payment_type();
 
-		$tax_details = $this->tax_lib->get_taxes($data['cart']);
+		$tax_details = $this->tax_lib->get_taxes($data['cart'], $sale_id);
 		$data['taxes'] = $this->Sale->get_sales_taxes($sale_id);
 		$data['discount'] = $this->sale_lib->get_discount();
 		$data['transaction_time'] = to_datetime(strtotime($sale_info['sale_time']));
@@ -964,18 +944,18 @@ class Sales extends Secure_Controller
 
 		// Returns 'subtotal', 'total', 'cash_total', 'payment_total', 'amount_due', 'cash_amount_due', 'payments_cover_total'
 		$totals = $this->sale_lib->get_totals($tax_details[0]);
+		$this->session->set_userdata('cash_adjustment_amount', $totals['cash_adjustment_amount']);
 		$data['subtotal'] = $totals['subtotal'];
-		$data['total'] = $totals['total'];
 		$data['payments_total'] = $totals['payment_total'];
 		$data['payments_cover_total'] = $totals['payments_cover_total'];
-		$data['cash_rounding'] = $this->session->userdata('cash_rounding');
+		$data['cash_mode'] = $this->session->userdata('cash_mode');
 		$data['prediscount_subtotal'] = $totals['prediscount_subtotal'];
 		$data['cash_total'] = $totals['cash_total'];
 		$data['non_cash_total'] = $totals['total'];
 		$data['cash_amount_due'] = $totals['cash_amount_due'];
 		$data['non_cash_amount_due'] = $totals['amount_due'];
 
-		if($this->session->userdata('cash_rounding'))
+		if($data['cash_mode'] && ($data['selected_payment_type'] === $this->lang->line('sales_cash') || $data['payments_total'] > 0))
 		{
 			$data['total'] = $totals['cash_total'];
 			$data['amount_due'] = $totals['cash_amount_due'];
@@ -985,6 +965,7 @@ class Sales extends Secure_Controller
 			$data['total'] = $totals['total'];
 			$data['amount_due'] = $totals['amount_due'];
 		}
+
 		$data['amount_change'] = $data['amount_due'] * -1;
 
 		$employee_info = $this->Employee->get_info($this->sale_lib->get_employee());
@@ -1042,8 +1023,8 @@ class Sales extends Secure_Controller
 		}
 
 		$invoice_type = $this->config->item('invoice_type');
-
 		$data['invoice_view'] = $invoice_type;
+
 		return $this->xss_clean($data);
 	}
 
@@ -1055,6 +1036,11 @@ class Sales extends Secure_Controller
 			$sale_id = -1;
 			$this->session->set_userdata('sale_id', -1);
 		}
+		$cash_rounding = $this->sale_lib->reset_cash_rounding();
+
+		// cash_rounding indicates only that the site is configured for cash rounding
+		$data['cash_rounding'] = $cash_rounding;
+
 		$data['cart'] = $this->sale_lib->get_cart();
 		$customer_info = $this->_load_customer_data($this->sale_lib->get_customer(), $data, TRUE);
 
@@ -1069,25 +1055,29 @@ class Sales extends Secure_Controller
 		$data['taxes'] = $tax_details[0];
 		$data['discount'] = $this->sale_lib->get_discount();
 		$data['payments'] = $this->sale_lib->get_payments();
-		// sale_type (0=pos, 1=invoice, 2=work order, 3=quote, 4=return)
-		$sale_type = $this->sale_lib->get_sale_type();
 
 		// Returns 'subtotal', 'total', 'cash_total', 'payment_total', 'amount_due', 'cash_amount_due', 'payments_cover_total'
 		$totals = $this->sale_lib->get_totals($tax_details[0]);
+
 		$data['item_count'] = $totals['item_count'];
 		$data['total_units'] = $totals['total_units'];
 		$data['subtotal'] = $totals['subtotal'];
 		$data['total'] = $totals['total'];
 		$data['payments_total'] = $totals['payment_total'];
 		$data['payments_cover_total'] = $totals['payments_cover_total'];
-		$data['cash_rounding'] = $this->session->userdata('cash_rounding');
+
+		// cash_mode indicates whether this sale is going to be processed using cash_rounding
+		$cash_mode = $this->session->userdata('cash_mode');
+		$data['cash_mode'] = $cash_mode;
 		$data['prediscount_subtotal'] = $totals['prediscount_subtotal'];
 		$data['cash_total'] = $totals['cash_total'];
 		$data['non_cash_total'] = $totals['total'];
 		$data['cash_amount_due'] = $totals['cash_amount_due'];
 		$data['non_cash_amount_due'] = $totals['amount_due'];
 
-		if($data['cash_rounding'])
+		$data['selected_payment_type'] = $this->sale_lib->get_payment_type();
+
+		if($data['cash_mode'] && ($data['selected_payment_type'] == $this->lang->line('sales_cash') || $data['payments_total'] > 0))
 		{
 			$data['total'] = $totals['cash_total'];
 			$data['amount_due'] = $totals['cash_amount_due'];
@@ -1097,11 +1087,12 @@ class Sales extends Secure_Controller
 			$data['total'] = $totals['total'];
 			$data['amount_due'] = $totals['amount_due'];
 		}
+
 		$data['amount_change'] = $data['amount_due'] * -1;
 
 		$data['comment'] = $this->sale_lib->get_comment();
 		$data['email_receipt'] = $this->sale_lib->is_email_receipt();
-		$data['selected_payment_type'] = $this->sale_lib->get_payment_type();
+
 		if($customer_info && $this->config->item('customer_reward_enable') == TRUE)
 		{
 			$data['payment_options'] = $this->Sale->get_payment_options(TRUE, TRUE);
@@ -1112,14 +1103,17 @@ class Sales extends Secure_Controller
 		}
 
 		$data['items_module_allowed'] = $this->Employee->has_grant('items', $this->Employee->get_logged_in_employee_info()->person_id);
+		$data['change_price'] = $this->Employee->has_grant('sales_change_price', $this->Employee->get_logged_in_employee_info()->person_id);
 
-		$invoice_format = $this->config->item('sales_invoice_format');
-		$data['invoice_format'] = $invoice_format;
+		$invoice_number = $this->sale_lib->get_invoice_number();
 
-		$this->set_invoice_number($invoice_format);
-		$data['invoice_number'] = $invoice_format;
+		if ($this->sale_lib->get_invoice_number() == NULL)
+		{
+			$invoice_number = $this->config->item('sales_invoice_format');
+		}
+
+		$data['invoice_number'] = $invoice_number;
 
-		$data['invoice_number_enabled'] = $this->sale_lib->is_invoice_mode();
 		$data['print_after_sale'] = $this->sale_lib->is_print_after_sale();
 		$data['price_work_orders'] = $this->sale_lib->is_price_work_orders();
 
@@ -1178,23 +1172,15 @@ class Sales extends Secure_Controller
 	{
 		$data = array();
 
-		$data['employees'] = array();
-		foreach($this->Employee->get_all()->result() as $employee)
-		{
-			foreach(get_object_vars($employee) as $property => $value)
-			{
-				$employee->$property = $this->xss_clean($value);
-			}
-
-			$data['employees'][$employee->person_id] = $employee->first_name . ' ' . $employee->last_name;
-		}
-
 		$sale_info = $this->xss_clean($this->Sale->get_info($sale_id)->row_array());
-		$data['selected_customer_name'] = $sale_info['customer_name'];
 		$data['selected_customer_id'] = $sale_info['customer_id'];
+		$data['selected_customer_name'] = $sale_info['customer_name'];
+		$employee_info = $this->Employee->get_info($sale_info['employee_id']);
+		$data['selected_employee_id'] = $sale_info['employee_id'];
+		$data['selected_employee_name'] = $this->xss_clean($employee_info->first_name . ' ' . $employee_info->last_name);
 		$data['sale_info'] = $sale_info;
-		$balance_due = $sale_info['amount_due'] - $sale_info['amount_tendered'];
-		if($balance_due < 0)
+		$balance_due = round($sale_info['amount_due'] - $sale_info['amount_tendered'] + $sale_info['cash_refund'], totals_decimals(), PHP_ROUND_HALF_UP);
+		if(!$this->sale_lib->reset_cash_rounding() && $balance_due < 0)
 		{
 			$balance_due = 0;
 		}
@@ -1215,12 +1201,19 @@ class Sales extends Secure_Controller
 		$data['balance_due'] = $balance_due != 0;
 
 		// don't allow gift card to be a payment option in a sale transaction edit because it's a complex change
-		$data['payment_options'] = $this->xss_clean($this->Sale->get_payment_options(FALSE));
+		$payment_options = $this->Sale->get_payment_options(FALSE);
+
+		if($this->sale_lib->reset_cash_rounding())
+		{
+			$payment_options[$this->lang->line('sales_cash_adjustment')] = $this->lang->line('sales_cash_adjustment');
+		}
+
+		$data['payment_options'] = $this->xss_clean($payment_options);
 
 		// Set up a slightly modified list of payment types for new payment entry
-		$new_payment_options = $this->Sale->get_payment_options(FALSE);
-		$new_payment_options["--"] = $this->lang->line('common_none_selected_text');
-		$data['new_payment_options'] = $this->xss_clean($new_payment_options);
+		$payment_options["--"] = $this->lang->line('common_none_selected_text');
+
+		$data['new_payment_options'] = $this->xss_clean($payment_options);
 
 		$this->load->view('sales/form', $data);
 	}
@@ -1286,29 +1279,57 @@ class Sales extends Secure_Controller
 		$employee_id = $this->Employee->get_logged_in_employee_info()->person_id;
 
 		$date_formatter = date_create_from_format($this->config->item('dateformat') . ' ' . $this->config->item('timeformat'), $newdate);
+		$sale_time = $date_formatter->format('Y-m-d H:i:s');
 
 		$sale_data = array(
-			'sale_time' => $date_formatter->format('Y-m-d H:i:s'),
+			'sale_time' => $sale_time,
 			'customer_id' => $this->input->post('customer_id') != '' ? $this->input->post('customer_id') : NULL,
-			'employee_id' => $this->input->post('employee_id'),
+			'employee_id' => $this->input->post('employee_id') != '' ? $this->input->post('employee_id') : NULL,
 			'comment' => $this->input->post('comment'),
 			'invoice_number' => $this->input->post('invoice_number') != '' ? $this->input->post('invoice_number') : NULL
 		);
 
 		// In order to maintain tradition the only element that can change on prior payments is the payment type
 		$payments = array();
+		$amount_tendered = 0;
 		$number_of_payments = $this->input->post('number_of_payments');
 		for($i = 0; $i < $number_of_payments; ++$i)
 		{
 			$payment_id = $this->input->post('payment_id_' . $i);
-			$payment_amount = $this->input->post('payment_amount_' . $i);
 			$payment_type = $this->input->post('payment_type_' . $i);
-			$cash_refund = 0.00;
+			$payment_amount = $this->input->post('payment_amount_' . $i);
+			$refund_type = $this->input->post('refund_type_' . $i);
+			$cash_refund = $this->input->post('refund_amount_' . $i);
 
-			// To maintain tradition we will also delete any payments with 0 amount assuming these are mistakes
-			// introduced at sale time.  This is now done in Sale.php
+			if($payment_type == $this->lang->line('sales_cash_adjustment'))
+			{
+				$cash_adjustment = CASH_ADJUSTMENT_TRUE;
+			}
+			else
+			{
+				$cash_adjustment = CASH_ADJUSTMENT_FALSE;
+			}
 
-			$payments[] = array('payment_id' => $payment_id, 'payment_type' => $payment_type, 'payment_amount' => $payment_amount, 'cash_refund' => $cash_refund, 'employee_id' => $employee_id);
+			if(!$cash_adjustment)
+			{
+				$amount_tendered += $payment_amount - $cash_refund;
+			}
+
+			// if the refund is not cash ...
+			if(empty(strstr($refund_type, $this->lang->line('sales_cash'))))
+			{
+				// ... and it's positive ...
+				if($cash_refund > 0)
+				{
+					// ... change it to be a new negative payment (a "non-cash refund")
+					$payment_type = $refund_type;
+					$payment_amount = $payment_amount - $cash_refund;
+					$cash_refund = 0.00;
+				}
+			}
+
+
+			$payments[] = array('payment_id' => $payment_id, 'payment_type' => $payment_type, 'payment_amount' => $payment_amount, 'cash_refund' => $cash_refund, 'cash_adjustment' => $cash_adjustment,  'employee_id' => $employee_id);
 		}
 
 		$payment_id = -1;
@@ -1317,9 +1338,27 @@ class Sales extends Secure_Controller
 
 		if($payment_type != PAYMENT_TYPE_UNASSIGNED && $payment_amount <> 0)
 		{
-			$payments[] = array('payment_id' => $payment_id, 'payment_type' => $payment_type, 'payment_amount' => $payment_amount, 'cash_refund' => 0.00, 'employee_id' => $employee_id);
+			$cash_refund = 0;
+			if($payment_type == $this->lang->line('sales_cash_adjustment'))
+			{
+				$cash_adjustment = CASH_ADJUSTMENT_TRUE;
+			}
+			else
+			{
+				$cash_adjustment = CASH_ADJUSTMENT_FALSE;
+				$amount_tendered += $payment_amount;
+				$sale_info = $this->Sale->get_info($sale_id)->row_array();
+
+				if($amount_tendered > $sale_info['amount_due'])
+				{
+					$cash_refund = $amount_tendered - $sale_info['amount_due'];
+				}
+			}
+
+			$payments[] = array('payment_id' => $payment_id, 'payment_type' => $payment_type, 'payment_amount' => $payment_amount, 'cash_refund' => $cash_refund, 'cash_adjustment' => $cash_adjustment, 'employee_id' => $employee_id);
 		}
 
+		$this->Inventory->update('POS '.$sale_id, ['trans_date' => $sale_time]);
 		if($this->Sale->update($sale_id, $sale_data, $payments))
 		{
 			echo json_encode(array('success' => TRUE, 'message' => $this->lang->line('sales_successfully_updated'), 'id' => $sale_id));
@@ -1411,6 +1450,7 @@ class Sales extends Secure_Controller
 		}
 
 		$this->sale_lib->clear_all();
+
 		$this->_reload($data);
 	}
 
@@ -1419,14 +1459,13 @@ class Sales extends Secure_Controller
 	 */
 	public function suspended()
 	{
-		$customer_id = $this->sale_lib->get_customer();
 		$data = array();
+		$customer_id = $this->sale_lib->get_customer();
 		$data['suspended_sales'] = $this->xss_clean($this->Sale->get_all_suspended($customer_id));
-		$data['dinner_table_enable'] = $this->config->item('dinner_table_enable');
 		$this->load->view('sales/suspended', $data);
 	}
 
-	/*
+	/**
 	 * Unsuspended sales are now left in the tables and are only removed
 	 * when they are intentionally cancelled.
 	 */
@@ -1445,6 +1484,11 @@ class Sales extends Secure_Controller
 
 		$this->_reload();
 	}
+	
+	public function sales_keyboard_help()
+	{
+		$this->load->view('sales/help');
+	}
 
 	public function check_invoice_number()
 	{
@@ -1514,7 +1558,7 @@ class Sales extends Secure_Controller
 		$this->sale_lib->set_cart($cart);
 	}
 
-	function search_cart_for_item_id($id, $array)
+	public function search_cart_for_item_id($id, $array)
 	{
 		foreach($array as $key => $val)
 		{
@@ -1523,6 +1567,7 @@ class Sales extends Secure_Controller
 				return $key;
 			}
 		}
+
 		return NULL;
 	}
 }

application/controllers/Suppliers.php

@@ -22,6 +22,7 @@ class Suppliers extends Persons
 	public function get_row($row_id)
 	{
 		$data_row = $this->xss_clean(get_supplier_data_row($this->Supplier->get_info($row_id)));
+		$data_row['category'] = $this->Supplier->get_category_name($data_row['category']);
 
 		echo json_encode($data_row);
 	}

application/controllers/Taxes.php

@@ -354,7 +354,7 @@ class Taxes extends Secure_Controller
 	public function save($tax_rate_id = -1)
 	{
 		$tax_category_id = $this->input->post('rate_tax_category_id');
-		$tax_rate = parse_decimals($this->input->post('tax_rate'));
+		$tax_rate = parse_tax($this->input->post('tax_rate'));
 
 		if ($tax_rate == 0) {
 			$tax_category_info = $this->Tax_category->get_info($tax_category_id);
@@ -443,6 +443,8 @@ class Taxes extends Secure_Controller
 
 		$array_save = array();
 
+		$unique_tax_groups = [];
+
 		foreach($jurisdiction_id as $key => $val)
 		{
 			$array_save[] = array(
@@ -453,6 +455,19 @@ class Taxes extends Secure_Controller
 				'reporting_authority'=>$this->xss_clean($reporting_authority[$key]),
 				'tax_group_sequence'=>$this->xss_clean($tax_group_sequence[$key]),
 				'cascade_sequence'=>$this->xss_clean($cascade_sequence[$key]));
+
+			if (array_search($tax_group[$key], $unique_tax_groups) !== false)
+			{
+				echo json_encode(array(
+					'success' => FALSE,
+					'message' => $this->lang->line('taxes_tax_group_not_unique', $tax_group[$key])
+				));
+				return;
+			}
+			else
+			{
+				$unique_tax_groups[] = $tax_group[$key];
+			}
 		}
 
 		$success = $this->Tax_jurisdiction->save_jurisdictions($array_save);

application/core/MY_Lang.php

@@ -10,10 +10,17 @@ class MY_Lang extends CI_Lang
             $CI->config->set_item('language', $idiom);
             $loaded = $this->is_loaded;
             $this->is_loaded = array();
-                
+
             foreach($loaded as $file)
             {
-                $this->load(strtr($file, '', '_lang.php'));
+                $filename = strtr($file, '', '_lang.php');
+                $this->load($filename, 'english');
+                $array = $this->load($filename, $idiom, TRUE);
+                foreach($array as $lang_key => $lang_value) {
+                    if ($lang_value != '') {
+                        $this->language[$lang_key] = $lang_value;
+                    }
+                }
             }
         }
     }

application/core/MY_Security.php

@@ -0,0 +1,57 @@
+<?php
+defined('BASEPATH') or exit('No direct script access allowed');
+
+class MY_Security extends CI_Security
+{
+    /**
+     * CSRF Set Cookie with samesite
+     *
+     * @codeCoverageIgnore
+     * @return  CI_Security
+     */
+    public function csrf_set_cookie()
+    {
+        $expire = time() + $this->_csrf_expire;
+        $secure_cookie = (bool)config_item('cookie_secure');
+
+        if ($secure_cookie && !is_https())
+        {
+            return FALSE;
+        }
+
+        $path = config_item('cookie_path');
+
+        if (PHP_VERSION_ID < 70300) {
+
+            if (is_https())
+            {
+                $path .= '; samesite=strict';
+            }
+
+            setcookie($this->_csrf_cookie_name,
+                $this->_csrf_hash, $expire,
+                $path,
+                config_item('cookie_domain'),
+                $secure_cookie,
+                FALSE);
+        }
+        else
+        {
+            $samesite = is_https() ? 'None' : 'Strict';
+
+            setcookie($this->_csrf_cookie_name,
+                $this->_csrf_hash,
+                ['samesite' => $samesite,
+                    'secure' => $secure_cookie,
+                    'expires' => $expire,
+                    'path' => config_item('cookie_path'),
+                    'domain' => config_item('cookie_domain'),
+                    'httponly' => FALSE]);
+        }
+
+
+        log_message('info', 'CSRF cookie sent');
+
+        return $this;
+    }
+}

application/helpers/dompdf_helper.php

@@ -7,22 +7,10 @@
 function create_pdf($html, $filename = '')
 {
     // need to enable magic quotes for the
-    $magic_quotes_enabled = get_magic_quotes_runtime();
-
-    if(!$magic_quotes_enabled)
-    {
-    	ini_set('magic_quotes_runtime', TRUE);
-    }
-
-    $dompdf = new Dompdf\Dompdf();
+    $dompdf = new Dompdf\Dompdf(array("isRemoteEnabled" => TRUE, "isPhpEnabled" => TRUE));
     $dompdf->loadHtml(str_replace(array("\n", "\r"), '', $html));
     $dompdf->render();
-
-    if(!$magic_quotes_enabled)
-    {
-		ini_set('magic_quotes_runtime', $magic_quotes_enabled);
-	}
-
+    
     if($filename != '')
     {
         $dompdf->stream($filename . '.pdf');

application/helpers/importfile_helper.php

@@ -1,77 +1,93 @@
 <?php if (!defined('BASEPATH')) exit('No direct script access allowed');
 
-/**
- * Generates the header content for the import_items.csv file
- *
- * @return	string						Comma separated headers for the CSV file
- */
 function generate_import_items_csv($stock_locations,$attributes)
 {
-	$csv_headers = pack("CCC",0xef,0xbb,0xbf);	//Encode the Byte-Order Mark (BOM) so that UTF-8 File headers display properly in Microsoft Excel
-	$csv_headers .= 'Barcode,"Item Name",Category,"Supplier ID","Cost Price","Unit Price","Tax 1 Name","Tax 1 Percent","Tax 2 Name","Tax 2 Percent","Reorder Level",Description,"Allow Alt Description","Item has Serial Number",item_image,HSN';
+	$csv_headers = pack('CCC',0xef,0xbb,0xbf);	//Encode the Byte-Order Mark (BOM) so that UTF-8 File headers display properly in Microsoft Excel
+	$csv_headers .= 'Id,Barcode,"Item Name",Category,"Supplier ID","Cost Price","Unit Price","Tax 1 Name","Tax 1 Percent","Tax 2 Name","Tax 2 Percent","Reorder Level",Description,"Allow Alt Description","Item has Serial Number",Image,HSN';
 	$csv_headers .= generate_stock_location_headers($stock_locations);
 	$csv_headers .= generate_attribute_headers($attributes);
-	
+
 	return $csv_headers;
 }
 
-/**
- * Generates a list of stock location names as a string
- *
- * @return string					Comma-separated list of stock location names
- */
 function generate_stock_location_headers($locations)
 {
-	$location_headers = "";
-	
-	foreach($locations as $location_id => $location_name)
+	$location_headers = '';
+
+	foreach($locations as $location_name)
 	{
 		$location_headers .= ',"location_' . $location_name . '"';
 	}
-	
+
 	return $location_headers;
 }
 
-/**
- * Generates a list of attribute names as a string
- *
- * @return string					Comma-separated list of attribute names
- */
 function generate_attribute_headers($attribute_names)
 {
-	$attribute_headers = "";
+	$attribute_headers = '';
 	unset($attribute_names[-1]);
-	
+
 	foreach($attribute_names as $attribute_name)
 	{
 		$attribute_headers .= ',"attribute_' . $attribute_name . '"';
 	}
-	
+
 	return $attribute_headers;
 }
 
-/**
- * Read the contents of a given CSV formatted file into a two-dimensional array
- *
- * @param	string				$file_name	Name of the file to read.
- * @return	boolean|array[][]				two-dimensional array with the file contents or FALSE on failure.
- */
 function get_csv_file($file_name)
 {
-	ini_set("auto_detect_line_endings", true);
-	
+//TODO: current implementation reads the entire file in.  This is memory intensive for large files.
+//We may want to rework the CSV import feature to read the file in chunks, process it and continue.
+//It must be done in a way that does not significantly negatively affect performance.
+	ini_set('auto_detect_line_endings', true);
+
+	$csv_rows = FALSE;
+
 	if(($csv_file = fopen($file_name,'r')) !== FALSE)
 	{
-		while (($data = fgetcsv($csv_file)) !== FALSE)
+		$CI =& get_instance();
+		$CI->load->helper('security');
+
+		$csv_rows = [];
+
+		//Skip Byte-Order Mark
+		if(bom_exists($csv_file) === TRUE)
 		{
-			$line_array[] = $data;
+			fseek($csv_file, 3);
 		}
+
+		$headers = fgetcsv($csv_file);
+
+		while(($row = fgetcsv($csv_file)) !== FALSE)
+		{
+			//Skip empty lines
+			if($row !== array(null))
+			{
+				$csv_rows[] = array_combine($headers, $CI->security->xss_clean($row));
+			}
+		}
+
+		fclose($csv_file);
 	}
-	else
+
+	return $csv_rows;
+}
+
+function bom_exists(&$file_handle)
+{
+	$result		= FALSE;
+	$candidate	= fread($file_handle, 3);
+
+	rewind($file_handle);
+
+	$bom = pack('CCC', 0xef, 0xbb, 0xbf);
+
+	if (0 === strncmp($candidate, $bom, 3))
 	{
-		return FALSE;
+		$result = TRUE;
 	}
-	
-	return $line_array;
+
+	return $result;
 }
 ?>

application/helpers/locale_helper.php

@@ -3,6 +3,9 @@
 const DEFAULT_LANGUAGE = 'english';
 const DEFAULT_LANGUAGE_CODE = 'en-US';
 
+define('NOW', time());
+define('MAX_PRECISION', 1e14);
+define('DEFAULT_PRECISION', 2);
 define('DEFAULT_DATE', mktime(0, 0, 0, 1, 1, 2010));
 define('DEFAULT_DATETIME', mktime(0, 0, 0, 1, 1, 2010));
 
@@ -56,7 +59,9 @@ function get_languages()
 		'ar-LB:arabic' => 'Arabic (Lebanon)',
 		'az-AZ:azerbaijani' => 'Azerbaijani (Azerbaijan)',
 		'bg:bulgarian' => 'Bulgarian',
+		'bs-BA:bosnian' => 'Bosnian',
 		'cs:czech' => 'Czech',
+		'da:danish' => 'Danish',
 		'de:german' => 'German (Germany)',
 		'de-CH:german' => 'German (Swiss)',
 		'el:greek' => 'Greek',
@@ -65,24 +70,29 @@ function get_languages()
 		'es:spanish' => 'Spanish',
 		'es-MX:spanish' => 'Spanish (Mexico)',
 		'fr:french' => 'French',
-		'he:hebrew' => 'Hebrew',
+		'fa-IR:persian' => 'Farsi (Iran)',
+		'he:english' => 'Hebrew',
 		'hr-HR:croatian' => 'Croatian (Croatia)',
 		'hu-HU:hungarian' => 'Hungarian (Hungary)',
+		'hy:armenian' => 'Armenian',
 		'id:indonesian' => 'Indonesian',
 		'it:italian' => 'Italian',
 		'km:khmer' => 'Central Khmer (Cambodia)',
 		'lo:lao' => 'Lao (Laos)',
 		'ml:malay' => 'Malay',
+		'nb:norwegian' => 'Norwegian',
 		'nl:dutch' => 'Dutch',
 		'nl-BE:dutch' => 'Dutch (Belgium)',
 		'pl:polish' => 'Polish',
-		'pt-BR:portuguese-brazilian' => 'Portuguese (Brazil)',
+		'pt-BR:portuguese' => 'Portuguese (Brazil)',
 		'ro:romanian' => 'Romanian',
 		'ru:russian' => 'Russian',
 		'sv:swedish' => 'Swedish',
+		'ta:tamil' => 'Tamil',
 		'th:thai' => 'Thai',
 		'tl-PH:talong' => 'Tagalog (Philippines)',
 		'tr:turkish' => 'Turkish',
+		'uk-UA:ukrainian' => 'Ukrainian',
 		'ur-PK:urdu' => 'Urdu (Islamic Republic of Pakistan)',
 		'vi:vietnamese' => 'Vietnamese',
 		'zh-Hans:simplified-chinese' => 'Chinese Simplified Script',
@@ -239,7 +249,7 @@ function get_payment_options()
 	$config = get_instance()->config;
 	$lang = get_instance()->lang;
 
-	$payments = array();
+	$payments = [];
 
 
 	if($config->item('payment_options_order') == 'debitcreditcash')
@@ -378,7 +388,7 @@ function to_quantity_decimals($number)
 	return to_decimals($number, 'quantity_decimals');
 }
 
-function to_decimals($number, $decimals, $type=\NumberFormatter::DECIMAL)
+function to_decimals($number, $decimals = NULL, $type=\NumberFormatter::DECIMAL)
 {
 	// ignore empty strings and return
 	// NOTE: do not change it to empty otherwise tables will show a 0 with no decimal nor currency symbol
@@ -389,8 +399,9 @@ function to_decimals($number, $decimals, $type=\NumberFormatter::DECIMAL)
 
 	$config = get_instance()->config;
 	$fmt = new \NumberFormatter($config->item('number_locale'), $type);
-	$fmt->setAttribute(\NumberFormatter::MIN_FRACTION_DIGITS, $config->item($decimals));
-	$fmt->setAttribute(\NumberFormatter::MAX_FRACTION_DIGITS, $config->item($decimals));
+	$fmt->setAttribute(\NumberFormatter::MIN_FRACTION_DIGITS, empty($decimals) ? DEFAULT_PRECISION : $config->item($decimals));
+	$fmt->setAttribute(\NumberFormatter::MAX_FRACTION_DIGITS, empty($decimals) ? DEFAULT_PRECISION : $config->item($decimals));
+
 	if(empty($config->item('thousands_separator')))
 	{
 		$fmt->setAttribute(\NumberFormatter::GROUPING_SEPARATOR_SYMBOL, '');
@@ -400,7 +411,17 @@ function to_decimals($number, $decimals, $type=\NumberFormatter::DECIMAL)
 	return $fmt->format($number);
 }
 
-function parse_decimals($number)
+function parse_quantity($number)
+{
+	return parse_decimals($number, quantity_decimals());
+}
+
+function parse_tax($number)
+{
+	return parse_decimals($number, tax_decimals());
+}
+
+function parse_decimals($number, $decimals = NULL)
 {
 	// ignore empty strings and return
 	if(empty($number))
@@ -408,10 +429,24 @@ function parse_decimals($number)
 		return $number;
 	}
 
-	$config = get_instance()->config;
-	$fmt = new \NumberFormatter($config->item('number_locale'), \NumberFormatter::DECIMAL);
+	if ($number > MAX_PRECISION)
+	{
+		return FALSE;
+	}
 
-	$fmt->setAttribute(\NumberFormatter::FRACTION_DIGITS, $config->item('currency_decimals'));
+	if ($number > 1.e14)
+	{
+		return FALSE;
+	}
+
+	$config = get_instance()->config;
+
+	if($decimals === NULL)
+	{
+		$decimals = $config->item('currency_decimals');
+	}
+
+	$fmt = new \NumberFormatter($config->item('number_locale'), \NumberFormatter::DECIMAL);
 
 	if(empty($config->item('thousands_separator')))
 	{
@@ -564,12 +599,13 @@ function dateformat_bootstrap($php_format)
 
 function valid_date($date)
 {
-	return preg_match('/^([0-9]{2,4})-([0-1][0-9])-([0-3][0-9])(?:( [0-2][0-9]):([0-5][0-9]):([0-5][0-9]))?$/', $date);
+	$config = get_instance()->Appconfig;
+	return (DateTime::createFromFormat($config->get('dateformat'), $date));
 }
 
 function valid_decimal($decimal)
 {
-	return preg_match('/^(\d*\.)?\d+$/', $decimal);
+	return (preg_match('/^(\d*\.)?\d+$/', $decimal) === 1);
 }
 
 ?>

application/helpers/migration_helper.php

@@ -9,7 +9,7 @@ function execute_script($path)
 	$CI =& get_instance();
 
 	$version = preg_replace("/(.*_)?(.*).sql/", "$2", $path);
-	error_log("Migrating to $version");
+	error_log("Migrating to $version (file: $path)");
 
 	$sql = file_get_contents($path);
 

application/helpers/tabular_helper.php

@@ -147,27 +147,20 @@ function get_sale_data_last_row($sales)
 /*
 Get the sales payments summary
 */
-function get_sales_manage_payments_summary($payments, $sales)
+function get_sales_manage_payments_summary($payments)
 {
 	$CI =& get_instance();
 
 	$table = '<div id="report_summary">';
+	$total = 0;
 
 	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->result_array() as $key=>$sale)
-			{
-				$amount -= $sale['change_due'];
-			}
-		}
+		$total = bcadd($total, $amount);
 		$table .= '<div class="summary_row">' . $payment['payment_type'] . ': ' . to_currency($amount) . '</div>';
 	}
+	$table .= '<div class="summary_row">' . $CI->lang->line('sales_total') . ': ' . to_currency($total) . '</div>';
 	$table .= '</div>';
 
 	return $table;
@@ -354,7 +347,7 @@ function get_items_manage_table_headers()
 
 	foreach($definition_names as $definition_id => $definition_name)
 	{
-		$headers[] = array($definition_id => $definition_name);
+		$headers[] = array($definition_id => $definition_name, 'sortable' => FALSE);
 	}
 
 	$headers[] = array('inventory' => '');
@@ -503,6 +496,7 @@ function get_item_kits_manage_table_headers()
 
 	$headers = array(
 		array('item_kit_id' => $CI->lang->line('item_kits_kit')),
+		array('item_kit_number' => $CI->lang->line('item_kits_item_kit_number')),
 		array('name' => $CI->lang->line('item_kits_name')),
 		array('description' => $CI->lang->line('item_kits_description')),
 		array('total_cost_price' => $CI->lang->line('items_cost_price'), 'sortable' => FALSE),
@@ -523,6 +517,7 @@ function get_item_kit_data_row($item_kit)
 
 	return array (
 		'item_kit_id' => $item_kit->item_kit_id,
+		'item_kit_number' => $item_kit->item_kit_number,
 		'name' => $item_kit->name,
 		'description' => $item_kit->description,
 		'total_cost_price' => to_currency($item_kit->total_cost_price),

application/hooks/load_config.php

@@ -26,8 +26,8 @@ function load_config()
         $CI->config->set_item('language_code', 'en-US');
     }
 
-    _load_language_files($CI, '../vendor/codeigniter/framework/system/language', current_language());
-    _load_language_files($CI, '../application/language', current_language_code());
+    _load_language_files($CI, '../vendor/codeigniter/framework/system/language', current_language(), FALSE);
+    _load_language_files($CI, '../application/language', current_language_code(), TRUE);
 
     //Set timezone from config database
     if($CI->config->item('timezone'))
@@ -46,16 +46,33 @@ function load_config()
  * @param $CI
  * @param $path
  * @param $language
+ * @param $fallback
  */
-function _load_language_files($CI, $path, $language)
+function _load_language_files($CI, $path, $language, $fallback)
 {
     $map = directory_map($path . DIRECTORY_SEPARATOR . $language);
 
     foreach($map as $file)
 	{
+
         if(!is_array($file) && substr(strrchr($file, '.'), 1) == 'php')
 		{
-            $CI->lang->load(strtr($file, '', '_lang.php'), $language);
+            $filename = strtr($file, '', '_lang.php');
+            if ($fallback) {
+                $CI->lang->load($filename, 'en-US');
+
+                $array = $CI->lang->load($filename, $language, TRUE);
+                foreach($array as $lang_key => $lang_value) {
+                    if ($lang_value !== '') {
+                        $CI->lang->language[$lang_key] = $lang_value;
+                    }
+                }
+            }
+            else
+            {
+                $CI->lang->load($filename, $language);
+            }
+
         }
     }
 }

application/hooks/method_hook.php

@@ -0,0 +1,16 @@
+<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed');
+
+function validate_method()
+{
+
+    $url = $_SERVER['REQUEST_URI'];
+
+    $post_required = preg_match('/(save|delete*|remove*)\/?\d*?/', $url);
+
+    if($post_required && $_SERVER["REQUEST_METHOD"] != "POST" && empty($_POST))
+    {
+        echo "Method not allowed";
+        die;
+    }
+
+}

application/language/ar-EG/cashups_lang.php

@@ -3,23 +3,31 @@
 $lang["cashups_amount"] = "قيمة المبلغ";
 $lang["cashups_amount_number"] = "قيمة المبلغ يجب ان تتكون من ارقام";
 $lang["cashups_amount_required"] = "قيمة المبلغ هي خانة إجبارية.";
+$lang["cashups_cancel_cashups"] = "";
+$lang["cashups_cancel_cashups_enter"] = "";
 $lang["cashups_cannot_be_deleted"] = "لا يمكن حذف الصندوق النقدي";
+$lang["cashups_cash_difference"] = "";
 $lang["cashups_close_date"] = "تاريخ تسكير الصندوق";
 $lang["cashups_close_employee"] = "تم التسكير من قبل";
 $lang["cashups_closed_amount_card"] = "بطاقات ائتمان";
 $lang["cashups_closed_amount_cash"] = "الصندوق النقدي";
 $lang["cashups_closed_amount_check"] = "شيكات";
 $lang["cashups_closed_amount_due"] = "الديون";
+$lang["cashups_closed_amount_giftcard"] = "";
 $lang["cashups_closed_amount_total"] = "المجموع";
 $lang["cashups_closed_date"] = "تاريخ تسكير الصندوق";
 $lang["cashups_confirm_delete"] = "هل انت متأكد من حذف الصندوق النقدي؟";
 $lang["cashups_confirm_restore"] = "هل انت متأكد من استعادة الصندوق النقدي؟";
+$lang["cashups_confirm_submit"] = "";
 $lang["cashups_date_number"] = "التاريخ يجب ان يكون مكون من ارقام";
 $lang["cashups_date_required"] = "التاريخ هي خانة اجبارية";
 $lang["cashups_description"] = "الوصف";
+$lang["cashups_enable_expected"] = "";
 $lang["cashups_error_adding_updating"] = "خطأ في تعديل او اضافة صندوق نقدي";
+$lang["cashups_giftcard"] = "";
 $lang["cashups_id"] = "كود";
 $lang["cashups_info"] = "معلومات عن الصندوق النقدي";
+$lang["cashups_info_employee"] = "";
 $lang["cashups_is_deleted"] = "محذوف";
 $lang["cashups_new"] = "صندوق نقدي جديد";
 $lang["cashups_no_cashups_to_display"] = "لا يوجد صناديق نقدية للاظهار";
@@ -35,4 +43,6 @@ $lang["cashups_successful_deleted"] = "تم حذف الصندوق النقدي
 $lang["cashups_successful_updating"] = "تم تعديل الصندوق النقدي بنجاح";
 $lang["cashups_total"] = "المجموع";
 $lang["cashups_transfer_amount_cash"] = "حركة الصندوق";
+$lang["cashups_transfer_amount_cash_minus"] = "";
 $lang["cashups_update"] = "تعديل/تحديث الصندوق النقدي";
+$lang["cashups_warning"] = "";

application/language/ar-EG/common_lang.php

@@ -2,13 +2,18 @@
 
 $lang["common_address_1"] = "العنوان 1";
 $lang["common_address_2"] = "العنوان 2";
+$lang["common_admin"] = "";
 $lang["common_city"] = "المدينة";
+$lang["common_clerk"] = "";
 $lang["common_close"] = "إغلاق";
+$lang["common_color"] = "";
 $lang["common_comments"] = "تعليقات";
 $lang["common_common"] = "عام";
 $lang["common_confirm_search"] = "لقد قمت اختيار أكتر من سجل، سوف تفقد هذه الاختيارات عند إرسال البحث، موافق؟";
+$lang["common_copyrights"] = "© 2010 - %1";
 $lang["common_correct_errors"] = "يرجى تصحيح الأخطاء المحددة قبل الحفظ";
 $lang["common_country"] = "البلد";
+$lang["common_dashboard"] = "";
 $lang["common_date"] = "التاريخ";
 $lang["common_delete"] = "حذف";
 $lang["common_det"] = "تفاصيل";
@@ -16,20 +21,23 @@ $lang["common_download_import_template"] = "تنزيل قالب الاستيرا
 $lang["common_edit"] = "تحرير";
 $lang["common_email"] = "بريد إلكتروني";
 $lang["common_email_invalid_format"] = "شكل البريد الإلكتروني غير صحيح.";
-$lang["common_export_excel"] = "تصدير إلى اكسل";
-$lang["common_export_excel_no"] = "لا";
-$lang["common_export_excel_yes"] = "نعم";
+$lang["common_export_csv"] = "تصدير إلى اكسل";
+$lang["common_export_csv_no"] = "لا";
+$lang["common_export_csv_yes"] = "نعم";
 $lang["common_fields_required_message"] = "الحقول التي بالأحمر مطلوبة";
+$lang["common_fields_required_message_unique"] = "";
 $lang["common_first_name"] = "الاسم الأول";
 $lang["common_first_name_required"] = "الاسم الأول مطلوب.";
 $lang["common_first_page"] = "الأول";
 $lang["common_gender"] = "النوع";
 $lang["common_gender_female"] = "أنثى";
 $lang["common_gender_male"] = "ذكر";
+$lang["common_gender_undefined"] = "";
+$lang["common_icon"] = "";
 $lang["common_id"] = "كود";
 $lang["common_import"] = "استيراد";
 $lang["common_import_change_file"] = "تغيير";
-$lang["common_import_excel"] = "استيراد من اكسل";
+$lang["common_import_csv"] = "استيراد من اكسل";
 $lang["common_import_full_path"] = "المسار الكامل لملف اكسل مطلوب";
 $lang["common_import_remove_file"] = "إزالة";
 $lang["common_import_select_file"] = "اختار ملف";
@@ -39,15 +47,21 @@ $lang["common_last_name_required"] = "الاسم الأخير مطلوب.";
 $lang["common_last_page"] = "الأخيرة";
 $lang["common_learn_about_project"] = "للتعرف على أخر المعلومات حول المشروع.";
 $lang["common_list_of"] = "قائمة بـ";
+$lang["common_logo"] = "";
+$lang["common_logo_mark"] = "";
 $lang["common_logout"] = "خروج";
+$lang["common_manager"] = "";
 $lang["common_migration_needed"] = "سيبدأ ترحيل قاعدة البيانات إلى ٪1 بعد تسجيل الدخول.";
 $lang["common_new"] = "جديد";
+$lang["common_no"] = "";
 $lang["common_no_persons_to_display"] = "لا يوجد اناس لعرضهم.";
 $lang["common_none_selected_text"] = "[إختيار]";
 $lang["common_or"] = "أو";
+$lang["common_people"] = "";
 $lang["common_phone_number"] = "رقم التليفون";
 $lang["common_phone_number_required"] = "رقم التليفون مطلوب";
 $lang["common_please_visit_my"] = "برجاء زيارة";
+$lang["common_position"] = "";
 $lang["common_powered_by"] = "مدعوم بواسطة";
 $lang["common_price"] = "السعر";
 $lang["common_print"] = "طباعة";
@@ -58,6 +72,8 @@ $lang["common_return_policy"] = "سياسة الاسترجاع";
 $lang["common_search"] = "بحث";
 $lang["common_search_options"] = "خيارات البحث";
 $lang["common_searched_for"] = "بحث عن";
+$lang["common_software_short"] = "";
+$lang["common_software_title"] = "";
 $lang["common_state"] = "المحافظة";
 $lang["common_submit"] = "حفظ";
 $lang["common_total_spent"] = "مجموع الصرف";
@@ -66,5 +82,6 @@ $lang["common_view_recent_sales"] = "عرض أحدث المبيعات";
 $lang["common_website"] = "الموقع الإلكترونى";
 $lang["common_welcome"] = "مرحباً";
 $lang["common_welcome_message"] = "مرحباً فى OSPOS برجاء إختيار أى قسم للبدء.";
+$lang["common_yes"] = "";
 $lang["common_you_are_using_ospos"] = "أنت تستخدم إصدار Open Source Point Of Sale";
 $lang["common_zip"] = "الرقم البريدى";

application/language/ar-EG/config_lang.php

@@ -1,6 +1,8 @@
-<?php
+<?php 
+
 $lang["config_address"] = "عنوان الشركة";
 $lang["config_address_required"] = "عنوان الشركة مطلوب.";
+$lang["config_all_set"] = "All file permissions are set correctly!";
 $lang["config_allow_duplicate_barcodes"] = "السماح بتشابة الباركود";
 $lang["config_apostrophe"] = "الفاصلة";
 $lang["config_backup_button"] = "نسخ إحتياطى";
@@ -29,12 +31,22 @@ $lang["config_barcode_tooltip"] = "تحذير: قد تؤدي هذه الميزة
 $lang["config_barcode_type"] = "نوعية الباركود";
 $lang["config_barcode_width"] = "العرض (px)";
 $lang["config_bottom"] = "الأسفل";
+$lang["config_cash_button"] = "";
+$lang["config_cash_button_1"] = "";
+$lang["config_cash_button_2"] = "";
+$lang["config_cash_button_3"] = "";
+$lang["config_cash_button_4"] = "";
+$lang["config_cash_button_5"] = "";
+$lang["config_cash_button_6"] = "";
 $lang["config_cash_decimals"] = "فواصل النقدية";
 $lang["config_cash_decimals_tooltip"] = "إذا كانت الكسور العشرية النقدية وعشرية العملات هي نفسها ثم لن يتم تقريب النقدية.";
 $lang["config_cash_rounding"] = "التقريب النقدي";
+$lang["config_category_dropdown"] = "";
 $lang["config_center"] = "الوسط";
+$lang["config_change_apperance_tooltip"] = "";
 $lang["config_comma"] = "فاصلة";
 $lang["config_company"] = "اسم الشركة";
+$lang["config_company_avatar"] = "";
 $lang["config_company_change_image"] = "تغيير الصورة";
 $lang["config_company_logo"] = "شعار الشركة";
 $lang["config_company_remove_image"] = "إزالة الصورة";
@@ -46,6 +58,7 @@ $lang["config_country_codes_tooltip"] = "قائمة مفصولة بفاصلة ل
 $lang["config_currency_code"] = "رمز العملة";
 $lang["config_currency_decimals"] = "العلامة العشرية للعملة";
 $lang["config_currency_symbol"] = "رمز العملة";
+$lang["config_current_employee_only"] = "";
 $lang["config_customer_reward"] = "المكافآت";
 $lang["config_customer_reward_duplicate"] = "المكافئة يجب ان تكون فريدة.";
 $lang["config_customer_reward_enable"] = "تمكين مكافآت العميل";
@@ -83,6 +96,7 @@ $lang["config_default_tax_name_required"] = "اسم الضريبة الافتر
 $lang["config_default_tax_rate"] = "معدل الضريبة الافتراضي %";
 $lang["config_default_tax_rate_1"] = "معدل الضريبة 1";
 $lang["config_default_tax_rate_2"] = "معدل الضريبة 2";
+$lang["config_default_tax_rate_3"] = "";
 $lang["config_default_tax_rate_number"] = "معدل الضريبة الافتراضي يجب أن يكون رقم.";
 $lang["config_default_tax_rate_required"] = "معدل الضريبة الافتراضي مطلوب.";
 $lang["config_derive_sale_quantity"] = "السماح بأسعار البيع المشتقة";
@@ -107,9 +121,16 @@ $lang["config_email_smtp_pass"] = "كلمة سر SMTP";
 $lang["config_email_smtp_port"] = "رقم منفذ SMTP";
 $lang["config_email_smtp_timeout"] = "وقت فشل المحاولة (ثوانى) لـ SMTP";
 $lang["config_email_smtp_user"] = "اسم مستخدم SMTP";
+$lang["config_enable_avatar"] = "";
+$lang["config_enable_avatar_tooltip"] = "";
+$lang["config_enable_dropdown_tooltip"] = "";
+$lang["config_enable_new_look"] = "";
+$lang["config_enable_right_bar"] = "";
+$lang["config_enable_right_bar_tooltip"] = "";
 $lang["config_enforce_privacy"] = "فرض نظام الخصوصية";
 $lang["config_enforce_privacy_tooltip"] = "حماية ملفات ومعلومات المستخدم عند الحذف";
 $lang["config_fax"] = "الفاكس";
+$lang["config_file_perm"] = "There are problems with file permissions please fix and reload this page.";
 $lang["config_financial_year"] = "بداية السنة المالية";
 $lang["config_financial_year_apr"] = "1 أبريل";
 $lang["config_financial_year_aug"] = "1 أغسطس";
@@ -123,6 +144,7 @@ $lang["config_financial_year_may"] = "1 مايو";
 $lang["config_financial_year_nov"] = "1 نوفمبر";
 $lang["config_financial_year_oct"] = "1 أكتوبر";
 $lang["config_financial_year_sep"] = "1 سبتمبر";
+$lang["config_floating_labels"] = "";
 $lang["config_gcaptcha_enable"] = "صفحة تسجيل الدخول ريكابتشا";
 $lang["config_gcaptcha_secret_key"] = "مفتاح السرية ريكابتشا";
 $lang["config_gcaptcha_secret_key_required"] = "مفتاح السرية ريكابتشا هو حقل مطلوب";
@@ -134,9 +156,15 @@ $lang["config_general_configuration"] = "إعدادات عامة";
 $lang["config_giftcard_number"] = "رقم كارت الهدية";
 $lang["config_giftcard_random"] = "توليد عشوائي";
 $lang["config_giftcard_series"] = "توليد في السلسلة";
+$lang["config_image_allowed_file_types"] = "";
+$lang["config_image_max_height_tooltip"] = "";
+$lang["config_image_max_size_tooltip"] = "";
+$lang["config_image_max_width_tooltip"] = "";
+$lang["config_image_restrictions"] = "";
 $lang["config_include_hsn"] = "تشمل الدعم لرمز نظام منسق";
 $lang["config_info"] = "معلومات";
 $lang["config_info_configuration"] = "معلومات الشركة";
+$lang["config_input_groups"] = "";
 $lang["config_integrations"] = "التكامل";
 $lang["config_integrations_configuration"] = "تكامل";
 $lang["config_invoice"] = "الفاتورة";
@@ -146,6 +174,9 @@ $lang["config_invoice_email_message"] = "قالب البريد الإلكترو
 $lang["config_invoice_enable"] = "تفعيل الفوترة";
 $lang["config_invoice_printer"] = "طابعة الفواتير";
 $lang["config_invoice_type"] = "نوع الفاتورة";
+$lang["config_is_readable"] = "";
+$lang["config_is_writable"] = "is writable, but the permissions are higher than 750.";
+$lang["config_item_markup"] = "";
 $lang["config_jsprintsetup_required"] = "تحذير! هذه الخاصية غير المفعلة سوف تعمل فقط مع وجود الاضافة jsPrintSetup على متصفح فايرفوكس. حفظ على أى حال؟";
 $lang["config_language"] = "اللغة";
 $lang["config_last_used_invoice_number"] = "اخر رقم مستخدم للفاتورة";
@@ -164,6 +195,7 @@ $lang["config_locale_info"] = "معلومات التهيئة الإقليمية"
 $lang["config_location"] = "المخزون";
 $lang["config_location_configuration"] = "أماكن المخزون";
 $lang["config_location_info"] = "معلومات تهيئة الأماكن";
+$lang["config_login_form"] = "";
 $lang["config_logout"] = "هل تريد عمل نسخة إحتياطية قبل الخروج؟ اضغط [نعم] لعمل النسخة أو [الغاء] للخروج.";
 $lang["config_mailchimp"] = "mailchimp ميل تشامب";
 $lang["config_mailchimp_api_key"] = "mailchimp مفتاح";
@@ -183,6 +215,7 @@ $lang["config_msg_src_required"] = "مطلوب SMS-API كود المرسل لـ"
 $lang["config_msg_uid"] = "SMS-API اسم المستخدم لـ";
 $lang["config_msg_uid_required"] = "مطلوب SMS-API اسم المستخدم لـ";
 $lang["config_multi_pack_enabled"] = "رزم متعددة لكل صنف";
+$lang["config_no_risk"] = "No security/vulnerability risks.";
 $lang["config_none"] = "لايوجد";
 $lang["config_notify_alignment"] = "مكان عرض رسائل المعلومات";
 $lang["config_number_format"] = "شكل الرقم";
@@ -190,8 +223,10 @@ $lang["config_number_locale"] = "التهيئة الاقليمية";
 $lang["config_number_locale_invalid"] = "التهيئة الإقليمية المختارة غير صحية، راجع الرابط الموجود فى الملاحظة لاختيار تهيئة مناسبة.";
 $lang["config_number_locale_required"] = "رقم التهيئة الإقليمية مطلوب.";
 $lang["config_number_locale_tooltip"] = "إيجاد تهيئة إقليمية مناسبة عبر الرابط.";
+$lang["config_os_timezone"] = "";
 $lang["config_ospos_info"] = "معلومات التثبيت OSPOS";
 $lang["config_payment_options_order"] = "ترتيب خيارات الدفع";
+$lang["config_perm_risk"] = "Permissions higher than 750 leaves this software at risk.";
 $lang["config_phone"] = "هاتف الشركة";
 $lang["config_phone_required"] = "هاتف الشركة مطلوب.";
 $lang["config_print_bottom_margin"] = "الهامش السفلي";
@@ -217,8 +252,10 @@ $lang["config_print_top_margin"] = "الهامش العلوى";
 $lang["config_print_top_margin_number"] = "الهامش العلوى يجب أن يكون رقم.";
 $lang["config_print_top_margin_required"] = "الهامش العلوى مطلوب.";
 $lang["config_quantity_decimals"] = "العلامة العشرية للكمية";
+$lang["config_quick_cash_enable"] = "";
 $lang["config_quote_default_comments"] = "ملاحظات طلبات العمل الثابتة";
 $lang["config_receipt"] = "الإيصال";
+$lang["config_receipt_category"] = "";
 $lang["config_receipt_configuration"] = "إعدادات طباعة الايصالات";
 $lang["config_receipt_default"] = "افتراضى";
 $lang["config_receipt_font_size"] = "الخط";
@@ -230,12 +267,14 @@ $lang["config_receipt_short"] = "مختصر";
 $lang["config_receipt_show_company_name"] = "عرض اسم الشركة";
 $lang["config_receipt_show_description"] = "عرض الوصف";
 $lang["config_receipt_show_serialnumber"] = "عرض الرقم المسلسل";
+$lang["config_receipt_show_tax_ind"] = "";
 $lang["config_receipt_show_taxes"] = "عرض الضرائب";
 $lang["config_receipt_show_total_discount"] = "عرض إجمالى الخصم";
 $lang["config_receipt_template"] = "قالب الايصال";
 $lang["config_receiving_calculate_average_price"] = "حساب متوسط سعر الأصناف المستلمة";
 $lang["config_recv_invoice_format"] = "شكل فاتورة الإستلام";
 $lang["config_register_mode_default"] = "نمط التسجيل الافتراضي";
+$lang["config_report_an_issue"] = "";
 $lang["config_return_policy_required"] = "سياسة الإسترجاع مطلوب.";
 $lang["config_reward"] = "المكافاة";
 $lang["config_reward_configuration"] = "اعدادات المكافاة";
@@ -244,7 +283,10 @@ $lang["config_sales_invoice_format"] = "شكل فاتورة البيع";
 $lang["config_sales_quote_format"] = "شكل فاتورة عرض الاسعار";
 $lang["config_saved_successfully"] = "تم حفظ التهيئة بنجاح.";
 $lang["config_saved_unsuccessfully"] = "لم يتم حفظ التهيئة بنجاح.";
+$lang["config_security_issue"] = "Security Vulnerability Warning";
 $lang["config_server_notice"] = "يرجى استخدام المعلومات أدناه للإبلاغ عن المشكلة.";
+$lang["config_service_charge"] = "";
+$lang["config_show_due_enable"] = "";
 $lang["config_show_office_group"] = "اظهار ايكونة المكتب";
 $lang["config_statistics"] = "إرسال اﻹحصائيات";
 $lang["config_statistics_tooltip"] = "إرسال اﻹحصائيات ﻷغراض التطوير و التحسين.";
@@ -252,10 +294,13 @@ $lang["config_stock_location"] = "مكان المخزون";
 $lang["config_stock_location_duplicate"] = "من فضلك إستخدم اسم مكان غير مكرر.";
 $lang["config_stock_location_invalid_chars"] = "مكان المخزون لايمكن أن يحتوى على '_'.";
 $lang["config_stock_location_required"] = "مكان المخزون مطلوب.";
+$lang["config_suggestions_fifth_column"] = "";
 $lang["config_suggestions_first_column"] = "العامود 1";
+$lang["config_suggestions_fourth_column"] = "";
 $lang["config_suggestions_layout"] = "تخطيط اقتراحات البحث";
 $lang["config_suggestions_second_column"] = "العامود 2";
 $lang["config_suggestions_third_column"] = "العامود 3";
+$lang["config_system_conf"] = "Setup & Conf";
 $lang["config_system_info"] = "System Info";
 $lang["config_table"] = "جدول";
 $lang["config_table_configuration"] = "اعدادات الجدول";
@@ -271,10 +316,14 @@ $lang["config_tax_decimals"] = "العلامة العشرية للضريبة";
 $lang["config_tax_id"] = "الرقم الضريبي";
 $lang["config_tax_included"] = "شامل الضريبة";
 $lang["config_theme"] = "السمة";
+$lang["config_theme_preview"] = "";
 $lang["config_thousands_separator"] = "فاصل الاف";
 $lang["config_timezone"] = "المنطقة الزمنية";
+$lang["config_timezone_error"] = "";
 $lang["config_top"] = "علوى";
 $lang["config_use_destination_based_tax"] = "استخدام الضريبة المستندة على الوجهة";
+$lang["config_user_timezone"] = "";
 $lang["config_website"] = "موقع الشركة";
+$lang["config_wholesale_markup"] = "";
 $lang["config_work_order_enable"] = "تفعيل طلبات العمل";
 $lang["config_work_order_format"] = "شكل طلبات العمل";

application/language/ar-EG/customers_lang.php

@@ -3,6 +3,7 @@
 $lang["customers_account_number"] = "رقم الحساب";
 $lang["customers_account_number_duplicate"] = "رقم الحساب هذا موجود فى قاعدة البيانات من قبل.";
 $lang["customers_available_points"] = "النقاط المتاحة";
+$lang["customers_available_points_value"] = "";
 $lang["customers_average"] = "معدل الصرف";
 $lang["customers_avg_discount"] = "معدل الخصم";
 $lang["customers_basic_information"] = "معلومات الزبون";
@@ -12,6 +13,10 @@ $lang["customers_confirm_delete"] = "هل تريد حذف هؤلاء العمل
 $lang["customers_confirm_restore"] = "هل انت متأكد من إستعادة قاعدة بيانات الزبائن ؟";
 $lang["customers_consent"] = "موافقة التسجيل";
 $lang["customers_consent_required"] = "موافقة التسجيل هي خانة اجبارية.";
+$lang["customers_csv_import_failed"] = "فشل الإستيراد من اكسل";
+$lang["customers_csv_import_nodata_wrongformat"] = "الملف الذى رفعته إما فارغ أو أنه مختلف البنية.";
+$lang["customers_csv_import_partially_failed"] = "تم استيراد معظم العملاء. البعض لم يتم استيرادهم ، وهذه هى القائمة:";
+$lang["customers_csv_import_success"] = "تم استيراد العملاء بنجاح.";
 $lang["customers_customer"] = "العميل";
 $lang["customers_date"] = "التاريخ";
 $lang["customers_discount"] = "نسبة الخصم";
@@ -21,11 +26,7 @@ $lang["customers_discount_type"] = "نوع الحسم";
 $lang["customers_email_duplicate"] = "البريد الالكتروني مكرر.";
 $lang["customers_employee"] = "الموظف";
 $lang["customers_error_adding_updating"] = "خطاء فى إضافة أو تحديث العميل.";
-$lang["customers_excel_import_failed"] = "فشل الإستيراد من اكسل";
-$lang["customers_excel_import_nodata_wrongformat"] = "الملف الذى رفعته إما فارغ أو أنه مختلف البنية.";
-$lang["customers_excel_import_partially_failed"] = "تم استيراد معظم العملاء. البعض لم يتم استيرادهم ، وهذه هى القائمة:";
-$lang["customers_excel_import_success"] = "تم استيراد العملاء بنجاح.";
-$lang["customers_import_items_excel"] = "استيراد العملا ء من ورقة عمل اكسل";
+$lang["customers_import_items_csv"] = "استيراد العملا ء من ورقة عمل اكسل";
 $lang["customers_mailchimp_activity_click"] = "النقر على البريد الإلكتروني";
 $lang["customers_mailchimp_activity_lastopen"] = "آخر رسالة إلكترونية مفتوحة";
 $lang["customers_mailchimp_activity_open"] = "رسالة إلكترونية مفتوحة";

application/language/ar-EG/employees_lang.php

@@ -1,8 +1,12 @@
 <?php 
 
+$lang["employees_administrator"] = "";
 $lang["employees_basic_information"] = "المعلومات الأساسية للموظف";
 $lang["employees_cannot_be_deleted"] = "لايمكن حذف الموظفين ، واحد أو أكثر من المظفين قام بإجراء مبيعات :).";
+$lang["employees_change_employee"] = "";
 $lang["employees_change_password"] = "تغيير كلمة المرور";
+$lang["employees_clerk"] = "";
+$lang["employees_commission"] = "";
 $lang["employees_confirm_delete"] = "هل أنت متأكد أنك تريد حذف الموظفين المختارين؟";
 $lang["employees_confirm_restore"] = "هل انت متاكد من استعادة الموظفين المحددين؟";
 $lang["employees_current_password"] = "كلمة المرور الحالية";
@@ -13,6 +17,7 @@ $lang["employees_error_deleting_demo_admin"] = "لايمكن حذف المستخ
 $lang["employees_error_updating_demo_admin"] = "لايمكن تغيير بيانات المستخدم admin الخاص بنسخة العرض.";
 $lang["employees_language"] = "اللغة";
 $lang["employees_login_info"] = "معلومات دخول الموظف";
+$lang["employees_manager"] = "";
 $lang["employees_new"] = "موظف جديد";
 $lang["employees_none_selected"] = "لم تختار أى من الموظفين للحذف.";
 $lang["employees_one_or_multiple"] = "موظف/موظفين";
@@ -33,5 +38,6 @@ $lang["employees_system_language"] = "لغة النظام";
 $lang["employees_unsuccessful_change_password"] = "فشل في تغيير كلمة المرور.";
 $lang["employees_update"] = "تحديث بيانات موظف";
 $lang["employees_username"] = "اسم المستخدم";
+$lang["employees_username_duplicate"] = "";
 $lang["employees_username_minlength"] = "اسم المستخدم يجب أن يكون 5 حروف على الأقل.";
 $lang["employees_username_required"] = "اسم المستخدم مطلوب.";

application/language/ar-EG/expenses_lang.php

@@ -29,9 +29,11 @@ $lang["expenses_error_adding_updating"] = "خطأ في الإضافة";
 $lang["expenses_expense_id"] = "كود المصاريف";
 $lang["expenses_expenses_employee"] = "موظف";
 $lang["expenses_info"] = "معلومات عن المصاريف";
+$lang["expenses_ip_address"] = "";
 $lang["expenses_is_deleted"] = "ممسوحة";
 $lang["expenses_name_required"] = "خانة مطلوبة: اسم المصاريف";
 $lang["expenses_new"] = "مصاريف جديدة";
+$lang["expenses_new_supplier"] = "";
 $lang["expenses_no_expenses_to_display"] = "لا يوجد مصاريف في التاريخ المحدد";
 $lang["expenses_none_selected"] = "لم يتم تحديد اي خيار";
 $lang["expenses_one_or_multiple"] = "واحد او أكثر";
@@ -43,4 +45,5 @@ $lang["expenses_successful_updating"] = "تم تعديل المصاريف بنج
 $lang["expenses_supplier_name"] = "اسم المورد";
 $lang["expenses_supplier_tax_code"] = "كود ضريبة المورد";
 $lang["expenses_tax_amount"] = "قيمة الضريبة";
+$lang["expenses_tax_amount_number"] = "";
 $lang["expenses_update"] = "تعديل";

application/language/ar-EG/giftcards_lang.php

@@ -17,6 +17,7 @@ $lang["giftcards_confirm_delete"] = "هل أنت متأكد انك تريد حذ
 $lang["giftcards_confirm_restore"] = "هل تريد بالتأكيد استعادة بطاقة (بطاقات) الهدايا المحددة؟";
 $lang["giftcards_cost_price"] = "سعر التكلفة";
 $lang["giftcards_count"] = "تحديث المخزون";
+$lang["giftcards_csv_import_failed"] = "فشل الإستيراد من اكسل.";
 $lang["giftcards_current_quantity"] = "الكميات الحالية";
 $lang["giftcards_description"] = "الوصف";
 $lang["giftcards_details_count"] = "حركة الكارت";
@@ -25,7 +26,6 @@ $lang["giftcards_edit_fields_you_want_to_update"] = "قم بتحديث الحق
 $lang["giftcards_edit_multiple_giftcards"] = "تحرير مجموعة من بطاقات الهدايا.";
 $lang["giftcards_error_adding_updating"] = "خطاء فى إضافة/تحديث بطاقة هدية.";
 $lang["giftcards_error_updating_multiple"] = "خطاء فى تحديث بيانات بطاقات الهدايا.";
-$lang["giftcards_excel_import_failed"] = "فشل الإستيراد من اكسل.";
 $lang["giftcards_generate_barcodes"] = "توليد أكواد الباركود";
 $lang["giftcards_giftcard"] = "بطاقة هدية";
 $lang["giftcards_giftcard_number"] = "رقم بطاقة الهدية";

application/language/ar-EG/item_kits_lang.php

@@ -14,6 +14,10 @@ $lang["item_kits_error_adding_updating"] = "خطاء فى إضافة/تحديث
 $lang["item_kits_find_kit_item"] = "صنف لمجموعة";
 $lang["item_kits_info"] = "معلومات المجموعة";
 $lang["item_kits_item"] = "صنف";
+$lang["item_kits_item_kit_number"] = "";
+$lang["item_kits_item_kit_number_duplicate"] = "";
+$lang["item_kits_item_number"] = "";
+$lang["item_kits_item_number_duplicate"] = "";
 $lang["item_kits_items"] = "أصناف";
 $lang["item_kits_kit"] = "كود المجموعة";
 $lang["item_kits_kit_and_components"] = "المجموعة ومحتوياتها";
@@ -32,4 +36,5 @@ $lang["item_kits_sequence"] = "التسلسل";
 $lang["item_kits_successful_adding"] = "لقد تم إضافة المجموعة بنجاح";
 $lang["item_kits_successful_deleted"] = "لقد تم حذف المجموعة بنجاح";
 $lang["item_kits_successful_updating"] = "لقد تم تحديث بيانات المجموعة بنجاح";
+$lang["item_kits_unit_price"] = "";
 $lang["item_kits_update"] = "تحديث بيانات مجموعة";

application/language/ar-EG/items_lang.php

@@ -7,7 +7,9 @@ $lang["items_bulk_edit"] = "تحرير جماعى";
 $lang["items_buy_price_required"] = "سعر الشراء مطلوب.";
 $lang["items_cannot_be_deleted"] = "لايمكن حذف الأصناف المختارة، واحد أو أكثر منها لديه مبيعات.";
 $lang["items_cannot_find_item"] = "لايمكن ايجاد معلومات حول الصنف.";
+$lang["items_categories"] = "";
 $lang["items_category"] = "التصنيف";
+$lang["items_category_new"] = "";
 $lang["items_category_required"] = "التصنيف مطلوب.";
 $lang["items_change_all_to_allow_alt_desc"] = "السماح بوصف بديل للجميع.";
 $lang["items_change_all_to_not_allow_allow_desc"] = "عدم السماح بوصف بديل للجميع.";
@@ -22,26 +24,28 @@ $lang["items_cost_price"] = "سعر التكلفة";
 $lang["items_cost_price_number"] = "سعر التكلفة يجب أن يكون رقم.";
 $lang["items_cost_price_required"] = "سعر التكلفة مطلوب.";
 $lang["items_count"] = "تحديث المخزون";
+$lang["items_csv_import_failed"] = "فشل الإستيراد من اكسل";
+$lang["items_csv_import_nodata_wrongformat"] = "الملف الذى رفعته إما فارغ أو أنه مختلف البنية.";
+$lang["items_csv_import_partially_failed"] = "يوجد خطأ بنسبة 1% في استيراد الاصناف في السطر: %2. لم يتم استيرادهم.";
+$lang["items_csv_import_success"] = "تم استيراد الأصناف بنجاح.";
 $lang["items_current_quantity"] = "الكمية الحالية";
 $lang["items_default_pack_name"] = "كل";
 $lang["items_description"] = "الوصف";
 $lang["items_details_count"] = "حركة الصنف";
 $lang["items_do_nothing"] = "لاتفعل شئ";
+$lang["items_edit"] = "";
 $lang["items_edit_fields_you_want_to_update"] = "قم بتحديث الحقول المراد تحديثها لكل الأصناف المختارة.";
 $lang["items_edit_multiple_items"] = "تحريد مجموعة اصناف";
 $lang["items_empty_upc_items"] = "تفريغ اصناف UPC";
 $lang["items_error_adding_updating"] = "خطاء فى إضافة/تحديث صنف";
 $lang["items_error_updating_multiple"] = "خطاء فى تحديث بيانات أصناف";
-$lang["items_excel_import_failed"] = "فشل الإستيراد من اكسل";
-$lang["items_excel_import_nodata_wrongformat"] = "الملف الذى رفعته إما فارغ أو أنه مختلف البنية.";
-$lang["items_excel_import_partially_failed"] = "تم استيراد معظم الأصناف. البعض لم يتم استيرادهم ، وهذه هى القائمة:";
-$lang["items_excel_import_success"] = "تم استيراد الأصناف بنجاح.";
 $lang["items_generate_barcodes"] = "توليد أكواد الباركود";
 $lang["items_hsn_code"] = "تسميات النظام المنسق";
 $lang["items_image"] = "صورة";
-$lang["items_import_items_excel"] = "استيراد من اكسل";
+$lang["items_import_items_csv"] = "استيراد من اكسل";
 $lang["items_info_provided_by"] = "المعلومات مقدمة بواسطة";
 $lang["items_inventory"] = "المخزن";
+$lang["items_inventory_CSV_import_quantity"] = "العدد المستورد من ملفات ال CSV";
 $lang["items_inventory_comments"] = "تعليقات";
 $lang["items_inventory_data_tracking"] = "تتبع بيانات المخزون";
 $lang["items_inventory_date"] = "التاريخ";
@@ -49,8 +53,10 @@ $lang["items_inventory_employee"] = "الموظف";
 $lang["items_inventory_in_out_quantity"] = "+- كمية";
 $lang["items_inventory_remarks"] = "ملاحظات";
 $lang["items_is_deleted"] = "حذفت";
+$lang["items_is_printed"] = "";
 $lang["items_is_serialized"] = "الصنف له رقم مسلسل";
 $lang["items_item"] = "صنف";
+$lang["items_item_id"] = "";
 $lang["items_item_number"] = "الباركود UPC/EAN/ISBN";
 $lang["items_item_number_duplicate"] = "رقم الصنف موجود فى قاعدة البيانات من قبل.";
 $lang["items_kit"] = "مجموعة اصناف";
@@ -58,6 +64,7 @@ $lang["items_location"] = "مكان";
 $lang["items_low_inventory_items"] = "الأصناف التى لا يوجد لها مخزون";
 $lang["items_low_sell_item"] = "الصنف المركب";
 $lang["items_manually_editing_of_quantity"] = "تحرير الكمية يدوياً";
+$lang["items_markup"] = "";
 $lang["items_name"] = "اسم الصنف";
 $lang["items_name_required"] = "اسم الصنف مطلوب.";
 $lang["items_new"] = "صنف جديد";
@@ -96,6 +103,7 @@ $lang["items_successful_updating"] = "لقد تم تحديث بيانات صنف
 $lang["items_supplier"] = "المورد";
 $lang["items_tax_1"] = "الضريبة 1";
 $lang["items_tax_2"] = "الضريبة 2";
+$lang["items_tax_3"] = "";
 $lang["items_tax_category"] = "الفئة الضريبية";
 $lang["items_tax_percent"] = "نسبة الضريبة";
 $lang["items_tax_percent_number"] = "نسبة الضريبة يجب ان تكون رقم";

application/language/ar-EG/login_lang.php

@@ -6,5 +6,8 @@ $lang["login_invalid_gcaptcha"] = "رمز التحقق غير صحيح.";
 $lang["login_invalid_installation"] = "يوجد مشكلة بالتنصيب, الرجاء التحقق من ملف php.ini.";
 $lang["login_invalid_username_and_password"] = "اسم مستخدم/كلمة سر غير صحيح.";
 $lang["login_login"] = "دخول";
+$lang["login_logout"] = "";
+$lang["login_migration_needed"] = "";
 $lang["login_password"] = "كلمة السر";
 $lang["login_username"] = "اسم المستخدم";
+$lang["login_welcome"] = "";

application/language/ar-EG/module_lang.php

@@ -1,5 +1,7 @@
 <?php 
 
+$lang["module_admin_cashups"] = "";
+$lang["module_admin_cashups_desc"] = "";
 $lang["module_attributes"] = "ميزات/مميزات";
 $lang["module_attributes_desc"] = "إضافة، تعديل، حذف، وبحث بالميزات.";
 $lang["module_both"] = "الاثنين";
@@ -39,3 +41,7 @@ $lang["module_suppliers"] = "الموردين";
 $lang["module_suppliers_desc"] = "إضافة، تحديث ، بحث و حذف مجموعات الموردين.";
 $lang["module_taxes"] = "الضرائب";
 $lang["module_taxes_desc"] = "اعدادات ضريبة المبيعات.";
+$lang["module_timeclocks"] = "";
+$lang["module_timeclocks_categories"] = "";
+$lang["module_timeclocks_categories_desc"] = "";
+$lang["module_timeclocks_desc"] = "";

application/language/ar-EG/receivings_lang.php

@@ -1,5 +1,6 @@
 <?php 
 
+$lang["receivings_amount_due"] = "";
 $lang["receivings_cancel_receiving"] = "إلغاء";
 $lang["receivings_cannot_be_deleted"] = "لايمكن حذف الإستلام/الإستلامات.";
 $lang["receivings_comments"] = "تعليقات";
@@ -7,7 +8,9 @@ $lang["receivings_complete_receiving"] = "إنهاء";
 $lang["receivings_confirm_cancel_receiving"] = "هل أنت متاكد أنك تريد إلغاء هذا الإستلام؟ سيتم حذف كل الأصناف.";
 $lang["receivings_confirm_delete"] = "هل أنت متاكد أنك تريد حذف هذا الإستلام؟ سيتم حذف كل الأصناف. لايمكن التراجع بعد الحذف.";
 $lang["receivings_confirm_finish_receiving"] = "هل أنت متاكد أنك تريد تنفيذ هذا الإستلام؟ لايمكن التراجع بعد الإرسال.";
+$lang["receivings_confirm_restore"] = "";
 $lang["receivings_cost"] = "التكلفة";
+$lang["receivings_daily"] = "";
 $lang["receivings_date"] = "تاريخ الإستلام";
 $lang["receivings_date_required"] = "يجب إدخال تاريخ صحيح.";
 $lang["receivings_date_type"] = "التاريخ مطلوب.";

application/language/ar-EG/reports_lang.php

@@ -14,6 +14,7 @@ $lang["reports_code_return"] = "كود عمليات المرتجع";
 $lang["reports_code_type"] = "النوع";
 $lang["reports_code_work_order"] = "طلب عمل";
 $lang["reports_comments"] = "التعليقات";
+$lang["reports_commission"] = "";
 $lang["reports_complete"] = "عمليات البيع والمرتجع المكتملة";
 $lang["reports_completed_sales"] = "المبيعات المكتملة";
 $lang["reports_confirm_delete"] = "هل انت متاكد من مسح البيانات المحددة؟";
@@ -28,6 +29,7 @@ $lang["reports_date"] = "التاريخ";
 $lang["reports_date_range"] = "الفترة الزمنية";
 $lang["reports_description"] = "الوصف";
 $lang["reports_detailed_receivings_report"] = "تقرير مفصل لاستلام البضاعة";
+$lang["reports_detailed_receivings_report_input"] = "";
 $lang["reports_detailed_reports"] = "التقارير التفصيلية";
 $lang["reports_detailed_requisition_report"] = "تقرير مفصل لطلبات الشراء";
 $lang["reports_detailed_sales_report"] = "تقرير مفصل للمبيعات";
@@ -46,6 +48,7 @@ $lang["reports_expenses_amount"] = "القيمة";
 $lang["reports_expenses_categories"] = "فئات المصاريف";
 $lang["reports_expenses_categories_summary_report"] = "تقرير المصاريف حسب الفئات";
 $lang["reports_expenses_category"] = "الفئة";
+$lang["reports_expenses_payment_amount"] = "";
 $lang["reports_expenses_tax_amount"] = "الضريبة";
 $lang["reports_expenses_total_amount"] = "المبلغ الإجمالي";
 $lang["reports_expenses_total_tax_amount"] = "الضريبة الإجمالية";
@@ -105,7 +108,9 @@ $lang["reports_sales_summary_report"] = "تقرير ملخص المبيعات";
 $lang["reports_sales_taxes"] = "ضرائب المبيعات";
 $lang["reports_sales_taxes_summary_report"] = "تقرير ملخص ضرائب المبيعات";
 $lang["reports_serial_number"] = "مسلسل";
+$lang["reports_service_charge"] = "";
 $lang["reports_sold_by"] = "البائع";
+$lang["reports_sold_items"] = "";
 $lang["reports_sold_to"] = "مباع الى";
 $lang["reports_stock_location"] = "مكان المخزون";
 $lang["reports_sub_total_value"] = "المجموع الفرعى";
@@ -117,6 +122,7 @@ $lang["reports_suppliers"] = "الموردين";
 $lang["reports_suppliers_summary_report"] = "تقرير ملخص الموردين";
 $lang["reports_tax"] = "الضريبة";
 $lang["reports_tax_category"] = "الفئة الضريبية";
+$lang["reports_tax_name"] = "";
 $lang["reports_tax_percent"] = "نسبة الضريبة";
 $lang["reports_tax_rate"] = "معدل الضريبة";
 $lang["reports_taxes"] = "الضرائب";

application/language/ar-EG/sales_lang.php

@@ -10,20 +10,31 @@ $lang["sales_amount_tendered"] = "المبلغ المدفوع";
 $lang["sales_authorized_signature"] = "توقيع معتمد";
 $lang["sales_cancel_sale"] = "الغاء عملية البيع";
 $lang["sales_cash"] = "نقدى";
+$lang["sales_cash_1"] = "";
+$lang["sales_cash_2"] = "";
+$lang["sales_cash_3"] = "";
+$lang["sales_cash_4"] = "";
+$lang["sales_cash_adjustment"] = "";
 $lang["sales_cash_deposit"] = "ايداع نقدي";
 $lang["sales_cash_filter"] = "نقدى";
 $lang["sales_change_due"] = "الباقى";
+$lang["sales_change_price"] = "";
 $lang["sales_check"] = "شيك";
 $lang["sales_check_balance"] = "تذكير بموعد الشيك";
 $lang["sales_check_filter"] = "شيك";
+$lang["sales_close"] = "";
 $lang["sales_comment"] = "تعليق";
 $lang["sales_comments"] = "تعليقات";
+$lang["sales_company_name"] = "";
+$lang["sales_complete"] = "";
 $lang["sales_complete_sale"] = "إتمام البيع";
 $lang["sales_confirm_cancel_sale"] = "هل أنت متأكد من الغاء عملية البيع ؟ سيتم إزالة كل الأصناف.";
 $lang["sales_confirm_delete"] = "هل تريد حذف عمليات البيع المختارة؟";
 $lang["sales_confirm_restore"] = "هل انت متاكد من استعادة عملية البيع؟";
 $lang["sales_credit"] = "بطاقة إئتمانية";
 $lang["sales_credit_deposit"] = "ايداع ببطاقة ائتمان";
+$lang["sales_credit_filter"] = "";
+$lang["sales_current_table"] = "";
 $lang["sales_customer"] = "العميل";
 $lang["sales_customer_address"] = "العنوان";
 $lang["sales_customer_discount"] = "الخصم";
@@ -33,11 +44,14 @@ $lang["sales_customer_mailchimp_status"] = "حالة ميل تشيمب";
 $lang["sales_customer_optional"] = "(مطلوب للدفعات المستحقة)";
 $lang["sales_customer_required"] = "(اجباري)";
 $lang["sales_customer_total"] = "المجموع";
+$lang["sales_customer_total_spent"] = "";
+$lang["sales_daily_sales"] = "";
 $lang["sales_date"] = "تاريخ البيع";
 $lang["sales_date_range"] = "الفترة الزمنية";
 $lang["sales_date_required"] = "يجب إدخال تاريخ صحيح.";
 $lang["sales_date_type"] = "التاريخ مطلوب.";
 $lang["sales_debit"] = "بطاقة خصم";
+$lang["sales_debit_filter"] = "";
 $lang["sales_delete"] = "اسمح بالمسح";
 $lang["sales_delete_confirmation"] = "هل أنت متأكد أنك تريد حذف عملية البيع هذه؟ لايمكن التراجع بعد الحذف.";
 $lang["sales_delete_entire_sale"] = "حذف عملية البيع بالكامل";
@@ -62,6 +76,7 @@ $lang["sales_find_or_scan_item"] = "بحث/مسح باركود صنف";
 $lang["sales_find_or_scan_item_or_receipt"] = "بحث/مسح باركود صنف أو ايصال";
 $lang["sales_giftcard"] = "بطاقة هدية";
 $lang["sales_giftcard_balance"] = "رصيد بطاقة الهدية";
+$lang["sales_giftcard_filter"] = "";
 $lang["sales_giftcard_number"] = "رقم بطاقة الهدية";
 $lang["sales_group_by_category"] = "تصفية حسب الفئة";
 $lang["sales_group_by_type"] = "تجميع حسب النوع";
@@ -87,6 +102,28 @@ $lang["sales_item_insufficient_of_stock"] = "لايوجد مخزون كافى م
 $lang["sales_item_name"] = "اسم الصنف";
 $lang["sales_item_number"] = "صنف #";
 $lang["sales_item_out_of_stock"] = "لايوجد مخزون من الصنف.";
+$lang["sales_key_browser"] = "";
+$lang["sales_key_cancel"] = "Cancels Current Quote/Invoice/Sale";
+$lang["sales_key_customer_search"] = "Customer Search";
+$lang["sales_key_finish_quote"] = "Finish Quote/Invoice witdout payment";
+$lang["sales_key_finish_sale"] = "Add Payment and Complete Invoice/Sale";
+$lang["sales_key_full"] = "";
+$lang["sales_key_function"] = "Function";
+$lang["sales_key_help"] = "Shortcuts";
+$lang["sales_key_help_modal"] = "Open Shortcuts Window";
+$lang["sales_key_in"] = "";
+$lang["sales_key_item_search"] = "Item Search";
+$lang["sales_key_out"] = "";
+$lang["sales_key_payment"] = "Add Payment";
+$lang["sales_key_print"] = "";
+$lang["sales_key_restore"] = "";
+$lang["sales_key_search"] = "";
+$lang["sales_key_suspend"] = "Suspend Current Sale";
+$lang["sales_key_suspended"] = "Show Suspended Sales";
+$lang["sales_key_system"] = "";
+$lang["sales_key_tendered"] = "Edit Amount Tendered";
+$lang["sales_key_title"] = "Sales Keyboard Shortcuts";
+$lang["sales_mc"] = "";
 $lang["sales_mode"] = "وضع التسجيل";
 $lang["sales_must_enter_numeric"] = "يجب إدخال رقم للمبلغ الفعلى المدفوع.";
 $lang["sales_must_enter_numeric_giftcard"] = "رقم بطاقة الهدية يجب أن يكون رقم.";
@@ -97,12 +134,14 @@ $lang["sales_no_filter"] = "الكل";
 $lang["sales_no_items_in_cart"] = "لايوجد أصناف فى السلة.";
 $lang["sales_no_sales_to_display"] = "لاتوجد عمليات بيع لعرضها.";
 $lang["sales_none_selected"] = "لم تقم بإختيار أى عمليات بيع لحذفها.";
+$lang["sales_nontaxed_ind"] = "";
 $lang["sales_not_authorized"] = "هذه العملية لا يمكن فعلها لعدم تخويلك.";
 $lang["sales_one_or_multiple"] = "عمليات بيع";
 $lang["sales_payment"] = "طريقة الدفع";
 $lang["sales_payment_amount"] = "المبلغ";
 $lang["sales_payment_not_cover_total"] = "المبلغ المدفوع لايغطى المبلغ الإجمالى.";
 $lang["sales_payment_type"] = "طريقة";
+$lang["sales_payments"] = "";
 $lang["sales_payments_total"] = "إجمالى المدفوعات";
 $lang["sales_price"] = "السعر";
 $lang["sales_print_after_sale"] = "اطبع بعد عملية البيع";
@@ -120,8 +159,10 @@ $lang["sales_receipt_no_email"] = "هذا العميل ليس له اي بريد
 $lang["sales_receipt_number"] = "إيصال بيع";
 $lang["sales_receipt_sent"] = "تم إرسال الإيصال إلى";
 $lang["sales_receipt_unsent"] = "فشل إرسال الإيصال إلى";
+$lang["sales_refund"] = "";
 $lang["sales_register"] = "مسجل المبيعات";
 $lang["sales_remove_customer"] = "حذف عميل";
+$lang["sales_remove_discount"] = "";
 $lang["sales_return"] = "إرتجاع";
 $lang["sales_rewards"] = "نقاط المكافئة";
 $lang["sales_rewards_balance"] = "رصيد نقاط المكافئة";
@@ -130,12 +171,15 @@ $lang["sales_sale_by_invoice"] = "البيع بفاتورة رسمية";
 $lang["sales_sale_for_customer"] = "العميل:";
 $lang["sales_sale_time"] = "الوقت";
 $lang["sales_sales_tax"] = "ضريبة البيع";
+$lang["sales_sales_total"] = "";
 $lang["sales_select_customer"] = "اختيار عميل (اختياري)";
 $lang["sales_send_invoice"] = "إرسال الفاتورة";
 $lang["sales_send_quote"] = "ارسال عرض الاسعار";
 $lang["sales_send_receipt"] = "إرسال إيصال";
 $lang["sales_send_work_order"] = "ارسال طلب عمل";
 $lang["sales_serial"] = "مسلسل";
+$lang["sales_service_charge"] = "";
+$lang["sales_show_due"] = "";
 $lang["sales_show_invoice"] = "عرض الفاتورة";
 $lang["sales_show_receipt"] = "عرض الإيصال";
 $lang["sales_start_typing_customer_name"] = "ابداء بكتابة اسم العميل...";
@@ -157,6 +201,7 @@ $lang["sales_tax"] = "ضريبة";
 $lang["sales_tax_id"] = "الرقم الضريبي";
 $lang["sales_tax_invoice"] = "فاتورة ضريبية";
 $lang["sales_tax_percent"] = "ضريبة %";
+$lang["sales_taxed_ind"] = "";
 $lang["sales_total"] = "المجموع";
 $lang["sales_total_tax_exclusive"] = "الإجمالى بدون الضرائب";
 $lang["sales_transaction_failed"] = "فشل حركة البيع.";
@@ -169,6 +214,8 @@ $lang["sales_unsuspend"] = "إلغاء تعليق";
 $lang["sales_unsuspend_and_delete"] = "إلغاء تعليق وحذف";
 $lang["sales_update"] = "تحديث";
 $lang["sales_upi"] = "رقم التعريف الشخصي";
+$lang["sales_visa"] = "";
+$lang["sales_wholesale"] = "";
 $lang["sales_work_order"] = "طلب عمل";
 $lang["sales_work_order_number"] = "رقم طلب العمل";
 $lang["sales_work_order_number_duplicate"] = "رقم طلب العمل يجب ان يكون فريد.";

application/language/ar-EG/taxes_lang.php

@@ -14,6 +14,7 @@ $lang["taxes_group_seq"] = "تسلسل المجموعة";
 $lang["taxes_jurisdiction_name"] = "اسم الولاية القضائية";
 $lang["taxes_name"] = "الاسم";
 $lang["taxes_new"] = "ضريبة جديدة";
+$lang["taxes_no_taxes"] = "";
 $lang["taxes_no_taxes_to_display"] = "لا يوجد أكواد ضريبية للعرض";
 $lang["taxes_reporting_authority"] = "السلطة الضريبية";
 $lang["taxes_round_half_down"] = "نصف الاسفل";
@@ -54,6 +55,7 @@ $lang["taxes_tax_codes_saved_successfully"] = "تم حفظ تغييرات قان
 $lang["taxes_tax_codes_saved_unsuccessfully"] = "لم يتم حفظ تغييرات قانون الضريبة";
 $lang["taxes_tax_excluded"] = "لا تشمل الضرائب";
 $lang["taxes_tax_group"] = "المجموعة الضريبية";
+$lang["taxes_tax_group_not_unique"] = "";
 $lang["taxes_tax_group_sequence"] = "تسلسل مجموعة الضرائب";
 $lang["taxes_tax_included"] = "الضريبة مشمولة";
 $lang["taxes_tax_jurisdiction"] = "الاختصاص الضريبي";

application/language/ar-LB/cashups_lang.php

@@ -3,23 +3,31 @@
 $lang["cashups_amount"] = "قيمة المبلغ";
 $lang["cashups_amount_number"] = "قيمة المبلغ يجب ان تتكون من ارقام";
 $lang["cashups_amount_required"] = "قيمة المبلغ هي خانة إجبارية.";
+$lang["cashups_cancel_cashups"] = "";
+$lang["cashups_cancel_cashups_enter"] = "";
 $lang["cashups_cannot_be_deleted"] = "لا يمكن حذف الصندوق النقدي";
+$lang["cashups_cash_difference"] = "";
 $lang["cashups_close_date"] = "تاريخ تسكير الصندوق";
 $lang["cashups_close_employee"] = "تم التسكير من قبل";
 $lang["cashups_closed_amount_card"] = "بطاقات ائتمان";
 $lang["cashups_closed_amount_cash"] = "الصندوق النقدي";
 $lang["cashups_closed_amount_check"] = "شيكات";
 $lang["cashups_closed_amount_due"] = "الديون";
+$lang["cashups_closed_amount_giftcard"] = "";
 $lang["cashups_closed_amount_total"] = "المجموع";
 $lang["cashups_closed_date"] = "تاريخ تسكير الصندوق";
 $lang["cashups_confirm_delete"] = "هل انت متأكد من حذف الصندوق النقدي؟";
 $lang["cashups_confirm_restore"] = "هل انت متأكد من استعادة الصندوق النقدي؟";
+$lang["cashups_confirm_submit"] = "";
 $lang["cashups_date_number"] = "التاريخ يجب ان يكون مكون من ارقام";
 $lang["cashups_date_required"] = "التاريخ هي خانة اجبارية";
 $lang["cashups_description"] = "الوصف";
+$lang["cashups_enable_expected"] = "";
 $lang["cashups_error_adding_updating"] = "خطأ في تعديل او اضافة صندوق نقدي";
+$lang["cashups_giftcard"] = "";
 $lang["cashups_id"] = "كود";
 $lang["cashups_info"] = "معلومات عن الصندوق النقدي";
+$lang["cashups_info_employee"] = "";
 $lang["cashups_is_deleted"] = "محذوف";
 $lang["cashups_new"] = "صندوق نقدي جديد";
 $lang["cashups_no_cashups_to_display"] = "لا يوجد صناديق نقدية للاظهار";
@@ -35,4 +43,6 @@ $lang["cashups_successful_deleted"] = "تم حذف الصندوق النقدي
 $lang["cashups_successful_updating"] = "تم تعديل الصندوق النقدي بنجاح";
 $lang["cashups_total"] = "المجموع";
 $lang["cashups_transfer_amount_cash"] = "حركة الصندوق";
+$lang["cashups_transfer_amount_cash_minus"] = "";
 $lang["cashups_update"] = "تعديل/تحديث الصندوق النقدي";
+$lang["cashups_warning"] = "";

application/language/ar-LB/common_lang.php

@@ -2,13 +2,18 @@
 
 $lang["common_address_1"] = "العنوان 1";
 $lang["common_address_2"] = "العنوان 2";
+$lang["common_admin"] = "";
 $lang["common_city"] = "المدينة";
+$lang["common_clerk"] = "";
 $lang["common_close"] = "إغلاق";
+$lang["common_color"] = "";
 $lang["common_comments"] = "تعليقات";
 $lang["common_common"] = "عام";
 $lang["common_confirm_search"] = "لقد قمت اختيار أكتر من سجل، سوف تفقد هذه الاختيارات عند إرسال البحث، موافق؟";
+$lang["common_copyrights"] = "© 2010 - %1";
 $lang["common_correct_errors"] = "يرجى تصحيح الأخطاء المحددة قبل الحفظ";
 $lang["common_country"] = "البلد";
+$lang["common_dashboard"] = "";
 $lang["common_date"] = "التاريخ";
 $lang["common_delete"] = "حذف";
 $lang["common_det"] = "تفاصيل";
@@ -16,20 +21,23 @@ $lang["common_download_import_template"] = "تنزيل قالب الاستيرا
 $lang["common_edit"] = "تحرير";
 $lang["common_email"] = "بريد إلكتروني";
 $lang["common_email_invalid_format"] = "شكل البريد الإلكتروني غير صحيح.";
-$lang["common_export_excel"] = "تصدير إلى اكسل";
-$lang["common_export_excel_no"] = "لا";
-$lang["common_export_excel_yes"] = "نعم";
+$lang["common_export_csv"] = "تصدير إلى اكسل";
+$lang["common_export_csv_no"] = "لا";
+$lang["common_export_csv_yes"] = "نعم";
 $lang["common_fields_required_message"] = "الحقول التي بالأحمر مطلوبة";
+$lang["common_fields_required_message_unique"] = "";
 $lang["common_first_name"] = "الاسم الأول";
 $lang["common_first_name_required"] = "الاسم الأول مطلوب.";
 $lang["common_first_page"] = "الأول";
 $lang["common_gender"] = "النوع";
 $lang["common_gender_female"] = "أنثى";
 $lang["common_gender_male"] = "ذكر";
+$lang["common_gender_undefined"] = "";
+$lang["common_icon"] = "";
 $lang["common_id"] = "كود";
 $lang["common_import"] = "استيراد";
 $lang["common_import_change_file"] = "تغيير";
-$lang["common_import_excel"] = "استيراد من اكسل";
+$lang["common_import_csv"] = "استيراد من اكسل";
 $lang["common_import_full_path"] = "المسار الكامل لملف اكسل مطلوب";
 $lang["common_import_remove_file"] = "إزالة";
 $lang["common_import_select_file"] = "اختار ملف";
@@ -39,15 +47,21 @@ $lang["common_last_name_required"] = "الاسم الأخير مطلوب.";
 $lang["common_last_page"] = "الأخيرة";
 $lang["common_learn_about_project"] = "للتعرف على أخر المعلومات حول المشروع.";
 $lang["common_list_of"] = "قائمة بـ";
+$lang["common_logo"] = "";
+$lang["common_logo_mark"] = "";
 $lang["common_logout"] = "خروج";
+$lang["common_manager"] = "";
 $lang["common_migration_needed"] = "سيبدأ ترحيل قاعدة البيانات إلى ٪1 بعد تسجيل الدخول.";
 $lang["common_new"] = "جديد";
+$lang["common_no"] = "";
 $lang["common_no_persons_to_display"] = "لا يوجد اناس لعرضهم.";
 $lang["common_none_selected_text"] = "[إختيار]";
 $lang["common_or"] = "أو";
+$lang["common_people"] = "";
 $lang["common_phone_number"] = "رقم التليفون";
 $lang["common_phone_number_required"] = "رقم التليفون مطلوب";
 $lang["common_please_visit_my"] = "برجاء زيارة";
+$lang["common_position"] = "";
 $lang["common_powered_by"] = "مدعوم بواسطة";
 $lang["common_price"] = "السعر";
 $lang["common_print"] = "طباعة";
@@ -58,6 +72,8 @@ $lang["common_return_policy"] = "سياسة الاسترجاع";
 $lang["common_search"] = "بحث";
 $lang["common_search_options"] = "خيارات البحث";
 $lang["common_searched_for"] = "بحث عن";
+$lang["common_software_short"] = "";
+$lang["common_software_title"] = "";
 $lang["common_state"] = "المحافظة";
 $lang["common_submit"] = "حفظ";
 $lang["common_total_spent"] = "مجموع الصرف";
@@ -66,5 +82,6 @@ $lang["common_view_recent_sales"] = "عرض أحدث المبيعات";
 $lang["common_website"] = "الموقع الإلكترونى";
 $lang["common_welcome"] = "مرحباً";
 $lang["common_welcome_message"] = "مرحباً فى OSPOS برجاء إختيار أى قسم للبدء.";
+$lang["common_yes"] = "";
 $lang["common_you_are_using_ospos"] = "أنت تستخدم إصدار Open Source Point Of Sale";
 $lang["common_zip"] = "الرقم البريدى";

application/language/ar-LB/config_lang.php

@@ -1,6 +1,8 @@
-<?php
+<?php 
+
 $lang["config_address"] = "عنوان الشركة";
 $lang["config_address_required"] = "عنوان الشركة مطلوب.";
+$lang["config_all_set"] = "All file permissions are set correctly!";
 $lang["config_allow_duplicate_barcodes"] = "السماح بتشابة الباركود";
 $lang["config_apostrophe"] = "الفاصلة";
 $lang["config_backup_button"] = "نسخ إحتياطى";
@@ -29,12 +31,22 @@ $lang["config_barcode_tooltip"] = "تحذير: قد تؤدي هذه الميزة
 $lang["config_barcode_type"] = "نوعية الباركود";
 $lang["config_barcode_width"] = "العرض (px)";
 $lang["config_bottom"] = "الأسفل";
+$lang["config_cash_button"] = "";
+$lang["config_cash_button_1"] = "";
+$lang["config_cash_button_2"] = "";
+$lang["config_cash_button_3"] = "";
+$lang["config_cash_button_4"] = "";
+$lang["config_cash_button_5"] = "";
+$lang["config_cash_button_6"] = "";
 $lang["config_cash_decimals"] = "فواصل النقدية";
 $lang["config_cash_decimals_tooltip"] = "إذا كانت الكسور العشرية النقدية وعشرية العملات هي نفسها ثم لن يتم تقريب النقدية.";
 $lang["config_cash_rounding"] = "التقريب النقدي";
+$lang["config_category_dropdown"] = "";
 $lang["config_center"] = "الوسط";
+$lang["config_change_apperance_tooltip"] = "";
 $lang["config_comma"] = "فاصلة";
 $lang["config_company"] = "اسم الشركة";
+$lang["config_company_avatar"] = "";
 $lang["config_company_change_image"] = "تغيير الصورة";
 $lang["config_company_logo"] = "شعار الشركة";
 $lang["config_company_remove_image"] = "إزالة الصورة";
@@ -46,6 +58,7 @@ $lang["config_country_codes_tooltip"] = "قائمة مفصولة بفاصلة ل
 $lang["config_currency_code"] = "رمز العملة";
 $lang["config_currency_decimals"] = "العلامة العشرية للعملة";
 $lang["config_currency_symbol"] = "رمز العملة";
+$lang["config_current_employee_only"] = "";
 $lang["config_customer_reward"] = "المكافآت";
 $lang["config_customer_reward_duplicate"] = "المكافئة يجب ان تكون فريدة.";
 $lang["config_customer_reward_enable"] = "تمكين مكافآت العميل";
@@ -83,6 +96,7 @@ $lang["config_default_tax_name_required"] = "اسم الضريبة الافتر
 $lang["config_default_tax_rate"] = "معدل الضريبة الافتراضي %";
 $lang["config_default_tax_rate_1"] = "معدل الضريبة 1";
 $lang["config_default_tax_rate_2"] = "معدل الضريبة 2";
+$lang["config_default_tax_rate_3"] = "";
 $lang["config_default_tax_rate_number"] = "معدل الضريبة الافتراضي يجب أن يكون رقم.";
 $lang["config_default_tax_rate_required"] = "معدل الضريبة الافتراضي مطلوب.";
 $lang["config_derive_sale_quantity"] = "السماح بأسعار البيع المشتقة";
@@ -107,9 +121,16 @@ $lang["config_email_smtp_pass"] = "كلمة سر SMTP";
 $lang["config_email_smtp_port"] = "رقم منفذ SMTP";
 $lang["config_email_smtp_timeout"] = "وقت فشل المحاولة (ثوانى) لـ SMTP";
 $lang["config_email_smtp_user"] = "اسم مستخدم SMTP";
+$lang["config_enable_avatar"] = "";
+$lang["config_enable_avatar_tooltip"] = "";
+$lang["config_enable_dropdown_tooltip"] = "";
+$lang["config_enable_new_look"] = "";
+$lang["config_enable_right_bar"] = "";
+$lang["config_enable_right_bar_tooltip"] = "";
 $lang["config_enforce_privacy"] = "فرض نظام الخصوصية";
 $lang["config_enforce_privacy_tooltip"] = "حماية ملفات ومعلومات المستخدم عند الحذف";
 $lang["config_fax"] = "الفاكس";
+$lang["config_file_perm"] = "There are problems with file permissions please fix and reload this page.";
 $lang["config_financial_year"] = "بداية السنة المالية";
 $lang["config_financial_year_apr"] = "1 أبريل";
 $lang["config_financial_year_aug"] = "1 أغسطس";
@@ -123,6 +144,7 @@ $lang["config_financial_year_may"] = "1 مايو";
 $lang["config_financial_year_nov"] = "1 نوفمبر";
 $lang["config_financial_year_oct"] = "1 أكتوبر";
 $lang["config_financial_year_sep"] = "1 سبتمبر";
+$lang["config_floating_labels"] = "";
 $lang["config_gcaptcha_enable"] = "صفحة تسجيل الدخول ريكابتشا";
 $lang["config_gcaptcha_secret_key"] = "مفتاح السرية ريكابتشا";
 $lang["config_gcaptcha_secret_key_required"] = "مفتاح السرية ريكابتشا هو حقل مطلوب";
@@ -134,9 +156,15 @@ $lang["config_general_configuration"] = "إعدادات عامة";
 $lang["config_giftcard_number"] = "رقم كارت الهدية";
 $lang["config_giftcard_random"] = "توليد عشوائي";
 $lang["config_giftcard_series"] = "توليد في السلسلة";
+$lang["config_image_allowed_file_types"] = "";
+$lang["config_image_max_height_tooltip"] = "";
+$lang["config_image_max_size_tooltip"] = "";
+$lang["config_image_max_width_tooltip"] = "";
+$lang["config_image_restrictions"] = "";
 $lang["config_include_hsn"] = "تشمل الدعم لرمز نظام منسق";
 $lang["config_info"] = "معلومات";
 $lang["config_info_configuration"] = "معلومات الشركة";
+$lang["config_input_groups"] = "";
 $lang["config_integrations"] = "التكامل";
 $lang["config_integrations_configuration"] = "تكامل";
 $lang["config_invoice"] = "الفاتورة";
@@ -146,6 +174,9 @@ $lang["config_invoice_email_message"] = "قالب البريد الإلكترو
 $lang["config_invoice_enable"] = "تفعيل الفوترة";
 $lang["config_invoice_printer"] = "طابعة الفواتير";
 $lang["config_invoice_type"] = "نوع الفاتورة";
+$lang["config_is_readable"] = "";
+$lang["config_is_writable"] = "is writable, but the permissions are higher than 750.";
+$lang["config_item_markup"] = "";
 $lang["config_jsprintsetup_required"] = "تحذير! هذه الخاصية غير المفعلة سوف تعمل فقط مع وجود الاضافة jsPrintSetup على متصفح فايرفوكس. حفظ على أى حال؟";
 $lang["config_language"] = "اللغة";
 $lang["config_last_used_invoice_number"] = "اخر رقم مستخدم للفاتورة";
@@ -164,6 +195,7 @@ $lang["config_locale_info"] = "معلومات التهيئة الإقليمية"
 $lang["config_location"] = "المخزون";
 $lang["config_location_configuration"] = "أماكن المخزون";
 $lang["config_location_info"] = "معلومات تهيئة الأماكن";
+$lang["config_login_form"] = "";
 $lang["config_logout"] = "هل تريد عمل نسخة إحتياطية قبل الخروج؟ اضغط [نعم] لعمل النسخة أو [الغاء] للخروج.";
 $lang["config_mailchimp"] = "mailchimp ميل تشامب";
 $lang["config_mailchimp_api_key"] = "mailchimp مفتاح";
@@ -183,6 +215,7 @@ $lang["config_msg_src_required"] = "مطلوب SMS-API كود المرسل لـ"
 $lang["config_msg_uid"] = "SMS-API اسم المستخدم لـ";
 $lang["config_msg_uid_required"] = "مطلوب SMS-API اسم المستخدم لـ";
 $lang["config_multi_pack_enabled"] = "رزم متعددة لكل صنف";
+$lang["config_no_risk"] = "No security/vulnerability risks.";
 $lang["config_none"] = "لايوجد";
 $lang["config_notify_alignment"] = "مكان عرض رسائل المعلومات";
 $lang["config_number_format"] = "شكل الرقم";
@@ -190,8 +223,10 @@ $lang["config_number_locale"] = "التهيئة الاقليمية";
 $lang["config_number_locale_invalid"] = "التهيئة الإقليمية المختارة غير صحية، راجع الرابط الموجود فى الملاحظة لاختيار تهيئة مناسبة.";
 $lang["config_number_locale_required"] = "رقم التهيئة الإقليمية مطلوب.";
 $lang["config_number_locale_tooltip"] = "إيجاد تهيئة إقليمية مناسبة عبر الرابط.";
+$lang["config_os_timezone"] = "";
 $lang["config_ospos_info"] = "معلومات التثبيت OSPOS";
 $lang["config_payment_options_order"] = "ترتيب خيارات الدفع";
+$lang["config_perm_risk"] = "Permissions higher than 750 leaves this software at risk.";
 $lang["config_phone"] = "هاتف الشركة";
 $lang["config_phone_required"] = "هاتف الشركة مطلوب.";
 $lang["config_print_bottom_margin"] = "الهامش السفلي";
@@ -217,8 +252,10 @@ $lang["config_print_top_margin"] = "الهامش العلوى";
 $lang["config_print_top_margin_number"] = "الهامش العلوى يجب أن يكون رقم.";
 $lang["config_print_top_margin_required"] = "الهامش العلوى مطلوب.";
 $lang["config_quantity_decimals"] = "العلامة العشرية للكمية";
+$lang["config_quick_cash_enable"] = "";
 $lang["config_quote_default_comments"] = "ملاحظات طلبات العمل الثابتة";
 $lang["config_receipt"] = "الإيصال";
+$lang["config_receipt_category"] = "";
 $lang["config_receipt_configuration"] = "إعدادات طباعة الايصالات";
 $lang["config_receipt_default"] = "افتراضى";
 $lang["config_receipt_font_size"] = "الخط";
@@ -230,12 +267,14 @@ $lang["config_receipt_short"] = "مختصر";
 $lang["config_receipt_show_company_name"] = "عرض اسم الشركة";
 $lang["config_receipt_show_description"] = "عرض الوصف";
 $lang["config_receipt_show_serialnumber"] = "عرض الرقم المسلسل";
+$lang["config_receipt_show_tax_ind"] = "";
 $lang["config_receipt_show_taxes"] = "عرض الضرائب";
 $lang["config_receipt_show_total_discount"] = "عرض إجمالى الخصم";
 $lang["config_receipt_template"] = "قالب الايصال";
 $lang["config_receiving_calculate_average_price"] = "حساب متوسط سعر الأصناف المستلمة";
 $lang["config_recv_invoice_format"] = "شكل فاتورة الإستلام";
 $lang["config_register_mode_default"] = "نمط التسجيل الافتراضي";
+$lang["config_report_an_issue"] = "";
 $lang["config_return_policy_required"] = "سياسة الإسترجاع مطلوب.";
 $lang["config_reward"] = "المكافاة";
 $lang["config_reward_configuration"] = "اعدادات المكافاة";
@@ -244,7 +283,10 @@ $lang["config_sales_invoice_format"] = "شكل فاتورة البيع";
 $lang["config_sales_quote_format"] = "شكل فاتورة عرض الاسعار";
 $lang["config_saved_successfully"] = "تم حفظ التهيئة بنجاح.";
 $lang["config_saved_unsuccessfully"] = "لم يتم حفظ التهيئة بنجاح.";
+$lang["config_security_issue"] = "Security Vulnerability Warning";
 $lang["config_server_notice"] = "يرجى استخدام المعلومات أدناه للإبلاغ عن المشكلة.";
+$lang["config_service_charge"] = "";
+$lang["config_show_due_enable"] = "";
 $lang["config_show_office_group"] = "اظهار ايكونة المكتب";
 $lang["config_statistics"] = "إرسال اﻹحصائيات";
 $lang["config_statistics_tooltip"] = "إرسال اﻹحصائيات ﻷغراض التطوير و التحسين.";
@@ -252,10 +294,13 @@ $lang["config_stock_location"] = "مكان المخزون";
 $lang["config_stock_location_duplicate"] = "من فضلك إستخدم اسم مكان غير مكرر.";
 $lang["config_stock_location_invalid_chars"] = "مكان المخزون لايمكن أن يحتوى على '_'.";
 $lang["config_stock_location_required"] = "مكان المخزون مطلوب.";
+$lang["config_suggestions_fifth_column"] = "";
 $lang["config_suggestions_first_column"] = "العامود 1";
+$lang["config_suggestions_fourth_column"] = "";
 $lang["config_suggestions_layout"] = "تخطيط اقتراحات البحث";
 $lang["config_suggestions_second_column"] = "العامود 2";
 $lang["config_suggestions_third_column"] = "العامود 3";
+$lang["config_system_conf"] = "Setup & Conf";
 $lang["config_system_info"] = "System Info";
 $lang["config_table"] = "جدول";
 $lang["config_table_configuration"] = "اعدادات الجدول";
@@ -271,10 +316,14 @@ $lang["config_tax_decimals"] = "العلامة العشرية للضريبة";
 $lang["config_tax_id"] = "الرقم الضريبي";
 $lang["config_tax_included"] = "شامل الضريبة";
 $lang["config_theme"] = "السمة";
+$lang["config_theme_preview"] = "";
 $lang["config_thousands_separator"] = "فاصل الاف";
 $lang["config_timezone"] = "المنطقة الزمنية";
+$lang["config_timezone_error"] = "";
 $lang["config_top"] = "علوى";
 $lang["config_use_destination_based_tax"] = "استخدام الضريبة المستندة على الوجهة";
+$lang["config_user_timezone"] = "";
 $lang["config_website"] = "موقع الشركة";
+$lang["config_wholesale_markup"] = "";
 $lang["config_work_order_enable"] = "تفعيل طلبات العمل";
 $lang["config_work_order_format"] = "شكل طلبات العمل";

application/language/ar-LB/customers_lang.php

@@ -3,6 +3,7 @@
 $lang["customers_account_number"] = "رقم الحساب";
 $lang["customers_account_number_duplicate"] = "رقم الحساب هذا موجود فى قاعدة البيانات من قبل.";
 $lang["customers_available_points"] = "النقاط المتاحة";
+$lang["customers_available_points_value"] = "";
 $lang["customers_average"] = "معدل الصرف";
 $lang["customers_avg_discount"] = "معدل الخصم";
 $lang["customers_basic_information"] = "معلومات الزبون";
@@ -12,6 +13,10 @@ $lang["customers_confirm_delete"] = "هل تريد حذف هؤلاء العمل
 $lang["customers_confirm_restore"] = "هل انت متأكد من إستعادة قاعدة بيانات الزبائن ؟";
 $lang["customers_consent"] = "موافقة التسجيل";
 $lang["customers_consent_required"] = "موافقة التسجيل هي خانة اجبارية.";
+$lang["customers_csv_import_failed"] = "فشل الإستيراد من اكسل";
+$lang["customers_csv_import_nodata_wrongformat"] = "الملف الذى رفعته إما فارغ أو أنه مختلف البنية.";
+$lang["customers_csv_import_partially_failed"] = "تم استيراد معظم العملاء. البعض لم يتم استيرادهم ، وهذه هى القائمة:";
+$lang["customers_csv_import_success"] = "تم استيراد العملاء بنجاح.";
 $lang["customers_customer"] = "العميل";
 $lang["customers_date"] = "التاريخ";
 $lang["customers_discount"] = "نسبة الخصم";
@@ -21,11 +26,7 @@ $lang["customers_discount_type"] = "نوع الحسم";
 $lang["customers_email_duplicate"] = "البريد الالكتروني مكرر.";
 $lang["customers_employee"] = "الموظف";
 $lang["customers_error_adding_updating"] = "خطاء فى إضافة أو تحديث العميل.";
-$lang["customers_excel_import_failed"] = "فشل الإستيراد من اكسل";
-$lang["customers_excel_import_nodata_wrongformat"] = "الملف الذى رفعته إما فارغ أو أنه مختلف البنية.";
-$lang["customers_excel_import_partially_failed"] = "تم استيراد معظم العملاء. البعض لم يتم استيرادهم ، وهذه هى القائمة:";
-$lang["customers_excel_import_success"] = "تم استيراد العملاء بنجاح.";
-$lang["customers_import_items_excel"] = "استيراد العملا ء من ورقة عمل اكسل";
+$lang["customers_import_items_csv"] = "استيراد العملا ء من ورقة عمل اكسل";
 $lang["customers_mailchimp_activity_click"] = "النقر على البريد الإلكتروني";
 $lang["customers_mailchimp_activity_lastopen"] = "آخر رسالة إلكترونية مفتوحة";
 $lang["customers_mailchimp_activity_open"] = "رسالة إلكترونية مفتوحة";

application/language/ar-LB/employees_lang.php

@@ -1,8 +1,12 @@
 <?php 
 
+$lang["employees_administrator"] = "";
 $lang["employees_basic_information"] = "المعلومات الأساسية للموظف";
 $lang["employees_cannot_be_deleted"] = "لايمكن حذف الموظفين ، واحد أو أكثر من المظفين قام بإجراء مبيعات :).";
+$lang["employees_change_employee"] = "";
 $lang["employees_change_password"] = "تغيير كلمة المرور";
+$lang["employees_clerk"] = "";
+$lang["employees_commission"] = "";
 $lang["employees_confirm_delete"] = "هل أنت متأكد أنك تريد حذف الموظفين المختارين؟";
 $lang["employees_confirm_restore"] = "هل انت متاكد من استعادة الموظفين المحددين؟";
 $lang["employees_current_password"] = "كلمة المرور الحالية";
@@ -13,6 +17,7 @@ $lang["employees_error_deleting_demo_admin"] = "لايمكن حذف المستخ
 $lang["employees_error_updating_demo_admin"] = "لايمكن تغيير بيانات المستخدم admin الخاص بنسخة العرض.";
 $lang["employees_language"] = "اللغة";
 $lang["employees_login_info"] = "معلومات دخول الموظف";
+$lang["employees_manager"] = "";
 $lang["employees_new"] = "موظف جديد";
 $lang["employees_none_selected"] = "لم تختار أى من الموظفين للحذف.";
 $lang["employees_one_or_multiple"] = "موظف/موظفين";
@@ -33,5 +38,6 @@ $lang["employees_system_language"] = "لغة النظام";
 $lang["employees_unsuccessful_change_password"] = "فشل في تغيير كلمة المرور.";
 $lang["employees_update"] = "تحديث بيانات موظف";
 $lang["employees_username"] = "اسم المستخدم";
+$lang["employees_username_duplicate"] = "";
 $lang["employees_username_minlength"] = "اسم المستخدم يجب أن يكون 5 حروف على الأقل.";
 $lang["employees_username_required"] = "اسم المستخدم مطلوب.";

application/language/ar-LB/expenses_lang.php

@@ -29,9 +29,11 @@ $lang["expenses_error_adding_updating"] = "خطأ في الإضافة";
 $lang["expenses_expense_id"] = "كود المصاريف";
 $lang["expenses_expenses_employee"] = "موظف";
 $lang["expenses_info"] = "معلومات عن المصاريف";
+$lang["expenses_ip_address"] = "";
 $lang["expenses_is_deleted"] = "ممسوحة";
 $lang["expenses_name_required"] = "خانة مطلوبة: اسم المصاريف";
 $lang["expenses_new"] = "مصاريف جديدة";
+$lang["expenses_new_supplier"] = "";
 $lang["expenses_no_expenses_to_display"] = "لا يوجد مصاريف في التاريخ المحدد";
 $lang["expenses_none_selected"] = "لم يتم تحديد اي خيار";
 $lang["expenses_one_or_multiple"] = "واحد او أكثر";
@@ -43,4 +45,5 @@ $lang["expenses_successful_updating"] = "تم تعديل المصاريف بنج
 $lang["expenses_supplier_name"] = "اسم المورد";
 $lang["expenses_supplier_tax_code"] = "كود ضريبة المورد";
 $lang["expenses_tax_amount"] = "قيمة الضريبة";
+$lang["expenses_tax_amount_number"] = "";
 $lang["expenses_update"] = "تعديل";

application/language/ar-LB/giftcards_lang.php

@@ -17,6 +17,7 @@ $lang["giftcards_confirm_delete"] = "هل أنت متأكد انك تريد حذ
 $lang["giftcards_confirm_restore"] = "هل تريد بالتأكيد استعادة بطاقة (بطاقات) الهدايا المحددة؟";
 $lang["giftcards_cost_price"] = "سعر التكلفة";
 $lang["giftcards_count"] = "تحديث المخزون";
+$lang["giftcards_csv_import_failed"] = "فشل الإستيراد من اكسل.";
 $lang["giftcards_current_quantity"] = "الكميات الحالية";
 $lang["giftcards_description"] = "الوصف";
 $lang["giftcards_details_count"] = "حركة الكارت";
@@ -25,7 +26,6 @@ $lang["giftcards_edit_fields_you_want_to_update"] = "قم بتحديث الحق
 $lang["giftcards_edit_multiple_giftcards"] = "تحرير مجموعة من بطاقات الهدايا.";
 $lang["giftcards_error_adding_updating"] = "خطاء فى إضافة/تحديث بطاقة هدية.";
 $lang["giftcards_error_updating_multiple"] = "خطاء فى تحديث بيانات بطاقات الهدايا.";
-$lang["giftcards_excel_import_failed"] = "فشل الإستيراد من اكسل.";
 $lang["giftcards_generate_barcodes"] = "توليد أكواد الباركود";
 $lang["giftcards_giftcard"] = "بطاقة هدية";
 $lang["giftcards_giftcard_number"] = "رقم بطاقة الهدية";

application/language/ar-LB/item_kits_lang.php

@@ -14,6 +14,10 @@ $lang["item_kits_error_adding_updating"] = "خطاء فى إضافة/تحديث
 $lang["item_kits_find_kit_item"] = "صنف لمجموعة";
 $lang["item_kits_info"] = "معلومات المجموعة";
 $lang["item_kits_item"] = "صنف";
+$lang["item_kits_item_kit_number"] = "";
+$lang["item_kits_item_kit_number_duplicate"] = "";
+$lang["item_kits_item_number"] = "";
+$lang["item_kits_item_number_duplicate"] = "";
 $lang["item_kits_items"] = "أصناف";
 $lang["item_kits_kit"] = "كود المجموعة";
 $lang["item_kits_kit_and_components"] = "المجموعة ومحتوياتها";
@@ -32,4 +36,5 @@ $lang["item_kits_sequence"] = "التسلسل";
 $lang["item_kits_successful_adding"] = "لقد تم إضافة المجموعة بنجاح";
 $lang["item_kits_successful_deleted"] = "لقد تم حذف المجموعة بنجاح";
 $lang["item_kits_successful_updating"] = "لقد تم تحديث بيانات المجموعة بنجاح";
+$lang["item_kits_unit_price"] = "";
 $lang["item_kits_update"] = "تحديث بيانات مجموعة";

application/language/ar-LB/items_lang.php

@@ -7,7 +7,9 @@ $lang["items_bulk_edit"] = "تحرير جماعى";
 $lang["items_buy_price_required"] = "سعر الشراء مطلوب.";
 $lang["items_cannot_be_deleted"] = "لايمكن حذف الأصناف المختارة، واحد أو أكثر منها لديه مبيعات.";
 $lang["items_cannot_find_item"] = "لايمكن ايجاد معلومات حول الصنف.";
+$lang["items_categories"] = "";
 $lang["items_category"] = "التصنيف";
+$lang["items_category_new"] = "";
 $lang["items_category_required"] = "التصنيف مطلوب.";
 $lang["items_change_all_to_allow_alt_desc"] = "السماح بوصف بديل للجميع.";
 $lang["items_change_all_to_not_allow_allow_desc"] = "عدم السماح بوصف بديل للجميع.";
@@ -22,26 +24,28 @@ $lang["items_cost_price"] = "سعر التكلفة";
 $lang["items_cost_price_number"] = "سعر التكلفة يجب أن يكون رقم.";
 $lang["items_cost_price_required"] = "سعر التكلفة مطلوب.";
 $lang["items_count"] = "تحديث المخزون";
+$lang["items_csv_import_failed"] = "فشل الإستيراد من اكسل";
+$lang["items_csv_import_nodata_wrongformat"] = "الملف الذى رفعته إما فارغ أو أنه مختلف البنية.";
+$lang["items_csv_import_partially_failed"] = "تم استيراد معظم الأصناف. البعض لم يتم استيرادهم ، وهذه هى القائمة:";
+$lang["items_csv_import_success"] = "تم استيراد الأصناف بنجاح.";
 $lang["items_current_quantity"] = "الكمية الحالية";
 $lang["items_default_pack_name"] = "كل";
 $lang["items_description"] = "الوصف";
 $lang["items_details_count"] = "حركة الصنف";
 $lang["items_do_nothing"] = "لاتفعل شئ";
+$lang["items_edit"] = "";
 $lang["items_edit_fields_you_want_to_update"] = "قم بتحديث الحقول المراد تحديثها لكل الأصناف المختارة.";
 $lang["items_edit_multiple_items"] = "تحريد مجموعة اصناف";
 $lang["items_empty_upc_items"] = "تفريغ اصناف UPC";
 $lang["items_error_adding_updating"] = "خطاء فى إضافة/تحديث صنف";
 $lang["items_error_updating_multiple"] = "خطاء فى تحديث بيانات أصناف";
-$lang["items_excel_import_failed"] = "فشل الإستيراد من اكسل";
-$lang["items_excel_import_nodata_wrongformat"] = "الملف الذى رفعته إما فارغ أو أنه مختلف البنية.";
-$lang["items_excel_import_partially_failed"] = "تم استيراد معظم الأصناف. البعض لم يتم استيرادهم ، وهذه هى القائمة:";
-$lang["items_excel_import_success"] = "تم استيراد الأصناف بنجاح.";
 $lang["items_generate_barcodes"] = "توليد أكواد الباركود";
 $lang["items_hsn_code"] = "تسميات النظام المنسق";
 $lang["items_image"] = "صورة";
-$lang["items_import_items_excel"] = "استيراد من اكسل";
+$lang["items_import_items_csv"] = "استيراد من اكسل";
 $lang["items_info_provided_by"] = "المعلومات مقدمة بواسطة";
 $lang["items_inventory"] = "المخزن";
+$lang["items_inventory_CSV_import_quantity"] = "العدد المستورد من ملفات ال CSV";
 $lang["items_inventory_comments"] = "تعليقات";
 $lang["items_inventory_data_tracking"] = "تتبع بيانات المخزون";
 $lang["items_inventory_date"] = "التاريخ";
@@ -49,8 +53,10 @@ $lang["items_inventory_employee"] = "الموظف";
 $lang["items_inventory_in_out_quantity"] = "+- كمية";
 $lang["items_inventory_remarks"] = "ملاحظات";
 $lang["items_is_deleted"] = "حذفت";
+$lang["items_is_printed"] = "";
 $lang["items_is_serialized"] = "الصنف له رقم مسلسل";
 $lang["items_item"] = "صنف";
+$lang["items_item_id"] = "";
 $lang["items_item_number"] = "الباركود UPC/EAN/ISBN";
 $lang["items_item_number_duplicate"] = "رقم الصنف موجود فى قاعدة البيانات من قبل.";
 $lang["items_kit"] = "مجموعة اصناف";
@@ -58,6 +64,7 @@ $lang["items_location"] = "مكان";
 $lang["items_low_inventory_items"] = "الأصناف التى لا يوجد لها مخزون";
 $lang["items_low_sell_item"] = "الصنف المركب";
 $lang["items_manually_editing_of_quantity"] = "تحرير الكمية يدوياً";
+$lang["items_markup"] = "";
 $lang["items_name"] = "اسم الصنف";
 $lang["items_name_required"] = "اسم الصنف مطلوب.";
 $lang["items_new"] = "صنف جديد";
@@ -96,6 +103,7 @@ $lang["items_successful_updating"] = "لقد تم تحديث بيانات صنف
 $lang["items_supplier"] = "المورد";
 $lang["items_tax_1"] = "الضريبة 1";
 $lang["items_tax_2"] = "الضريبة 2";
+$lang["items_tax_3"] = "";
 $lang["items_tax_category"] = "الفئة الضريبية";
 $lang["items_tax_percent"] = "نسبة الضريبة";
 $lang["items_tax_percent_number"] = "نسبة الضريبة يجب ان تكون رقم";

application/language/ar-LB/login_lang.php

@@ -6,5 +6,8 @@ $lang["login_invalid_gcaptcha"] = "رمز التحقق غير صحيح.";
 $lang["login_invalid_installation"] = "يوجد مشكلة بالتنصيب, الرجاء التحقق من ملف php.ini.";
 $lang["login_invalid_username_and_password"] = "اسم مستخدم/كلمة سر غير صحيح.";
 $lang["login_login"] = "دخول";
+$lang["login_logout"] = "";
+$lang["login_migration_needed"] = "";
 $lang["login_password"] = "كلمة السر";
 $lang["login_username"] = "اسم المستخدم";
+$lang["login_welcome"] = "";

application/language/ar-LB/module_lang.php

@@ -1,5 +1,7 @@
 <?php 
 
+$lang["module_admin_cashups"] = "";
+$lang["module_admin_cashups_desc"] = "";
 $lang["module_attributes"] = "ميزات/مميزات";
 $lang["module_attributes_desc"] = "إضافة، تعديل، حذف، وبحث بالميزات.";
 $lang["module_both"] = "الاثنين";
@@ -39,3 +41,7 @@ $lang["module_suppliers"] = "الموردين";
 $lang["module_suppliers_desc"] = "إضافة، تحديث ، بحث و حذف مجموعات الموردين.";
 $lang["module_taxes"] = "الضرائب";
 $lang["module_taxes_desc"] = "اعدادات ضريبة المبيعات.";
+$lang["module_timeclocks"] = "";
+$lang["module_timeclocks_categories"] = "";
+$lang["module_timeclocks_categories_desc"] = "";
+$lang["module_timeclocks_desc"] = "";

application/language/ar-LB/receivings_lang.php

@@ -1,5 +1,6 @@
 <?php 
 
+$lang["receivings_amount_due"] = "";
 $lang["receivings_cancel_receiving"] = "إلغاء";
 $lang["receivings_cannot_be_deleted"] = "لايمكن حذف الإستلام/الإستلامات.";
 $lang["receivings_comments"] = "تعليقات";
@@ -7,7 +8,9 @@ $lang["receivings_complete_receiving"] = "إنهاء";
 $lang["receivings_confirm_cancel_receiving"] = "هل أنت متاكد أنك تريد إلغاء هذا الإستلام؟ سيتم حذف كل الأصناف.";
 $lang["receivings_confirm_delete"] = "هل أنت متاكد أنك تريد حذف هذا الإستلام؟ سيتم حذف كل الأصناف. لايمكن التراجع بعد الحذف.";
 $lang["receivings_confirm_finish_receiving"] = "هل أنت متاكد أنك تريد تنفيذ هذا الإستلام؟ لايمكن التراجع بعد الإرسال.";
+$lang["receivings_confirm_restore"] = "";
 $lang["receivings_cost"] = "التكلفة";
+$lang["receivings_daily"] = "";
 $lang["receivings_date"] = "تاريخ الإستلام";
 $lang["receivings_date_required"] = "يجب إدخال تاريخ صحيح.";
 $lang["receivings_date_type"] = "التاريخ مطلوب.";

application/language/ar-LB/reports_lang.php

@@ -14,6 +14,7 @@ $lang["reports_code_return"] = "كود عمليات المرتجع";
 $lang["reports_code_type"] = "النوع";
 $lang["reports_code_work_order"] = "طلب عمل";
 $lang["reports_comments"] = "التعليقات";
+$lang["reports_commission"] = "";
 $lang["reports_complete"] = "عمليات البيع والمرتجع المكتملة";
 $lang["reports_completed_sales"] = "المبيعات المكتملة";
 $lang["reports_confirm_delete"] = "هل انت متاكد من مسح البيانات المحددة؟";
@@ -28,6 +29,7 @@ $lang["reports_date"] = "التاريخ";
 $lang["reports_date_range"] = "الفترة الزمنية";
 $lang["reports_description"] = "الوصف";
 $lang["reports_detailed_receivings_report"] = "تقرير مفصل لاستلام البضاعة";
+$lang["reports_detailed_receivings_report_input"] = "";
 $lang["reports_detailed_reports"] = "التقارير التفصيلية";
 $lang["reports_detailed_requisition_report"] = "تقرير مفصل لطلبات الشراء";
 $lang["reports_detailed_sales_report"] = "تقرير مفصل للمبيعات";
@@ -46,6 +48,7 @@ $lang["reports_expenses_amount"] = "القيمة";
 $lang["reports_expenses_categories"] = "فئات المصاريف";
 $lang["reports_expenses_categories_summary_report"] = "تقرير المصاريف حسب الفئات";
 $lang["reports_expenses_category"] = "الفئة";
+$lang["reports_expenses_payment_amount"] = "";
 $lang["reports_expenses_tax_amount"] = "الضريبة";
 $lang["reports_expenses_total_amount"] = "المبلغ الإجمالي";
 $lang["reports_expenses_total_tax_amount"] = "الضريبة الإجمالية";
@@ -105,7 +108,9 @@ $lang["reports_sales_summary_report"] = "تقرير ملخص المبيعات";
 $lang["reports_sales_taxes"] = "ضرائب المبيعات";
 $lang["reports_sales_taxes_summary_report"] = "تقرير ملخص ضرائب المبيعات";
 $lang["reports_serial_number"] = "مسلسل";
+$lang["reports_service_charge"] = "";
 $lang["reports_sold_by"] = "البائع";
+$lang["reports_sold_items"] = "";
 $lang["reports_sold_to"] = "مباع الى";
 $lang["reports_stock_location"] = "مكان المخزون";
 $lang["reports_sub_total_value"] = "المجموع الفرعى";
@@ -117,6 +122,7 @@ $lang["reports_suppliers"] = "الموردين";
 $lang["reports_suppliers_summary_report"] = "تقرير ملخص الموردين";
 $lang["reports_tax"] = "الضريبة";
 $lang["reports_tax_category"] = "الفئة الضريبية";
+$lang["reports_tax_name"] = "";
 $lang["reports_tax_percent"] = "نسبة الضريبة";
 $lang["reports_tax_rate"] = "معدل الضريبة";
 $lang["reports_taxes"] = "الضرائب";

application/language/ar-LB/sales_lang.php

@@ -10,34 +10,48 @@ $lang["sales_amount_tendered"] = "المبلغ المدفوع";
 $lang["sales_authorized_signature"] = "توقيع معتمد";
 $lang["sales_cancel_sale"] = "الغاء عملية البيع";
 $lang["sales_cash"] = "نقدى";
+$lang["sales_cash_1"] = "";
+$lang["sales_cash_2"] = "";
+$lang["sales_cash_3"] = "";
+$lang["sales_cash_4"] = "";
+$lang["sales_cash_adjustment"] = "تعديل الدفع";
 $lang["sales_cash_deposit"] = "ايداع نقدي";
 $lang["sales_cash_filter"] = "نقدى";
 $lang["sales_change_due"] = "الباقى";
+$lang["sales_change_price"] = "تغيير سعر البيع";
 $lang["sales_check"] = "شيك";
 $lang["sales_check_balance"] = "تذكير بموعد الشيك";
 $lang["sales_check_filter"] = "شيك";
+$lang["sales_close"] = "";
 $lang["sales_comment"] = "تعليق";
 $lang["sales_comments"] = "تعليقات";
+$lang["sales_company_name"] = "";
+$lang["sales_complete"] = "";
 $lang["sales_complete_sale"] = "إتمام البيع";
 $lang["sales_confirm_cancel_sale"] = "هل أنت متأكد من الغاء عملية البيع ؟ سيتم إزالة كل الأصناف.";
 $lang["sales_confirm_delete"] = "هل تريد حذف عمليات البيع المختارة؟";
 $lang["sales_confirm_restore"] = "هل انت متاكد من استعادة عملية البيع؟";
 $lang["sales_credit"] = "بطاقة إئتمانية";
 $lang["sales_credit_deposit"] = "ايداع ببطاقة ائتمان";
+$lang["sales_credit_filter"] = "بطاقة بنكية";
+$lang["sales_current_table"] = "";
 $lang["sales_customer"] = "العميل";
 $lang["sales_customer_address"] = "العنوان";
 $lang["sales_customer_discount"] = "الخصم";
 $lang["sales_customer_email"] = "البريد الإلكترونى";
 $lang["sales_customer_location"] = "المكان";
-$lang["sales_customer_mailchimp_status"] = "حالة ميل تشيمب";
+$lang["sales_customer_mailchimp_status"] = "حالة بريد ميل تشيمب";
 $lang["sales_customer_optional"] = "(مطلوب للدفعات المستحقة)";
 $lang["sales_customer_required"] = "(اجباري)";
 $lang["sales_customer_total"] = "المجموع";
+$lang["sales_customer_total_spent"] = "";
+$lang["sales_daily_sales"] = "";
 $lang["sales_date"] = "تاريخ البيع";
 $lang["sales_date_range"] = "الفترة الزمنية";
 $lang["sales_date_required"] = "يجب إدخال تاريخ صحيح.";
 $lang["sales_date_type"] = "التاريخ مطلوب.";
 $lang["sales_debit"] = "بطاقة خصم";
+$lang["sales_debit_filter"] = "";
 $lang["sales_delete"] = "اسمح بالمسح";
 $lang["sales_delete_confirmation"] = "هل أنت متأكد أنك تريد حذف عملية البيع هذه؟ لايمكن التراجع بعد الحذف.";
 $lang["sales_delete_entire_sale"] = "حذف عملية البيع بالكامل";
@@ -51,26 +65,27 @@ $lang["sales_discount_included"] = "% خصم";
 $lang["sales_discount_short"] = "%";
 $lang["sales_due"] = "مستحق";
 $lang["sales_due_filter"] = "مستحق";
-$lang["sales_edit"] = "تحرير";
-$lang["sales_edit_item"] = "تحرير صنف";
-$lang["sales_edit_sale"] = "تحرير عملية بيع";
+$lang["sales_edit"] = "تعديل";
+$lang["sales_edit_item"] = "تعديل مادة";
+$lang["sales_edit_sale"] = "تعديل عملية بيع";
 $lang["sales_email_receipt"] = "إرسال الايصال بالبريد الالكترونى";
 $lang["sales_employee"] = "الموظف";
 $lang["sales_entry"] = "ادخال";
-$lang["sales_error_editing_item"] = "خطاء فى تحرير الصنف";
-$lang["sales_find_or_scan_item"] = "بحث/مسح باركود صنف";
-$lang["sales_find_or_scan_item_or_receipt"] = "بحث/مسح باركود صنف أو ايصال";
+$lang["sales_error_editing_item"] = "خطاء فى تعديل المادة";
+$lang["sales_find_or_scan_item"] = "بحث/مسح باركود المادة";
+$lang["sales_find_or_scan_item_or_receipt"] = "بحث/مسح باركود المادة أو الايصال";
 $lang["sales_giftcard"] = "بطاقة هدية";
 $lang["sales_giftcard_balance"] = "رصيد بطاقة الهدية";
+$lang["sales_giftcard_filter"] = "";
 $lang["sales_giftcard_number"] = "رقم بطاقة الهدية";
-$lang["sales_group_by_category"] = "تصفية حسب الفئة";
-$lang["sales_group_by_type"] = "تجميع حسب النوع";
+$lang["sales_group_by_category"] = "ترتيب حسب الفئة";
+$lang["sales_group_by_type"] = "ترتيب حسب النوع";
 $lang["sales_hsn"] = "رمز نظام منسق";
-$lang["sales_id"] = "كود عملية البيع";
+$lang["sales_id"] = "رقم عملية البيع";
 $lang["sales_include_prices"] = "يشمل الاسعار؟";
 $lang["sales_invoice"] = "فاتورة";
 $lang["sales_invoice_confirm"] = "هذه الفاتورة سوف ترسل إلى";
-$lang["sales_invoice_enable"] = "إنشاء فاتورة";
+$lang["sales_invoice_enable"] = "رقم فاتورة";
 $lang["sales_invoice_filter"] = "الفواتير";
 $lang["sales_invoice_no_email"] = "هذا العميل ليس لدية بريد الكترونى صالح.";
 $lang["sales_invoice_number"] = "فاتورة رقم #";
@@ -83,31 +98,55 @@ $lang["sales_invoice_type_invoice"] = "الفاتورة (invoice.php)";
 $lang["sales_invoice_type_tax_invoice"] = "الفاتورة الضريبية (tax_invoice.php)";
 $lang["sales_invoice_unsent"] = "فشل إرسال الفاتورة إلى";
 $lang["sales_invoice_update"] = "إعادة العد";
-$lang["sales_item_insufficient_of_stock"] = "لايوجد مخزون كافى من الصنف.";
-$lang["sales_item_name"] = "اسم الصنف";
-$lang["sales_item_number"] = "صنف #";
-$lang["sales_item_out_of_stock"] = "لايوجد مخزون من الصنف.";
+$lang["sales_item_insufficient_of_stock"] = "لايوجد مخزون كافى من المادة.";
+$lang["sales_item_name"] = "اسم المادة";
+$lang["sales_item_number"] = "مادة رقم #";
+$lang["sales_item_out_of_stock"] = "لايوجد مخزون من المادة.";
+$lang["sales_key_browser"] = "";
+$lang["sales_key_cancel"] = "Cancels Current Quote/Invoice/Sale";
+$lang["sales_key_customer_search"] = "Customer Search";
+$lang["sales_key_finish_quote"] = "Finish Quote/Invoice witdout payment";
+$lang["sales_key_finish_sale"] = "Add Payment and Complete Invoice/Sale";
+$lang["sales_key_full"] = "";
+$lang["sales_key_function"] = "Function";
+$lang["sales_key_help"] = "Shortcuts";
+$lang["sales_key_help_modal"] = "Open Shortcuts Window";
+$lang["sales_key_in"] = "";
+$lang["sales_key_item_search"] = "Item Search";
+$lang["sales_key_out"] = "";
+$lang["sales_key_payment"] = "Add Payment";
+$lang["sales_key_print"] = "";
+$lang["sales_key_restore"] = "";
+$lang["sales_key_search"] = "";
+$lang["sales_key_suspend"] = "Suspend Current Sale";
+$lang["sales_key_suspended"] = "Show Suspended Sales";
+$lang["sales_key_system"] = "";
+$lang["sales_key_tendered"] = "Edit Amount Tendered";
+$lang["sales_key_title"] = "Sales Keyboard Shortcuts";
+$lang["sales_mc"] = "";
 $lang["sales_mode"] = "وضع التسجيل";
 $lang["sales_must_enter_numeric"] = "يجب إدخال رقم للمبلغ الفعلى المدفوع.";
-$lang["sales_must_enter_numeric_giftcard"] = "رقم بطاقة الهدية يجب أن يكون رقم.";
+$lang["sales_must_enter_numeric_giftcard"] = "رمز بطاقة الهدية يجب أن يكتون ارقام فقط.";
 $lang["sales_new_customer"] = "عميل جديد";
-$lang["sales_new_item"] = "صنف جديد";
+$lang["sales_new_item"] = "مادة جديدة";
 $lang["sales_no_description"] = "بدون وصف";
 $lang["sales_no_filter"] = "الكل";
-$lang["sales_no_items_in_cart"] = "لايوجد أصناف فى السلة.";
+$lang["sales_no_items_in_cart"] = "لايوجد اي مادة فى السلة.";
 $lang["sales_no_sales_to_display"] = "لاتوجد عمليات بيع لعرضها.";
 $lang["sales_none_selected"] = "لم تقم بإختيار أى عمليات بيع لحذفها.";
-$lang["sales_not_authorized"] = "هذه العملية لا يمكن فعلها لعدم تخويلك.";
+$lang["sales_nontaxed_ind"] = "";
+$lang["sales_not_authorized"] = "ليس لديك صلاحية.";
 $lang["sales_one_or_multiple"] = "عمليات بيع";
 $lang["sales_payment"] = "طريقة الدفع";
-$lang["sales_payment_amount"] = "المبلغ";
+$lang["sales_payment_amount"] = "القيمة";
 $lang["sales_payment_not_cover_total"] = "المبلغ المدفوع لايغطى المبلغ الإجمالى.";
 $lang["sales_payment_type"] = "طريقة";
+$lang["sales_payments"] = "";
 $lang["sales_payments_total"] = "إجمالى المدفوعات";
 $lang["sales_price"] = "السعر";
 $lang["sales_print_after_sale"] = "اطبع بعد عملية البيع";
 $lang["sales_quantity"] = "الكمية";
-$lang["sales_quantity_less_than_reorder_level"] = "تحذير: الكمية/العدد المطلوب غير متوفر لهذا الصنف.";
+$lang["sales_quantity_less_than_reorder_level"] = "تحذير: الكمية أقل من الحد المطلوب لهذه المادة.";
 $lang["sales_quantity_less_than_zero"] = "تحذير! الكمية المطلوبة غير كافية، بإمكانك إتمام عملية البيع ، لكن تحقق من مخزنك.";
 $lang["sales_quantity_of_items"] = "عدد ال 1% من الاصناف";
 $lang["sales_quote"] = "عرض اسعار";
@@ -120,9 +159,11 @@ $lang["sales_receipt_no_email"] = "هذا العميل ليس له اي بريد
 $lang["sales_receipt_number"] = "إيصال بيع";
 $lang["sales_receipt_sent"] = "تم إرسال الإيصال إلى";
 $lang["sales_receipt_unsent"] = "فشل إرسال الإيصال إلى";
-$lang["sales_register"] = "مسجل المبيعات";
+$lang["sales_refund"] = "نوع/سبب الاسترجاع";
+$lang["sales_register"] = "سجل المبيعات";
 $lang["sales_remove_customer"] = "حذف عميل";
-$lang["sales_return"] = "إرتجاع";
+$lang["sales_remove_discount"] = "";
+$lang["sales_return"] = "إسترجاع";
 $lang["sales_rewards"] = "نقاط المكافئة";
 $lang["sales_rewards_balance"] = "رصيد نقاط المكافئة";
 $lang["sales_sale"] = "بيع";
@@ -130,18 +171,21 @@ $lang["sales_sale_by_invoice"] = "البيع بفاتورة رسمية";
 $lang["sales_sale_for_customer"] = "العميل:";
 $lang["sales_sale_time"] = "الوقت";
 $lang["sales_sales_tax"] = "ضريبة البيع";
+$lang["sales_sales_total"] = "";
 $lang["sales_select_customer"] = "اختيار عميل (اختياري)";
 $lang["sales_send_invoice"] = "إرسال الفاتورة";
 $lang["sales_send_quote"] = "ارسال عرض الاسعار";
 $lang["sales_send_receipt"] = "إرسال إيصال";
 $lang["sales_send_work_order"] = "ارسال طلب عمل";
 $lang["sales_serial"] = "مسلسل";
+$lang["sales_service_charge"] = "";
+$lang["sales_show_due"] = "";
 $lang["sales_show_invoice"] = "عرض الفاتورة";
 $lang["sales_show_receipt"] = "عرض الإيصال";
 $lang["sales_start_typing_customer_name"] = "ابداء بكتابة اسم العميل...";
 $lang["sales_start_typing_item_name"] = "ابداء بكتابة اسم أو مسح باركود الصنف...";
 $lang["sales_stock"] = "المخزن";
-$lang["sales_stock_location"] = "مكان المخزون";
+$lang["sales_stock_location"] = "موقع التخزين";
 $lang["sales_sub_total"] = "المجموع الفرعي";
 $lang["sales_successfully_deleted"] = "لقد تم الحذف بنجاح";
 $lang["sales_successfully_restored"] = "لقد تمت عملية الاستعادة بنجاح";
@@ -157,6 +201,7 @@ $lang["sales_tax"] = "ضريبة";
 $lang["sales_tax_id"] = "الرقم الضريبي";
 $lang["sales_tax_invoice"] = "فاتورة ضريبية";
 $lang["sales_tax_percent"] = "ضريبة %";
+$lang["sales_taxed_ind"] = "";
 $lang["sales_total"] = "المجموع";
 $lang["sales_total_tax_exclusive"] = "الإجمالى بدون الضرائب";
 $lang["sales_transaction_failed"] = "فشل حركة البيع.";
@@ -169,6 +214,8 @@ $lang["sales_unsuspend"] = "إلغاء تعليق";
 $lang["sales_unsuspend_and_delete"] = "إلغاء تعليق وحذف";
 $lang["sales_update"] = "تحديث";
 $lang["sales_upi"] = "رقم التعريف الشخصي";
+$lang["sales_visa"] = "";
+$lang["sales_wholesale"] = "";
 $lang["sales_work_order"] = "طلب عمل";
 $lang["sales_work_order_number"] = "رقم طلب العمل";
 $lang["sales_work_order_number_duplicate"] = "رقم طلب العمل يجب ان يكون فريد.";

application/language/ar-LB/taxes_lang.php

@@ -14,6 +14,7 @@ $lang["taxes_group_seq"] = "تسلسل المجموعة";
 $lang["taxes_jurisdiction_name"] = "اسم الولاية القضائية";
 $lang["taxes_name"] = "الاسم";
 $lang["taxes_new"] = "ضريبة جديدة";
+$lang["taxes_no_taxes"] = "";
 $lang["taxes_no_taxes_to_display"] = "لا يوجد أكواد ضريبية للعرض";
 $lang["taxes_reporting_authority"] = "السلطة الضريبية";
 $lang["taxes_round_half_down"] = "نصف الاسفل";
@@ -54,6 +55,7 @@ $lang["taxes_tax_codes_saved_successfully"] = "تم حفظ تغييرات قان
 $lang["taxes_tax_codes_saved_unsuccessfully"] = "لم يتم حفظ تغييرات قانون الضريبة";
 $lang["taxes_tax_excluded"] = "لا تشمل الضرائب";
 $lang["taxes_tax_group"] = "المجموعة الضريبية";
+$lang["taxes_tax_group_not_unique"] = "";
 $lang["taxes_tax_group_sequence"] = "تسلسل مجموعة الضرائب";
 $lang["taxes_tax_included"] = "الضريبة مشمولة";
 $lang["taxes_tax_jurisdiction"] = "الاختصاص الضريبي";

application/language/az-AZ/attributes_lang.php

@@ -1,4 +1,5 @@
-<?php
+<?php 
+
 $lang["attributes_attribute_value_invalid_chars"] = "Atribut dəyəri bu ':' və ya '|' olmaz";
 $lang["attributes_confirm_delete"] = "Seçilmiş Atributları silmək istədiyinizdən əminsinizmi?";
 $lang["attributes_confirm_restore"] = "Seçilmiş atributları bərpa etmək istədiyinizə əminsinizmi?";

application/language/az-AZ/bootstrap_tables_lang.php

@@ -1,6 +1,6 @@
 <?php 
 
-$lang["tables_all"] = "Hamısı";
+$lang["tables_all"] = "hamısı";
 $lang["tables_columns"] = "Sütunlar";
 $lang["tables_hide_show_pagination"] = "Gizlət/Göstər səhifənin nömrələnməsin";
 $lang["tables_loading"] = "Lütfən gözləyin, səhifə yüklənir...";

application/language/az-AZ/cashups_lang.php

@@ -3,23 +3,31 @@
 $lang["cashups_amount"] = "Məbləğ";
 $lang["cashups_amount_number"] = "Məbləğ rəqəmlə olmalıdır";
 $lang["cashups_amount_required"] = "Məbləğ zəruri sahədir.";
+$lang["cashups_cancel_cashups"] = "";
+$lang["cashups_cancel_cashups_enter"] = "";
 $lang["cashups_cannot_be_deleted"] = "Pul vahidi silinməsi mümkün deyil";
+$lang["cashups_cash_difference"] = "";
 $lang["cashups_close_date"] = "Bağlanma Tarixi";
 $lang["cashups_close_employee"] = "Bağlıdır";
 $lang["cashups_closed_amount_card"] = "Kartlar";
 $lang["cashups_closed_amount_cash"] = "Kassanın Bağlanması";
 $lang["cashups_closed_amount_check"] = "Çeklər";
 $lang["cashups_closed_amount_due"] = "Rüsum";
+$lang["cashups_closed_amount_giftcard"] = "";
 $lang["cashups_closed_amount_total"] = "Cəmi";
 $lang["cashups_closed_date"] = "Bağlanma tarixi";
 $lang["cashups_confirm_delete"] = "Seçilmiş Pul vahidi silmək istədiyinizə əminsinizmi?";
 $lang["cashups_confirm_restore"] = "Seçilmiş Pul vahidi bərpa etmək istədiyinizə əminsinizmi?";
+$lang["cashups_confirm_submit"] = "";
 $lang["cashups_date_number"] = "Tarix rəqəmlə olmalıdır";
 $lang["cashups_date_required"] = "Tarixi tələb olunan bir sahədir";
 $lang["cashups_description"] = "Təsvir";
+$lang["cashups_enable_expected"] = "";
 $lang["cashups_error_adding_updating"] = "XƏTA Pul vahidi Əvavə/yenilənmədə";
+$lang["cashups_giftcard"] = "";
 $lang["cashups_id"] = "İD";
 $lang["cashups_info"] = "Pul vahidi məlumatı";
+$lang["cashups_info_employee"] = "";
 $lang["cashups_is_deleted"] = "Silindi";
 $lang["cashups_new"] = "Yeni Pul vahidi";
 $lang["cashups_no_cashups_to_display"] = "Göstərmək üçün heç nağd pul yoxdur";
@@ -35,4 +43,6 @@ $lang["cashups_successful_deleted"] = "Pul vahidi silindi";
 $lang["cashups_successful_updating"] = "Pul vahidi yeniləndi";
 $lang["cashups_total"] = "Cəmi";
 $lang["cashups_transfer_amount_cash"] = "Pul vahidi Giriş/Çıxışları";
+$lang["cashups_transfer_amount_cash_minus"] = "";
 $lang["cashups_update"] = "Pul vahidi Yeniləndi";
+$lang["cashups_warning"] = "";

application/language/az-AZ/common_lang.php

@@ -2,35 +2,43 @@
 
 $lang["common_address_1"] = "Ünvan 1";
 $lang["common_address_2"] = "Ünvan 2";
+$lang["common_admin"] = "";
 $lang["common_city"] = "Şəhər";
+$lang["common_clerk"] = "";
 $lang["common_close"] = "Bağlı";
+$lang["common_color"] = "";
 $lang["common_comments"] = "Rəylər";
 $lang["common_common"] = "ortaq";
 $lang["common_confirm_search"] = "Bir və ya bir neçə sətir seçdiniz, bunlar axtarışınızdan sonra artıq seçilməyəcək. Bu axtarışı göndərmək istədiyinizə əminsinizmi?";
+$lang["common_copyrights"] = "© 2010 - %1";
 $lang["common_correct_errors"] = "Xahiş edirik təsdiqlə-dən əvvəl səhvləri düzəldin";
 $lang["common_country"] = "Ölkə";
+$lang["common_dashboard"] = "";
 $lang["common_date"] = "Təqvim";
 $lang["common_delete"] = "Sil";
 $lang["common_det"] = "detallar";
-$lang["common_download_import_template"] = "İdxal Excel Şablonunu Yüklə (CSV)";
+$lang["common_download_import_template"] = "CSV Şablonunu (CSV) daxil edin";
 $lang["common_edit"] = "Redaktə Et";
 $lang["common_email"] = "E-poçt";
 $lang["common_email_invalid_format"] = "E-poçt ünvanı düzgün formatda deyil.";
-$lang["common_export_excel"] = "Excel Export";
-$lang["common_export_excel_no"] = "Xeyir";
-$lang["common_export_excel_yes"] = "Bəli";
+$lang["common_export_csv"] = "CSV Export";
+$lang["common_export_csv_no"] = "Xeyr";
+$lang["common_export_csv_yes"] = "Bəli";
 $lang["common_fields_required_message"] = "Qırmızı sahələr tələb olunur";
+$lang["common_fields_required_message_unique"] = "";
 $lang["common_first_name"] = "Ad";
 $lang["common_first_name_required"] = "Ad yazmağınız tələb olunur.";
 $lang["common_first_page"] = "Birinci";
 $lang["common_gender"] = "Cins";
-$lang["common_gender_female"] = "F";
-$lang["common_gender_male"] = "M";
+$lang["common_gender_female"] = "Q";
+$lang["common_gender_male"] = "K";
+$lang["common_gender_undefined"] = "";
+$lang["common_icon"] = "";
 $lang["common_id"] = "ID";
-$lang["common_import"] = "İmport";
+$lang["common_import"] = "Daxil et";
 $lang["common_import_change_file"] = "Dəyiş";
-$lang["common_import_excel"] = "Excel Import";
-$lang["common_import_full_path"] = "Excel faylına tam yol tələb olunur";
+$lang["common_import_csv"] = "CSV daxil et";
+$lang["common_import_full_path"] = "CSV faylına tam yol tələb olunur";
 $lang["common_import_remove_file"] = "Sil(Gizlət)";
 $lang["common_import_select_file"] = "Fayl Seç";
 $lang["common_inv"] = "Qaimə";
@@ -39,15 +47,21 @@ $lang["common_last_name_required"] = "Soyad tələb olunur.";
 $lang["common_last_page"] = "Son";
 $lang["common_learn_about_project"] = "Proyekt haqqında ən son məlumatı öyrənmək.";
 $lang["common_list_of"] = "Siyahısı";
+$lang["common_logo"] = "";
+$lang["common_logo_mark"] = "";
 $lang["common_logout"] = "Çıxış";
+$lang["common_manager"] = "";
 $lang["common_migration_needed"] = "Girişdən sonra bazaya %1 köçməsi başlayacaq.";
 $lang["common_new"] = "Yenisi";
+$lang["common_no"] = "";
 $lang["common_no_persons_to_display"] = "Göstərmək üçün heç kim yoxdur.";
 $lang["common_none_selected_text"] = "Seçin";
-$lang["common_or"] = "Və Ya";
+$lang["common_or"] = "Və ya";
+$lang["common_people"] = "";
 $lang["common_phone_number"] = "Telefon";
 $lang["common_phone_number_required"] = "çıxarış ";
 $lang["common_please_visit_my"] = "Xahiş edirik ziyarət edin";
+$lang["common_position"] = "";
 $lang["common_powered_by"] = "Yaradıcı";
 $lang["common_price"] = "Qiymət";
 $lang["common_print"] = "Çap";
@@ -58,13 +72,16 @@ $lang["common_return_policy"] = "Qaytarma siyasəti";
 $lang["common_search"] = "Axtarış";
 $lang["common_search_options"] = "Axtarış variantları";
 $lang["common_searched_for"] = "Axtarıldı";
-$lang["common_state"] = "Ştat";
+$lang["common_software_short"] = "";
+$lang["common_software_title"] = "";
+$lang["common_state"] = "Əyalət";
 $lang["common_submit"] = "Təsdiqlə";
-$lang["common_total_spent"] = "Cəmi Xərclənmiş";
+$lang["common_total_spent"] = "Ümumi xərc";
 $lang["common_unknown"] = "Naməlum";
 $lang["common_view_recent_sales"] = "Son Satışları Göstər";
 $lang["common_website"] = "Veb Sayt";
 $lang["common_welcome"] = "Xoş Gəlmisiniz";
 $lang["common_welcome_message"] = "ALSAN-a Xoş gəlmisiniz, başlamaq üçün bir modula basın.";
+$lang["common_yes"] = "";
 $lang["common_you_are_using_ospos"] = "Açıq Layihədə Satışın Avtomatlaşdırma Nöqtəsi versiya";
 $lang["common_zip"] = "Poçt Kodu";

application/language/az-AZ/config_lang.php

@@ -1,6 +1,8 @@
-<?php
+<?php 
+
 $lang["config_address"] = "Şirkət Adresi";
-$lang["config_address_required"] = "Şirkətin adı olan boşluq  sahəsi doldurulmalıdı.";
+$lang["config_address_required"] = "Şirkətin adı olan boşluq sahəsi doldurulmalıdı.";
+$lang["config_all_set"] = "Bütün fayl icazələri düzgün qurulub!";
 $lang["config_allow_duplicate_barcodes"] = "Dublikat Barkodlarına icazə verin";
 $lang["config_apostrophe"] = "Apastrof";
 $lang["config_backup_button"] = "Ehtiyyat Köçürmə";
@@ -29,12 +31,22 @@ $lang["config_barcode_tooltip"] = "Diqqət: Bu xüsusiyyət malların dublikat o
 $lang["config_barcode_type"] = "Barkod Növü";
 $lang["config_barcode_width"] = "Genişlik";
 $lang["config_bottom"] = "Aşağı";
+$lang["config_cash_button"] = "";
+$lang["config_cash_button_1"] = "";
+$lang["config_cash_button_2"] = "";
+$lang["config_cash_button_3"] = "";
+$lang["config_cash_button_4"] = "";
+$lang["config_cash_button_5"] = "";
+$lang["config_cash_button_6"] = "";
 $lang["config_cash_decimals"] = "Nəğd Pul Cədvəlləri";
 $lang["config_cash_decimals_tooltip"] = "Nağd pul və Məzənnədəki ədədlər eyni olarsa, onda nağd pul yuvarlaqlaşması baş verməz.";
 $lang["config_cash_rounding"] = "Nəğd Pul Yuvarlaqlaşdırılması";
+$lang["config_category_dropdown"] = "Bölməni açılan siyahida göstər";
 $lang["config_center"] = "Mərkəz";
+$lang["config_change_apperance_tooltip"] = "";
 $lang["config_comma"] = "vergül";
 $lang["config_company"] = "Şirkətin Adı";
+$lang["config_company_avatar"] = "";
 $lang["config_company_change_image"] = "Şəkili Dəyiş";
 $lang["config_company_logo"] = "Şirkətin Logosu";
 $lang["config_company_remove_image"] = "Şəkili Sil";
@@ -46,6 +58,7 @@ $lang["config_country_codes_tooltip"] = "Vergüllə ayrılmış ölkə kodları
 $lang["config_currency_code"] = "Valyuta Kodu";
 $lang["config_currency_decimals"] = "Məzənnə Rəqəmləri";
 $lang["config_currency_symbol"] = "Valyuta Simvolu";
+$lang["config_current_employee_only"] = "";
 $lang["config_customer_reward"] = "Mükafat";
 $lang["config_customer_reward_duplicate"] = "Mükafat unikal olmalıdir.";
 $lang["config_customer_reward_enable"] = "Müştəri mükafatlarını aktivləşdirin";
@@ -83,6 +96,7 @@ $lang["config_default_tax_name_required"] = "Adi vergi mütləq rəqəmlə olmal
 $lang["config_default_tax_rate"] = "Adi vergi dərəcəsi %";
 $lang["config_default_tax_rate_1"] = "Vergi Dərəcəsi 1";
 $lang["config_default_tax_rate_2"] = "Vergi Məzənnəsi 2";
+$lang["config_default_tax_rate_3"] = "";
 $lang["config_default_tax_rate_number"] = "Standart Vergi Məzənnəsi rəqəm ilə olmalıdır.";
 $lang["config_default_tax_rate_required"] = "Standart Vergi Məzənnəsi olan sahə boş qala bilməz.";
 $lang["config_derive_sale_quantity"] = "Tərtib edilmiş satış məbləğinə icazə verin";
@@ -107,9 +121,16 @@ $lang["config_email_smtp_pass"] = "Faks";
 $lang["config_email_smtp_port"] = "SMTP Portu";
 $lang["config_email_smtp_timeout"] = "STMTP vaxt bitimi (lər)";
 $lang["config_email_smtp_user"] = "SMTP İstifadəçi Adı";
+$lang["config_enable_avatar"] = "";
+$lang["config_enable_avatar_tooltip"] = "";
+$lang["config_enable_dropdown_tooltip"] = "";
+$lang["config_enable_new_look"] = "";
+$lang["config_enable_right_bar"] = "";
+$lang["config_enable_right_bar_tooltip"] = "";
 $lang["config_enforce_privacy"] = "Məxvilik Təmin edin";
 $lang["config_enforce_privacy_tooltip"] = "Müştərilərin gizliliyini qorumaq, silmək halında məlumat şifrələməsini təmin etmək";
 $lang["config_fax"] = "Faks";
+$lang["config_file_perm"] = "Fayl icazəsində problem var, lütfən bu səhvləri düzəldib səhifəni yeniləyin.";
 $lang["config_financial_year"] = "Maliyyə İli Başlancığı";
 $lang["config_financial_year_apr"] = "1 Aprel";
 $lang["config_financial_year_aug"] = "1 Avgust";
@@ -123,6 +144,7 @@ $lang["config_financial_year_may"] = "1 May";
 $lang["config_financial_year_nov"] = "1 Noyabr";
 $lang["config_financial_year_oct"] = "1 Oktyabr";
 $lang["config_financial_year_sep"] = "1 Sentyabr";
+$lang["config_floating_labels"] = "";
 $lang["config_gcaptcha_enable"] = "Giriş Səyfəsi reCAPTCHA";
 $lang["config_gcaptcha_secret_key"] = "reCAPTCHA Gizli Açarı";
 $lang["config_gcaptcha_secret_key_required"] = "reCAPTCHA Gizli Açar olan sahə boş qala bilməz";
@@ -134,9 +156,15 @@ $lang["config_general_configuration"] = "Ümumi Konfiqurasiya";
 $lang["config_giftcard_number"] = "Hədiyyə Kartı Nömrəsi";
 $lang["config_giftcard_random"] = "Təsadüfən Yarat";
 $lang["config_giftcard_series"] = "Bölümlərə görə Yarat";
+$lang["config_image_allowed_file_types"] = "İcazəli fayl növləri";
+$lang["config_image_max_height_tooltip"] = "Şəkillərinin maksimum hündürlüyü pikselə(px).";
+$lang["config_image_max_size_tooltip"] = "Şəkil yükləmələrinin maksimum fayl ölçüsü kilobaytla(kb).";
+$lang["config_image_max_width_tooltip"] = "Şəkillərinin maksimum enliliyi pikselə(px).";
+$lang["config_image_restrictions"] = "Şəkil yükləmə məhdudiyyətləri";
 $lang["config_include_hsn"] = "HSN Kodlarına dəstək verin";
 $lang["config_info"] = "Məlumat";
 $lang["config_info_configuration"] = "Dükan İnformasiyası";
+$lang["config_input_groups"] = "";
 $lang["config_integrations"] = "İnteqrasiya";
 $lang["config_integrations_configuration"] = "Üçüncü tərəf inteqrasiya";
 $lang["config_invoice"] = "Faktura";
@@ -146,6 +174,9 @@ $lang["config_invoice_email_message"] = "Dil";
 $lang["config_invoice_enable"] = "Fakturanı Aktivləşdir";
 $lang["config_invoice_printer"] = "Faktura Printeri";
 $lang["config_invoice_type"] = "Qaimənin Tipi";
+$lang["config_is_readable"] = "oxunur, lakin icazələr 660-dan yüksəkdir.";
+$lang["config_is_writable"] = "yazılabilir, lakin icazələr 750-dən yüksəkdir.";
+$lang["config_item_markup"] = "";
 $lang["config_jsprintsetup_required"] = "Xəbərdarlıq: Bu funksiya yalnız FireFox jsPrintSetup addon quraşdırıldığı halda işləyəcəkdir. Yadda saxlanılsın?";
 $lang["config_language"] = "Dil";
 $lang["config_last_used_invoice_number"] = "Son istifadə edilmiş Faktura nömrəsi";
@@ -164,6 +195,7 @@ $lang["config_locale_info"] = "Lokallaşdırma Konfiqurasiya Məlumatı";
 $lang["config_location"] = "Fond";
 $lang["config_location_configuration"] = "Anbar Yerləri";
 $lang["config_location_info"] = "Yer Konfiqurasiya Məlumatı";
+$lang["config_login_form"] = "";
 $lang["config_logout"] = "Çıxışdan əvvəl məlumatlari ehtiyat bazasına köçürmək istəyirsinizmi? Çıxış üçün Bekap və ya [Ləğv] üçün [OK]' düyməsinə basın.";
 $lang["config_mailchimp"] = "Mailçimp";
 $lang["config_mailchimp_api_key"] = "Mailchimp API Açarı";
@@ -183,6 +215,7 @@ $lang["config_msg_src_required"] = "SMS-API Göndərici ID tələb olunan sahəd
 $lang["config_msg_uid"] = "SMS-API İstifadəçi adı";
 $lang["config_msg_uid_required"] = "SMS-API İstifadəçi adı tələb olunan sahədir";
 $lang["config_multi_pack_enabled"] = "Hər bir elementə birdən çox paket";
+$lang["config_no_risk"] = "Təhlükəsizlik / zəiflik riski yoxdur.";
 $lang["config_none"] = "Heç biri";
 $lang["config_notify_alignment"] = "Bildiriş Pəncərə Mövqeyi";
 $lang["config_number_format"] = "Nömrə Formatı";
@@ -190,8 +223,10 @@ $lang["config_number_locale"] = "Yerləşdirmə";
 $lang["config_number_locale_invalid"] = "Kompaniyanın tel.";
 $lang["config_number_locale_required"] = "Şirkət telefonu olan sahə boş qalma bilməz.";
 $lang["config_number_locale_tooltip"] = "Bu link vasitəsilə uyğun bir yer tapın.";
+$lang["config_os_timezone"] = "OSPOS Saat qurşağı:";
 $lang["config_ospos_info"] = "OSPOS quraşdırılması məlumatı";
 $lang["config_payment_options_order"] = "Sifariş üçün Ödəmə Şərtləri";
+$lang["config_perm_risk"] = "Permissions higher than 750 leaves this software at risk.";
 $lang["config_phone"] = "Şirkətin Telefon Nömrəsi";
 $lang["config_phone_required"] = "Şirkət Telefonu tələb olunan bir sahədir.";
 $lang["config_print_bottom_margin"] = "Çərçivədki aşağı Sərhəd";
@@ -217,8 +252,10 @@ $lang["config_print_top_margin"] = "Üstdəki Künc";
 $lang["config_print_top_margin_number"] = "Üstdəki Künc rəqəm ilə olmalıdır.";
 $lang["config_print_top_margin_required"] = "Üstdəki Sahə Boş qala bilməz.";
 $lang["config_quantity_decimals"] = "Ondalıqların Miqdarı";
+$lang["config_quick_cash_enable"] = "";
 $lang["config_quote_default_comments"] = "Standart şərhlər";
 $lang["config_receipt"] = "Çek";
+$lang["config_receipt_category"] = "";
 $lang["config_receipt_configuration"] = "Çek Cap Parametirləri";
 $lang["config_receipt_default"] = "Adi";
 $lang["config_receipt_font_size"] = "Yazı Tipi";
@@ -230,12 +267,14 @@ $lang["config_receipt_short"] = "Qısa";
 $lang["config_receipt_show_company_name"] = "Şirkətin Adını Göstər";
 $lang["config_receipt_show_description"] = "Təsviri Göstər";
 $lang["config_receipt_show_serialnumber"] = "Serial nömrəsi göstər";
+$lang["config_receipt_show_tax_ind"] = "Vergi göstəricisinə bax";
 $lang["config_receipt_show_taxes"] = "Vergini Göstər";
 $lang["config_receipt_show_total_discount"] = "Ümumi Endirim göstər";
 $lang["config_receipt_template"] = "Geri qaytarmaq mütləq məsafə lazımdır";
 $lang["config_receiving_calculate_average_price"] = "Otalama Qiyməti Hesabla (Alınan)";
 $lang["config_recv_invoice_format"] = "Alınan Fatura Formatı";
 $lang["config_register_mode_default"] = "Standart Qeydiyyat Rejimi";
+$lang["config_report_an_issue"] = "Bir problemi bildirişi";
 $lang["config_return_policy_required"] = "Geri Qaytarma Qanunu olan sahə zəruri sahədir.";
 $lang["config_reward"] = "Mükafat";
 $lang["config_reward_configuration"] = "Konfiqurasiya ugurla saxlanıldı";
@@ -244,18 +283,24 @@ $lang["config_sales_invoice_format"] = "Satış Fatura Formatı";
 $lang["config_sales_quote_format"] = "Satış Sitat Formati";
 $lang["config_saved_successfully"] = "Konfiqurasiya uğurla saxlanıldı.";
 $lang["config_saved_unsuccessfully"] = "Konfiqurasiyanı saxlamq mümkün olmadı.";
+$lang["config_security_issue"] = "Təhlükəsizlik açığı xəbərdarlığı";
 $lang["config_server_notice"] = "Xahiş edirik, hesabatın təqdim edilməsi üçün aşağıdakı məlumatı istifadə edin.";
+$lang["config_service_charge"] = "";
+$lang["config_show_due_enable"] = "";
 $lang["config_show_office_group"] = "Ofis İşarəsini Göstər";
 $lang["config_statistics"] = "Statistikalari Göndər";
 $lang["config_statistics_tooltip"] = "İnkişaf və xüsusiyyət təkmilləşdirilməsi məqsədi ilə statistika göndərin.";
 $lang["config_stock_location"] = "Ehtiyyat Yeri";
 $lang["config_stock_location_duplicate"] = "Ehtiyyat Olan Yer Unikal Olmalıdir.";
-$lang["config_stock_location_invalid_chars"] = "Ehtiyyat Yeri  '_' təşkil etməməlidir.";
+$lang["config_stock_location_invalid_chars"] = "Ehtiyyat Yeri təşkil etməməlidir '_'.";
 $lang["config_stock_location_required"] = "Ehtiyyat Yeri Olan Sahə boş qala bilməz.";
+$lang["config_suggestions_fifth_column"] = "";
 $lang["config_suggestions_first_column"] = "Sütun 1";
+$lang["config_suggestions_fourth_column"] = "";
 $lang["config_suggestions_layout"] = "Təklif Çərçivələrini Axtar";
 $lang["config_suggestions_second_column"] = "Sütun 2";
 $lang["config_suggestions_third_column"] = "Sütun 3";
+$lang["config_system_conf"] = "Quraşdırma və Conf";
 $lang["config_system_info"] = "System Info";
 $lang["config_table"] = "Masa";
 $lang["config_table_configuration"] = "Cədvəl Konfiqurasiyası";
@@ -271,10 +316,14 @@ $lang["config_tax_decimals"] = "Vaxt";
 $lang["config_tax_id"] = "Vergi İD";
 $lang["config_tax_included"] = "Vergi Daxildir";
 $lang["config_theme"] = "Vebsayt";
+$lang["config_theme_preview"] = "";
 $lang["config_thousands_separator"] = "Minliklər Ayıran";
 $lang["config_timezone"] = "Vaxt Zonası";
+$lang["config_timezone_error"] = "OSPOS Saat qurşağı Yerli saat qurşağınızdan fərqlidir.";
 $lang["config_top"] = "Yuxarı";
 $lang["config_use_destination_based_tax"] = "Təyinatından vergi istifadə edin";
+$lang["config_user_timezone"] = "Yerli saat qurşağı:";
 $lang["config_website"] = "Vebsayt";
+$lang["config_wholesale_markup"] = "";
 $lang["config_work_order_enable"] = "İş Sifariş Dəstəyi";
 $lang["config_work_order_format"] = "İş Sifarş Farmatı";

application/language/az-AZ/customers_lang.php

@@ -1,8 +1,9 @@
 <?php 
 
-$lang["customers_account_number"] = "hesab nömrəsi";
+$lang["customers_account_number"] = "Hesab nömrəsi";
 $lang["customers_account_number_duplicate"] = "Hesab nömrəsi artıq verilənlər bazasında mövcuddur.";
 $lang["customers_available_points"] = "Mövcud ballar";
+$lang["customers_available_points_value"] = "";
 $lang["customers_average"] = "Orta xərclənən";
 $lang["customers_avg_discount"] = "Orta endirim";
 $lang["customers_basic_information"] = "Məlumat";
@@ -12,6 +13,10 @@ $lang["customers_confirm_delete"] = "Siz seçilmiş müştərini (lər) silməy
 $lang["customers_confirm_restore"] = "Seçilmiş müştəriləri bərpa etmək istədiyinizə əminsinizmi?";
 $lang["customers_consent"] = "Qeydiyyatın razılığı";
 $lang["customers_consent_required"] = "Qeydiyyatın razılığı tələb olunan bir sahədir.";
+$lang["customers_csv_import_failed"] = "CSV idxalı alınmadı";
+$lang["customers_csv_import_nodata_wrongformat"] = "Yüklənmiş faylda məlumat yoxdur və ya düzgün formatda deyil.";
+$lang["customers_csv_import_partially_failed"] = "Müştəri əlavəsi bəzi səhvlər olmaqla uğurla alındı:";
+$lang["customers_csv_import_success"] = "Müştəri Əlavəsi uğurla alındı.";
 $lang["customers_customer"] = "Müştəri";
 $lang["customers_date"] = "Tarix";
 $lang["customers_discount"] = "Endirim";
@@ -21,11 +26,7 @@ $lang["customers_discount_type"] = "Endirim növü";
 $lang["customers_email_duplicate"] = "Məlumat bazasında artıq bu e-poçt ünvanı var.";
 $lang["customers_employee"] = "Əməkdaş";
 $lang["customers_error_adding_updating"] = "Müştəri əlavəsində ya da yenilənməsində XƏTA.";
-$lang["customers_excel_import_failed"] = "Excel idxalı alınmadı";
-$lang["customers_excel_import_nodata_wrongformat"] = "Yüklənmiş faylda məlumat yoxdur və ya düzgün formatda deyil.";
-$lang["customers_excel_import_partially_failed"] = "Müştəri əlavəsi bəzi səhvlər olmaqla uğurla alındı:";
-$lang["customers_excel_import_success"] = "Müştəri Əlavəsi uğurla alındı.";
-$lang["customers_import_items_excel"] = "Exceldən müştəri əlavə et";
+$lang["customers_import_items_csv"] = "CSVdən müştəri əlavə et";
 $lang["customers_mailchimp_activity_click"] = "Elektron poçt düyməsi";
 $lang["customers_mailchimp_activity_lastopen"] = "Son açılan məktub";
 $lang["customers_mailchimp_activity_open"] = "Açıq məktub";

application/language/az-AZ/employees_lang.php

@@ -1,8 +1,12 @@
 <?php 
 
+$lang["employees_administrator"] = "";
 $lang["employees_basic_information"] = "Məlumat";
-$lang["employees_cannot_be_deleted"] = "Seçilmiş əməkdaş (lar) silinə bilməz, bir və ya birdən çox əməkdaş satışlar edib, əks halda siz öz heasabınızı silməyə çalışırsiz.";
+$lang["employees_cannot_be_deleted"] = "Seçilmiş əməkdaş (lar) silinə bilməz, bir və ya birdən çox əməkdaş satışlar edib, əks halda siz öz heasabınızı silməyə çalışırsınız.";
+$lang["employees_change_employee"] = "";
 $lang["employees_change_password"] = "Şifrəni Dəyiş";
+$lang["employees_clerk"] = "";
+$lang["employees_commission"] = "";
 $lang["employees_confirm_delete"] = "Siz əminsiniz ki seçilmiş əməkdaşları silmək istəyirsiniz?";
 $lang["employees_confirm_restore"] = "Seçilmiş əməkdaşı (lar) yenidən bərpa etməyinizə əminsinizmi?";
 $lang["employees_current_password"] = "İndiki Şifrə";
@@ -13,6 +17,7 @@ $lang["employees_error_deleting_demo_admin"] = "Demo administrator istifadəçis
 $lang["employees_error_updating_demo_admin"] = "Demo administrator istifadəçisini dəyişə bilməzsiniz.";
 $lang["employees_language"] = "Dil";
 $lang["employees_login_info"] = "Daxil Ol";
+$lang["employees_manager"] = "";
 $lang["employees_new"] = "Yeni Əməkdaş";
 $lang["employees_none_selected"] = "Silmək üçün heç bir işçi (lər) seçməmisiniz.";
 $lang["employees_one_or_multiple"] = "İşçi (lər)";
@@ -33,5 +38,6 @@ $lang["employees_system_language"] = "Sistem Dili";
 $lang["employees_unsuccessful_change_password"] = "Şifrə dəyişməsi uğursuz oldu.";
 $lang["employees_update"] = "İşçini yeniləyin";
 $lang["employees_username"] = "İstifadəçi Adı";
+$lang["employees_username_duplicate"] = "";
 $lang["employees_username_minlength"] = "İstifadəçi adı ən azı 5 simvol olmalıdır.";
 $lang["employees_username_required"] = "İstifadəçi adı tələb olunan sahədir.";

application/language/az-AZ/expenses_categories_lang.php

@@ -1,19 +1,19 @@
 <?php 
 
-$lang["category_name_required"] = "Xərc Kategoriyası adı tələb olunur";
-$lang["expenses_categories_add_item"] = "Kategoriya əlavə et";
-$lang["expenses_categories_cannot_be_deleted"] = "Kategoriya Xərcləri silinmədi";
+$lang["category_name_required"] = "Xərc kateqoriyası adı tələb olunur";
+$lang["expenses_categories_add_item"] = "Kateqoriya əlavə et";
+$lang["expenses_categories_cannot_be_deleted"] = "Kateqoriya xərcləri silinmədi";
 $lang["expenses_categories_category_id"] = "Kimlik";
 $lang["expenses_categories_confirm_delete"] = "Seçilmiş xərc kateqoriyasını silmək istədiyinizə əminsinizmi?";
 $lang["expenses_categories_confirm_restore"] = "Seçilmiş xərc bölməsini bərpa etmək istədiyinizə əminsiniz?";
 $lang["expenses_categories_description"] = "Kateqoriya təsviri";
 $lang["expenses_categories_error_adding_updating"] = "Əlavədə Səhv/Xərcl Kategotiyasi yenilənir";
-$lang["expenses_categories_info"] = "Xərc Kategoriyası Məlumatı";
-$lang["expenses_categories_name"] = "Kategoriya adı";
-$lang["expenses_categories_new"] = "Yeni Kategoriya";
-$lang["expenses_categories_no_expenses_categories_to_display"] = "Heç bir kategoriya göstərilmir";
-$lang["expenses_categories_none_selected"] = "Siz heç bir Xərc Kategoriyasi Seçməmisiniz";
-$lang["expenses_categories_one_or_multiple"] = "Xərc Kategoriyası";
+$lang["expenses_categories_info"] = "Xərc kateqoriyası haqqında məlumat";
+$lang["expenses_categories_name"] = "Kateqoriya adı";
+$lang["expenses_categories_new"] = "Yeni Kateqoriya";
+$lang["expenses_categories_no_expenses_categories_to_display"] = "Heç bir kateqoriya göstərilmir";
+$lang["expenses_categories_none_selected"] = "Siz heç bir Xərc Kateqoriyası seçməmisiniz";
+$lang["expenses_categories_one_or_multiple"] = "Xərc Kateqoriyası";
 $lang["expenses_categories_quantity"] = "Miqdarı";
 $lang["expenses_categories_successful_adding"] = "Xərc Kategoriyası uğurla əlavə edildi";
 $lang["expenses_categories_successful_deleted"] = "Xərc Kategoriyası uğurla silindi";

application/language/az-AZ/expenses_lang.php

@@ -29,9 +29,11 @@ $lang["expenses_error_adding_updating"] = "Əlavədə Səhv/Xərci yeniləmək";
 $lang["expenses_expense_id"] = "Kimlilk";
 $lang["expenses_expenses_employee"] = "Əməkdaş";
 $lang["expenses_info"] = "Xərc Məlumatı";
+$lang["expenses_ip_address"] = "";
 $lang["expenses_is_deleted"] = "Silinib";
 $lang["expenses_name_required"] = "Xərcin məlumatı qeyd edilməlidir";
 $lang["expenses_new"] = "Yeni Xərc";
+$lang["expenses_new_supplier"] = "";
 $lang["expenses_no_expenses_to_display"] = "Heç bir Xərclər göstərilmir";
 $lang["expenses_none_selected"] = "Siz heç bir xərc seçməmisiniz";
 $lang["expenses_one_or_multiple"] = "Xərc (lər)";
@@ -43,4 +45,5 @@ $lang["expenses_successful_updating"] = "Xərc Uğurla Yeniləndi";
 $lang["expenses_supplier_name"] = "Təchizatçı";
 $lang["expenses_supplier_tax_code"] = "Vergi Məcəlləsi";
 $lang["expenses_tax_amount"] = "Vergi";
+$lang["expenses_tax_amount_number"] = "";
 $lang["expenses_update"] = "Xərci Yenilə";

application/language/az-AZ/giftcards_lang.php

@@ -17,6 +17,7 @@ $lang["giftcards_confirm_delete"] = "Seçilmiş Hədiyyə Kartlarını ləğv et
 $lang["giftcards_confirm_restore"] = "Seçilmiş Hədiyyə Kartlarını (lər) bərpa etmək istədiyinizə əminsinizmi?";
 $lang["giftcards_cost_price"] = "Topdan Satış Qiyməti";
 $lang["giftcards_count"] = "İnventarlaşdırmanı Yenilə";
+$lang["giftcards_csv_import_failed"] = "CSV idxalı uğursuz oldu.";
 $lang["giftcards_current_quantity"] = "Hazırkı Sayı";
 $lang["giftcards_description"] = "Təsvir";
 $lang["giftcards_details_count"] = "İnventarlaşdırma Sayının Detalları";
@@ -25,7 +26,6 @@ $lang["giftcards_edit_fields_you_want_to_update"] = "Seçilmiş Hədiyyə Kartla
 $lang["giftcards_edit_multiple_giftcards"] = "Birneçə Hədiyyə Kartını redaktə et.";
 $lang["giftcards_error_adding_updating"] = "Hədiyyə Kartı əlavə və ya yenilənməsində XƏTA.";
 $lang["giftcards_error_updating_multiple"] = "Hədiyyə kartlarının yeniləməsi uğursuz oldu.";
-$lang["giftcards_excel_import_failed"] = "Excel idxalı uğursuz oldu.";
 $lang["giftcards_generate_barcodes"] = "Barkodlar Yarat";
 $lang["giftcards_giftcard"] = "Hədiyyə Kartı";
 $lang["giftcards_giftcard_number"] = "Hədiyyə Kartı Nömrəsi";

application/language/az-AZ/item_kits_lang.php

@@ -3,7 +3,7 @@
 $lang["item_kits_add_item"] = "Mal Əlavə Etmək";
 $lang["item_kits_all"] = "Hamısı";
 $lang["item_kits_cannot_be_deleted"] = "Dəst Mal (lar) silinə bilməz.";
-$lang["item_kits_confirm_delete"] = "Siz əminsiniz ki seçilmiş mallar dəstlərini  silmək istəyirsiniz?";
+$lang["item_kits_confirm_delete"] = "Seçilmiş mallar dəstlərini silmək istəyinizə əminsiniz?";
 $lang["item_kits_confirm_restore"] = "Seçilən Mal dəstini (lər) bərpa etmək istədiyinizə əminsiniz?";
 $lang["item_kits_description"] = "Mal Dəstinin Təsviri";
 $lang["item_kits_discount"] = "Endirim";
@@ -14,6 +14,10 @@ $lang["item_kits_error_adding_updating"] = "Malı yeniləməkdə və ya əlavə
 $lang["item_kits_find_kit_item"] = "Mal Dəsti";
 $lang["item_kits_info"] = "Mal Dəsti haqqında informasiya";
 $lang["item_kits_item"] = "Maddə";
+$lang["item_kits_item_kit_number"] = "Barkod";
+$lang["item_kits_item_kit_number_duplicate"] = "";
+$lang["item_kits_item_number"] = "";
+$lang["item_kits_item_number_duplicate"] = "";
 $lang["item_kits_items"] = "Mallar";
 $lang["item_kits_kit"] = "Dəstin İd";
 $lang["item_kits_kit_and_components"] = "Dəst və Komponentlər";
@@ -32,4 +36,5 @@ $lang["item_kits_sequence"] = "Ardıcıllıq";
 $lang["item_kits_successful_adding"] = "Siz uğurla mal dəsti əlavə etdiniz";
 $lang["item_kits_successful_deleted"] = "siz uğurla sildiniz";
 $lang["item_kits_successful_updating"] = "Siz uğurla malı yenilədiniz";
+$lang["item_kits_unit_price"] = "";
 $lang["item_kits_update"] = "Mal Dəstini Yenilənməsi";

application/language/az-AZ/items_lang.php

@@ -7,7 +7,9 @@ $lang["items_bulk_edit"] = "Kütləvi Redaktə";
 $lang["items_buy_price_required"] = "Alış qiyməti tələb olunan sahədir.";
 $lang["items_cannot_be_deleted"] = "Seçilmiş Mal (lar) silmək mükün deyil, bir və ya birdən çox Mallarda Satışlar var.";
 $lang["items_cannot_find_item"] = "Mal Tapılmadı.";
+$lang["items_categories"] = "";
 $lang["items_category"] = "kateqoriya";
+$lang["items_category_new"] = "";
 $lang["items_category_required"] = "Bölmə sahəsi boş qala bilməz.";
 $lang["items_change_all_to_allow_alt_desc"] = "Hamısı üçün Alternativ Təsvirə İcazə Verin.";
 $lang["items_change_all_to_not_allow_allow_desc"] = "Hamısı üçün Alternativ Təsvirə İcazə Verməyin.";
@@ -18,30 +20,32 @@ $lang["items_confirm_bulk_edit"] = "Siz əminsinizmi ki işarələnmiş butun ma
 $lang["items_confirm_bulk_edit_wipe_taxes"] = "Bütün Vergi haqqında olan Məlumatların  yerləri  dəyişəcək.";
 $lang["items_confirm_delete"] = "siz əminsiniz ki seçilmiş malları silmək istəyirsiniz?";
 $lang["items_confirm_restore"] = "Seçilmiş element (lər) bərpa etmək istədiyinizə əminsinizmi?";
-$lang["items_cost_price"] = "topdan satış qiyməti";
+$lang["items_cost_price"] = "Alış qiyməti";
 $lang["items_cost_price_number"] = "Topdan satış rəqəmlə olmalıdır.";
 $lang["items_cost_price_required"] = "Topdan satiış - yazılması vacib sahə.";
 $lang["items_count"] = "inventorun yenilənməsi";
+$lang["items_csv_import_failed"] = "səhv csv import";
+$lang["items_csv_import_nodata_wrongformat"] = "Yüklənmiş faylda məlumat yoxdur və ya düzgün formatlanmır.";
+$lang["items_csv_import_partially_failed"] = "Xətlərdə %1 element idxalı uğursuzluq (lar) var: %2. Heç bir sıra idxal edilmədi.";
+$lang["items_csv_import_success"] = "Malların İdxalı Uğurla Həyata Keçdi.";
 $lang["items_current_quantity"] = "indiki say";
 $lang["items_default_pack_name"] = "Hər biri";
 $lang["items_description"] = "təsvir";
 $lang["items_details_count"] = "detallı inventor sayı";
 $lang["items_do_nothing"] = "heç nə etməmək";
+$lang["items_edit"] = "";
 $lang["items_edit_fields_you_want_to_update"] = "Seçilmiş məhsullar üçün tələb olunan sahələri redaktə edin.";
 $lang["items_edit_multiple_items"] = "bir neçə malın redaktəsi";
 $lang["items_empty_upc_items"] = "Boş Barkod Malları";
 $lang["items_error_adding_updating"] = "mal əlavə etməkdə və ya yeniləməkdə səhv var";
 $lang["items_error_updating_multiple"] = "malların yenilənməsində səhv var";
-$lang["items_excel_import_failed"] = "səhv excel import";
-$lang["items_excel_import_nodata_wrongformat"] = "Yüklənmiş faylda məlumat yoxdur və ya düzgün formatlanmır.";
-$lang["items_excel_import_partially_failed"] = "Bəzi uğursuzluqlarla idxal idarəsi müvəffəq olub:";
-$lang["items_excel_import_success"] = "Malların İdxalı Uğurla Həyata Keçdi.";
 $lang["items_generate_barcodes"] = "şifrə yarat";
 $lang["items_hsn_code"] = "Harmonize Sistem Nomenklaturası";
 $lang["items_image"] = "Avatar";
-$lang["items_import_items_excel"] = "Exceldən Malları İdxal Et";
+$lang["items_import_items_csv"] = "CSVdən Malları İdxal Et";
 $lang["items_info_provided_by"] = "Məlumat təqdim olundu";
 $lang["items_inventory"] = "inventor";
+$lang["items_inventory_CSV_import_quantity"] = "Miqdarı CSV-dən idxal olunur";
 $lang["items_inventory_comments"] = "komentariyalar";
 $lang["items_inventory_data_tracking"] = "İnventarlaşdırma Üçün Məlumat İzləmə";
 $lang["items_inventory_date"] = "Tarix";
@@ -49,8 +53,10 @@ $lang["items_inventory_employee"] = "Əmakdaş";
 $lang["items_inventory_in_out_quantity"] = "Daxili və Xarici Say";
 $lang["items_inventory_remarks"] = "Qeydlər";
 $lang["items_is_deleted"] = "Silindi";
+$lang["items_is_printed"] = "";
 $lang["items_is_serialized"] = "Malın Seriya Nömrəsi var";
 $lang["items_item"] = "Mal";
+$lang["items_item_id"] = "";
 $lang["items_item_number"] = "Barkod";
 $lang["items_item_number_duplicate"] = "Malın Nömrəsi artiq Məlumat bazasında var.";
 $lang["items_kit"] = "Dəst";
@@ -58,6 +64,7 @@ $lang["items_location"] = "Yer";
 $lang["items_low_inventory_items"] = "Bitmış Mallar";
 $lang["items_low_sell_item"] = "Malların aşağı qiy. satışı";
 $lang["items_manually_editing_of_quantity"] = "Sayı Əl ilə Redeaktə Etmək";
+$lang["items_markup"] = "";
 $lang["items_name"] = "Malın Adı";
 $lang["items_name_required"] = "Malın adı olan sahə boş qala bilməz.";
 $lang["items_new"] = "Yeni Mal";
@@ -96,6 +103,7 @@ $lang["items_successful_updating"] = "Siz uğurla malı yenilədiniz";
 $lang["items_supplier"] = "Təchizatcı";
 $lang["items_tax_1"] = "Vergi 1";
 $lang["items_tax_2"] = "Vergi 2";
+$lang["items_tax_3"] = "";
 $lang["items_tax_category"] = "Vergi Bolməsi";
 $lang["items_tax_percent"] = "Vergi Faizi";
 $lang["items_tax_percent_number"] = "Vergi Faizi rəqəmli dəyər vahidi olmalıdir";

application/language/az-AZ/login_lang.php

@@ -6,5 +6,8 @@ $lang["login_invalid_gcaptcha"] = "Yanlış, Mən robot deyiləm.";
 $lang["login_invalid_installation"] = "Quraşdırma düzgün deyil, php.ini faylını yoxlayın.";
 $lang["login_invalid_username_and_password"] = "Ad və ya şifrə səhvdir.";
 $lang["login_login"] = "Giriş";
+$lang["login_logout"] = "";
+$lang["login_migration_needed"] = "";
 $lang["login_password"] = "Şifrə";
 $lang["login_username"] = "İstifadəçi";
+$lang["login_welcome"] = "";

application/language/az-AZ/module_lang.php

@@ -1,5 +1,7 @@
 <?php 
 
+$lang["module_admin_cashups"] = "";
+$lang["module_admin_cashups_desc"] = "";
 $lang["module_attributes"] = "Atributlar";
 $lang["module_attributes_desc"] = "Atributları əlavə et, yenilə, sil və ya axtar.";
 $lang["module_both"] = "Hər ikizi";
@@ -8,7 +10,7 @@ $lang["module_cashups_desc"] = "Əlavə et, Yenilə, Sil və Qazancları axtar."
 $lang["module_config"] = "Konfiqursiya";
 $lang["module_config_desc"] = "ALSAN Konfiqurasiyasını dəyiş.";
 $lang["module_customers"] = "Müştərilər";
-$lang["module_customers_desc"] = "Əlavə et,Yenilə,Sil və Müştəriləri axtar.";
+$lang["module_customers_desc"] = "Əlavə et, Yenilə, Sil və Müştəriləri axtar.";
 $lang["module_employees"] = "Əməkdaşlar";
 $lang["module_employees_desc"] = "Əlavə et,Yenilə,Sil və Əməkdaşları axtar.";
 $lang["module_expenses"] = "Xərclər";
@@ -35,7 +37,11 @@ $lang["module_reports"] = "Hesabatlar";
 $lang["module_reports_desc"] = "Hesabatları Yarat və Göstər.";
 $lang["module_sales"] = "Satışlar";
 $lang["module_sales_desc"] = "Satış prosesləri və Qaytarılanlar.";
-$lang["module_suppliers"] = "Təchizatcılar";
-$lang["module_suppliers_desc"] = "Əlavə et,Yenilə,Sil və Təchizatçıları Axtar.";
+$lang["module_suppliers"] = "Təchizatçılar";
+$lang["module_suppliers_desc"] = "Əlavə et, Yenilə, Sil və Təchizatçıları Axtar.";
 $lang["module_taxes"] = "Vergi";
 $lang["module_taxes_desc"] = "Satış üçün Vergiləri Ayarla.";
+$lang["module_timeclocks"] = "";
+$lang["module_timeclocks_categories"] = "";
+$lang["module_timeclocks_categories_desc"] = "";
+$lang["module_timeclocks_desc"] = "";

application/language/az-AZ/receivings_lang.php

@@ -1,5 +1,6 @@
 <?php 
 
+$lang["receivings_amount_due"] = "";
 $lang["receivings_cancel_receiving"] = "İmtina";
 $lang["receivings_cannot_be_deleted"] = "Qəbul olunanlar silinmədi.";
 $lang["receivings_comments"] = "Rəylər";
@@ -7,7 +8,9 @@ $lang["receivings_complete_receiving"] = "Bitirmək";
 $lang["receivings_confirm_cancel_receiving"] = "Siz əminsinizmi bu qəbul olunanları silməyinizə? Bütün mallar təmizlənəcək.";
 $lang["receivings_confirm_delete"] = "Bu qəbuldan silmək istədiyinizə əminsiniz? Bu hərəkət geri qaytarıla bilməz.";
 $lang["receivings_confirm_finish_receiving"] = "Bu qəbulu təqdim etmək istədiyinizə əminsiniz? Bunu geri qaytarmaq mümkün deyil.";
+$lang["receivings_confirm_restore"] = "";
 $lang["receivings_cost"] = "Xərc";
+$lang["receivings_daily"] = "";
 $lang["receivings_date"] = "Qəbul olunma tarixi";
 $lang["receivings_date_required"] = "Düzgün bir tarix daxil olunmalıdır.";
 $lang["receivings_date_type"] = "Tarixi tələb olunan bir sahədir.";
@@ -18,7 +21,7 @@ $lang["receivings_edit_sale"] = "malın redaktəsi səhvdir";
 $lang["receivings_employee"] = "Əməkdaş";
 $lang["receivings_error_editing_item"] = "Mal redaktə edilmədi.";
 $lang["receivings_error_requisition"] = "İnventarın yerdəyişməsi və ya yerinə qoyulması mümkün olmadı.";
-$lang["receivings_find_or_scan_item"] = "alış id";
+$lang["receivings_find_or_scan_item"] = "Məhsulu tap və ya skan et";
 $lang["receivings_find_or_scan_item_or_receipt"] = "malın adı";
 $lang["receivings_id"] = "alınma rejimi";
 $lang["receivings_item_name"] = "yeni tədarükçü";

application/language/az-AZ/reports_lang.php

@@ -1,8 +1,9 @@
-<?php
+<?php 
+
 $lang["reports_all"] = "hamısı";
 $lang["reports_authority"] = "Səlahiyyət";
 $lang["reports_canceled"] = "Ləğv Edilmiş";
-$lang["reports_categories"] = "kateqoriyalar";
+$lang["reports_categories"] = "Kateqoriyalar";
 $lang["reports_categories_summary_report"] = "komentariyalar";
 $lang["reports_category"] = "Kategoriya";
 $lang["reports_code_canceled"] = "CNL";
@@ -13,6 +14,7 @@ $lang["reports_code_return"] = "RET";
 $lang["reports_code_type"] = "Növ";
 $lang["reports_code_work_order"] = "W/O";
 $lang["reports_comments"] = "bütün qiymət";
+$lang["reports_commission"] = "";
 $lang["reports_complete"] = "Tamamlanmış Satış və Geri Qaytarılanlar";
 $lang["reports_completed_sales"] = "Tamamlanmış Satışlar";
 $lang["reports_confirm_delete"] = "Seçdiyiniz giriş (lər) silmək istədiyinizə əminsinizmi?";
@@ -21,12 +23,13 @@ $lang["reports_cost"] = "hesab";
 $lang["reports_cost_price"] = "müştəri";
 $lang["reports_count"] = "müştərilər";
 $lang["reports_customer"] = "müştərilərin hesabatı";
-$lang["reports_customers"] = "gun";
+$lang["reports_customers"] = "Müştərilər";
 $lang["reports_customers_summary_report"] = "gün";
 $lang["reports_date"] = "təsvir";
 $lang["reports_date_range"] = "detallı göndərilən hesabatlar";
 $lang["reports_description"] = "detallı hesabatlar";
 $lang["reports_detailed_receivings_report"] = "Ətraflı satınalma hesabatı";
+$lang["reports_detailed_receivings_report_input"] = "";
 $lang["reports_detailed_reports"] = "etraflı məlumat";
 $lang["reports_detailed_requisition_report"] = "endirimler";
 $lang["reports_detailed_sales_report"] = "Ətraflı satış hesabatı";
@@ -38,13 +41,14 @@ $lang["reports_discounts"] = "Endirimlər";
 $lang["reports_discounts_summary_report"] = "əməkdaş";
 $lang["reports_earned"] = "əməkdaş";
 $lang["reports_employee"] = "əməkdaşın hesabatı";
-$lang["reports_employees"] = "qrafik hesabatlar";
+$lang["reports_employees"] = "İşçilər";
 $lang["reports_employees_summary_report"] = "İşçilərin Xülasəsi Hesabatı";
 $lang["reports_expenses"] = "Xərclər";
 $lang["reports_expenses_amount"] = "Məbləğ";
 $lang["reports_expenses_categories"] = "Xərclər";
 $lang["reports_expenses_categories_summary_report"] = "Xərc kateqoriyasında Son Hesabat";
 $lang["reports_expenses_category"] = "Kategoriya";
+$lang["reports_expenses_payment_amount"] = "";
 $lang["reports_expenses_tax_amount"] = "Vergi";
 $lang["reports_expenses_total_amount"] = "Ümumi Məbləğ";
 $lang["reports_expenses_total_tax_amount"] = "Ümumi Vergi";
@@ -104,7 +108,9 @@ $lang["reports_sales_summary_report"] = "toplam";
 $lang["reports_sales_taxes"] = "Satışdan Vergi";
 $lang["reports_sales_taxes_summary_report"] = "Satışdan vergilərə dair yekun hesabat";
 $lang["reports_serial_number"] = "hesabatlar";
+$lang["reports_service_charge"] = "";
 $lang["reports_sold_by"] = "kim tərəfindən qoyulub";
+$lang["reports_sold_items"] = "";
 $lang["reports_sold_to"] = "təchizatçı";
 $lang["reports_stock_location"] = "təchizatçılar";
 $lang["reports_sub_total_value"] = "təchizatci hesabatı";
@@ -116,6 +122,7 @@ $lang["reports_suppliers"] = "toplam";
 $lang["reports_suppliers_summary_report"] = "Təchizatçıların Yekun Hesabatı";
 $lang["reports_tax"] = "tip";
 $lang["reports_tax_category"] = "Vergi Bolməsi";
+$lang["reports_tax_name"] = "";
 $lang["reports_tax_percent"] = "Retail Price";
 $lang["reports_tax_rate"] = "Vergi dərəcəsi";
 $lang["reports_taxes"] = "Vergilər";

application/language/az-AZ/sales_lang.php

@@ -1,42 +1,57 @@
-<?php
+<?php 
+
 $lang["customers_available_points"] = "Mövcud ballar";
 $lang["rewards_package"] = "Mükafatlar";
 $lang["rewards_remaining_balance"] = "Mükafatın yerdə qalan bal dəyəri ";
 $lang["sales_account_number"] = "Hesab #";
 $lang["sales_add_payment"] = "Ödəniş Əlavə Etmək";
-$lang["sales_amount_due"] = "Məbləğə Görə";
-$lang["sales_amount_tendered"] = "Təklif olunan Məbləğ";
+$lang["sales_amount_due"] = "Qalıq";
+$lang["sales_amount_tendered"] = "Ödənilən məbləğ";
 $lang["sales_authorized_signature"] = "Səlahiyyətli İmza";
 $lang["sales_cancel_sale"] = "İmtina";
 $lang["sales_cash"] = "Nəğd pullar";
+$lang["sales_cash_1"] = "";
+$lang["sales_cash_2"] = "";
+$lang["sales_cash_3"] = "";
+$lang["sales_cash_4"] = "";
+$lang["sales_cash_adjustment"] = "";
 $lang["sales_cash_deposit"] = "Nağd depozit";
 $lang["sales_cash_filter"] = "Nəğd Pul";
-$lang["sales_change_due"] = "Dəyişikliyə görə";
+$lang["sales_change_due"] = "Qalıq";
+$lang["sales_change_price"] = "Satış qiymətini dəyiş";
 $lang["sales_check"] = "Çek";
 $lang["sales_check_balance"] = "Çek Xatırladan";
 $lang["sales_check_filter"] = "Çek";
+$lang["sales_close"] = "";
 $lang["sales_comment"] = "Şərh";
 $lang["sales_comments"] = "Şərhlər";
+$lang["sales_company_name"] = "";
+$lang["sales_complete"] = "";
 $lang["sales_complete_sale"] = "Tamamlayın";
 $lang["sales_confirm_cancel_sale"] = "Siz əminsiniz ki,satışı ləğv etmək istəyirsiniz? Bütün detallar silinəcək.";
 $lang["sales_confirm_delete"] = "Siz əminsiniz ki seçilmiş satışı (lar) silmək istəyirsiz?";
 $lang["sales_confirm_restore"] = "Seçilmiş Satışları bərpa etmək istədiyinizə əminsinizmi?";
 $lang["sales_credit"] = "Kredit kartı";
 $lang["sales_credit_deposit"] = "Kredit Depoziti";
+$lang["sales_credit_filter"] = "";
+$lang["sales_current_table"] = "";
 $lang["sales_customer"] = "Ad";
 $lang["sales_customer_address"] = "Ünvan";
 $lang["sales_customer_discount"] = "Endirim";
 $lang["sales_customer_email"] = "E-poçt";
 $lang["sales_customer_location"] = "Yer";
 $lang["sales_customer_mailchimp_status"] = "Mailchimp Statusu";
-$lang["sales_customer_optional"] = "(Ödənişlər üçün tələb olunur)";
+$lang["sales_customer_optional"] = "(Ödənişlərdə tələb olunur)";
 $lang["sales_customer_required"] = "(Vacib)";
 $lang["sales_customer_total"] = "Cəmi";
+$lang["sales_customer_total_spent"] = "";
+$lang["sales_daily_sales"] = "";
 $lang["sales_date"] = "Satış Tarixi";
 $lang["sales_date_range"] = "Tarix Aralığı";
 $lang["sales_date_required"] = "Düzgün tarix daxil edilməlidir.";
 $lang["sales_date_type"] = "Boşluğa tarix əlavə edilməlidir.";
 $lang["sales_debit"] = "Debit kart";
+$lang["sales_debit_filter"] = "";
 $lang["sales_delete"] = "Silməyə izin ver";
 $lang["sales_delete_confirmation"] = "Siz bu satışı silmək istəyinizə əminsiniz? Bu əməlliyat bərpa edilməyəcək.";
 $lang["sales_delete_entire_sale"] = "Bütün Satışı Silmək";
@@ -61,6 +76,7 @@ $lang["sales_find_or_scan_item"] = "Malın axtarışı";
 $lang["sales_find_or_scan_item_or_receipt"] = "Tapmaq skan etmək və ya kvitansiya";
 $lang["sales_giftcard"] = "Hədiyyə Kartı";
 $lang["sales_giftcard_balance"] = "Hədiyyə Kartı Balansı";
+$lang["sales_giftcard_filter"] = "";
 $lang["sales_giftcard_number"] = "Hədiyyə kartının nömrəsi";
 $lang["sales_group_by_category"] = "Bölməyə görə grup";
 $lang["sales_group_by_type"] = "Növə görə qrup";
@@ -86,8 +102,30 @@ $lang["sales_item_insufficient_of_stock"] = "Anbarda kifayət qədər mal yoxdur
 $lang["sales_item_name"] = "Malın adı";
 $lang["sales_item_number"] = "Mal #";
 $lang["sales_item_out_of_stock"] = "Mal satılıb.";
+$lang["sales_key_browser"] = "";
+$lang["sales_key_cancel"] = "Cancels Current Quote/Invoice/Sale";
+$lang["sales_key_customer_search"] = "Customer Search";
+$lang["sales_key_finish_quote"] = "Finish Quote/Invoice witdout payment";
+$lang["sales_key_finish_sale"] = "Add Payment and Complete Invoice/Sale";
+$lang["sales_key_full"] = "";
+$lang["sales_key_function"] = "Function";
+$lang["sales_key_help"] = "Shortcuts";
+$lang["sales_key_help_modal"] = "Open Shortcuts Window";
+$lang["sales_key_in"] = "";
+$lang["sales_key_item_search"] = "Item Search";
+$lang["sales_key_out"] = "";
+$lang["sales_key_payment"] = "Add Payment";
+$lang["sales_key_print"] = "";
+$lang["sales_key_restore"] = "";
+$lang["sales_key_search"] = "";
+$lang["sales_key_suspend"] = "Suspend Current Sale";
+$lang["sales_key_suspended"] = "Show Suspended Sales";
+$lang["sales_key_system"] = "";
+$lang["sales_key_tendered"] = "Edit Amount Tendered";
+$lang["sales_key_title"] = "Sales Keyboard Shortcuts";
+$lang["sales_mc"] = "";
 $lang["sales_mode"] = "Qeydiyyat Rejimi";
-$lang["sales_must_enter_numeric"] = "Təklif olunan məbləğ rəqəm ilə olmalıdır.";
+$lang["sales_must_enter_numeric"] = "Ödəniş məbləği rəqəm ilə olmalıdır.";
 $lang["sales_must_enter_numeric_giftcard"] = "Hədiyyə Kartın nömrəsi rəqəmlə olmalıdır.";
 $lang["sales_new_customer"] = "Yeni Müştəri";
 $lang["sales_new_item"] = "Yeni Mal";
@@ -96,12 +134,14 @@ $lang["sales_no_filter"] = "Hamısı";
 $lang["sales_no_items_in_cart"] = "Səbətdə heç bir mal yoxdur.";
 $lang["sales_no_sales_to_display"] = "Satış yoxdur.";
 $lang["sales_none_selected"] = "Silmək üçün hər hansı bir Satış (lar) seçmədiniz.";
+$lang["sales_nontaxed_ind"] = " . ";
 $lang["sales_not_authorized"] = "Bu hərəkət səlahiyyətli deyil.";
 $lang["sales_one_or_multiple"] = "Satış (lar)";
 $lang["sales_payment"] = "Ödəniş Növü";
 $lang["sales_payment_amount"] = "Məbləğ";
 $lang["sales_payment_not_cover_total"] = "Ödəmə məbləği Toplamdan çox və ya bərabər olmalıdır.";
 $lang["sales_payment_type"] = "Növ";
+$lang["sales_payments"] = "";
 $lang["sales_payments_total"] = "Cəmi Ödənilənlər";
 $lang["sales_price"] = "Qiymət";
 $lang["sales_print_after_sale"] = "Satışdan sonra Çap edin";
@@ -119,8 +159,10 @@ $lang["sales_receipt_no_email"] = "Bu müştərinin etibarlı bir e-poçt ünvan
 $lang["sales_receipt_number"] = "Satış №";
 $lang["sales_receipt_sent"] = "Çek Göndərildi";
 $lang["sales_receipt_unsent"] = "Çek göndərilə Bilmədi";
+$lang["sales_refund"] = "Qaytarılma növü";
 $lang["sales_register"] = "jurnal satışı";
 $lang["sales_remove_customer"] = "müştəriləri silmək";
+$lang["sales_remove_discount"] = "";
 $lang["sales_return"] = "qaytarmaq";
 $lang["sales_rewards"] = "Mükafat Balları";
 $lang["sales_rewards_balance"] = "Mükafat Balları Balansı";
@@ -129,12 +171,15 @@ $lang["sales_sale_by_invoice"] = "Faktura ilə Satış";
 $lang["sales_sale_for_customer"] = "Müştəri:";
 $lang["sales_sale_time"] = "Vaxt";
 $lang["sales_sales_tax"] = "Satış Vergisi";
-$lang["sales_select_customer"] = "müştəri secmək";
+$lang["sales_sales_total"] = "";
+$lang["sales_select_customer"] = "Müştəri seçmək";
 $lang["sales_send_invoice"] = "Faktura Göndər";
 $lang["sales_send_quote"] = "Sitat Göndər";
 $lang["sales_send_receipt"] = "Çek Göndər";
 $lang["sales_send_work_order"] = "İş Sifarişini Göndərin";
 $lang["sales_serial"] = "seriya nömrəsi";
+$lang["sales_service_charge"] = "";
+$lang["sales_show_due"] = "";
 $lang["sales_show_invoice"] = "Fakturanı Göstər";
 $lang["sales_show_receipt"] = "Çek Göstər";
 $lang["sales_start_typing_customer_name"] = "müştəri adını çap etməyə başlayın...";
@@ -156,6 +201,7 @@ $lang["sales_tax"] = "vergi";
 $lang["sales_tax_id"] = "Vergi İD";
 $lang["sales_tax_invoice"] = "Vergi Qaimə";
 $lang["sales_tax_percent"] = "vergi %";
+$lang["sales_taxed_ind"] = "T";
 $lang["sales_total"] = "cəm";
 $lang["sales_total_tax_exclusive"] = "Vergi Xaric";
 $lang["sales_transaction_failed"] = "Satış əməliyyatı uğursuz oldu.";
@@ -168,6 +214,8 @@ $lang["sales_unsuspend"] = "blok etmək";
 $lang["sales_unsuspend_and_delete"] = "blok etmək və silmək";
 $lang["sales_update"] = "Yenilə";
 $lang["sales_upi"] = "UPI";
+$lang["sales_visa"] = "";
+$lang["sales_wholesale"] = "";
 $lang["sales_work_order"] = "İş Sifarişi";
 $lang["sales_work_order_number"] = "Sifariş nömrəsi";
 $lang["sales_work_order_number_duplicate"] = "İş sifarişinin nömrəsi unikal olmalıdır.";

application/language/az-AZ/suppliers_lang.php

@@ -4,7 +4,7 @@ $lang["suppliers_account_number"] = "Hesab №";
 $lang["suppliers_agency_name"] = "Agentliyin Adı";
 $lang["suppliers_cannot_be_deleted"] = "Seçilmiş Təchizatçı (lar) silinə bilmədi. Bir və ya birdən çox satışlar var.";
 $lang["suppliers_category"] = "Bölmə";
-$lang["suppliers_company_name"] = "Kompaniyanın Adı";
+$lang["suppliers_company_name"] = "Firma Adı";
 $lang["suppliers_company_name_required"] = "Şirkətin Adı - yazılması vacib sahə.";
 $lang["suppliers_confirm_delete"] = "Siz əminsiniz ki seçilmiş təchizatçı (lar) ı silmək istəyirsiniz?";
 $lang["suppliers_confirm_restore"] = "Seçilmiş təchizatçı (lar) bərpa etmək istədiyinizə əminsinizmi?";
@@ -12,7 +12,7 @@ $lang["suppliers_cost"] = "Maliyə Təchizatçı";
 $lang["suppliers_error_adding_updating"] = "Təchizatçı əlavə et / yenilə XƏTA.";
 $lang["suppliers_goods"] = "Məhsullar Təchizatçı";
 $lang["suppliers_new"] = "Yeni Təchizatçı";
-$lang["suppliers_none_selected"] = "Siz silmək üçün heç bir təchizatçı (lar)  seçmədiniz.";
+$lang["suppliers_none_selected"] = "Siz silmək üçün heç bir təchizatçı seçmədiniz.";
 $lang["suppliers_one_or_multiple"] = "Təchizatçı (lar)";
 $lang["suppliers_successful_adding"] = "Siz Təchizatçını uğurla əlavə etdiniz";
 $lang["suppliers_successful_deleted"] = "Siz uğurla sildiniz";

application/language/az-AZ/taxes_lang.php

@@ -14,6 +14,7 @@ $lang["taxes_group_seq"] = "Qrup seq";
 $lang["taxes_jurisdiction_name"] = "Yurisdiksiya Adı";
 $lang["taxes_name"] = "Ad";
 $lang["taxes_new"] = "Yeni Vergi";
+$lang["taxes_no_taxes"] = "";
 $lang["taxes_no_taxes_to_display"] = "Göstərməyə Vergi Kodu yoxdur";
 $lang["taxes_reporting_authority"] = "Hesabat orqanı";
 $lang["taxes_round_half_down"] = "Yarı Aşağı";
@@ -54,6 +55,7 @@ $lang["taxes_tax_codes_saved_successfully"] = "Vergi kodu dəyişikliyi saxlanı
 $lang["taxes_tax_codes_saved_unsuccessfully"] = "Vergi kodu dəyişikliyi saxlanılmadı";
 $lang["taxes_tax_excluded"] = "Vergi istisna olunur";
 $lang["taxes_tax_group"] = "Vergi qurupu";
+$lang["taxes_tax_group_not_unique"] = "Vergi Qrupu %1 unikal deyil";
 $lang["taxes_tax_group_sequence"] = "Vergi Qrupu Sırası";
 $lang["taxes_tax_included"] = "Vergi daxildir";
 $lang["taxes_tax_jurisdiction"] = "Vergi Yurisdiksiya";

application/language/bg/bootstrap_tables_lang.php

@@ -1,6 +1,6 @@
 <?php 
 
-$lang["tables_all"] = "Всичко";
+$lang["tables_all"] = "Всичко/и";
 $lang["tables_columns"] = "Колони";
 $lang["tables_hide_show_pagination"] = "Скриване / Показване на страници";
 $lang["tables_loading"] = "Зареждане, моля изчакайте...";

application/language/bg/cashups_lang.php

@@ -3,23 +3,31 @@
 $lang["cashups_amount"] = "";
 $lang["cashups_amount_number"] = "";
 $lang["cashups_amount_required"] = "";
+$lang["cashups_cancel_cashups"] = "";
+$lang["cashups_cancel_cashups_enter"] = "";
 $lang["cashups_cannot_be_deleted"] = "";
+$lang["cashups_cash_difference"] = "";
 $lang["cashups_close_date"] = "";
 $lang["cashups_close_employee"] = "";
 $lang["cashups_closed_amount_card"] = "";
 $lang["cashups_closed_amount_cash"] = "";
 $lang["cashups_closed_amount_check"] = "";
 $lang["cashups_closed_amount_due"] = "";
+$lang["cashups_closed_amount_giftcard"] = "";
 $lang["cashups_closed_amount_total"] = "";
 $lang["cashups_closed_date"] = "";
 $lang["cashups_confirm_delete"] = "";
 $lang["cashups_confirm_restore"] = "";
+$lang["cashups_confirm_submit"] = "";
 $lang["cashups_date_number"] = "";
 $lang["cashups_date_required"] = "";
 $lang["cashups_description"] = "";
+$lang["cashups_enable_expected"] = "";
 $lang["cashups_error_adding_updating"] = "";
+$lang["cashups_giftcard"] = "";
 $lang["cashups_id"] = "";
 $lang["cashups_info"] = "";
+$lang["cashups_info_employee"] = "";
 $lang["cashups_is_deleted"] = "";
 $lang["cashups_new"] = "";
 $lang["cashups_no_cashups_to_display"] = "";
@@ -35,4 +43,6 @@ $lang["cashups_successful_deleted"] = "";
 $lang["cashups_successful_updating"] = "";
 $lang["cashups_total"] = "";
 $lang["cashups_transfer_amount_cash"] = "";
+$lang["cashups_transfer_amount_cash_minus"] = "";
 $lang["cashups_update"] = "";
+$lang["cashups_warning"] = "";

application/language/bg/common_lang.php

@@ -2,35 +2,43 @@
 
 $lang["common_address_1"] = "Адрес 1";
 $lang["common_address_2"] = "Адрес 2";
+$lang["common_admin"] = "";
 $lang["common_city"] = "Град";
+$lang["common_clerk"] = "";
 $lang["common_close"] = "Затвори";
+$lang["common_color"] = "";
 $lang["common_comments"] = "Коментари";
 $lang["common_common"] = "Често срещани";
 $lang["common_confirm_search"] = "Избрали сте един или повече редове, след търсене няма да бъдат избрани. Наистина ли искате да подадете това търсене?";
-$lang["common_correct_errors"] = "";
+$lang["common_copyrights"] = "© 2010 - %1";
+$lang["common_correct_errors"] = "Моля, коригирайте установените грешки преди записване";
 $lang["common_country"] = "Държава";
+$lang["common_dashboard"] = "";
 $lang["common_date"] = "Дата";
 $lang["common_delete"] = "Изтриване";
 $lang["common_det"] = "Детайли";
-$lang["common_download_import_template"] = "Изтегляне на шаблон за импортиране на Excel (CSV)";
+$lang["common_download_import_template"] = "Изтегляне на шаблон за импортиране на CSV (CSV)";
 $lang["common_edit"] = "Редактиране";
 $lang["common_email"] = "Електронна поща";
 $lang["common_email_invalid_format"] = "Имейл адресът не е в правилния формат.";
-$lang["common_export_excel"] = "Експорт на Excel";
-$lang["common_export_excel_no"] = "Не";
-$lang["common_export_excel_yes"] = "Да";
+$lang["common_export_csv"] = "Експорт на CSV";
+$lang["common_export_csv_no"] = "Не";
+$lang["common_export_csv_yes"] = "Да";
 $lang["common_fields_required_message"] = "Полетата в червено са задължителни";
+$lang["common_fields_required_message_unique"] = "";
 $lang["common_first_name"] = "Име";
 $lang["common_first_name_required"] = "Име е задължително поле.";
 $lang["common_first_page"] = "Първи";
 $lang["common_gender"] = "Пол";
 $lang["common_gender_female"] = "Ж";
 $lang["common_gender_male"] = "М";
+$lang["common_gender_undefined"] = "";
+$lang["common_icon"] = "";
 $lang["common_id"] = "Номер";
 $lang["common_import"] = "Внос";
 $lang["common_import_change_file"] = "Промяна";
-$lang["common_import_excel"] = "Внос на Excel";
-$lang["common_import_full_path"] = "Необходим е пълен пътека към файл с Excel";
+$lang["common_import_csv"] = "Внос на CSV";
+$lang["common_import_full_path"] = "Необходим е пълен пътека към файл с CSV";
 $lang["common_import_remove_file"] = "Премахване";
 $lang["common_import_select_file"] = "Изберете файл";
 $lang["common_inv"] = "Покана";
@@ -39,15 +47,21 @@ $lang["common_last_name_required"] = "Фамилия е задължително
 $lang["common_last_page"] = "Последна";
 $lang["common_learn_about_project"] = "за да научите най-новата информация за проекта.";
 $lang["common_list_of"] = "Списък с";
+$lang["common_logo"] = "";
+$lang["common_logo_mark"] = "";
 $lang["common_logout"] = "Излизане от профила";
-$lang["common_migration_needed"] = "";
+$lang["common_manager"] = "";
+$lang["common_migration_needed"] = "Мигриране на база данни ще започне след влизане.";
 $lang["common_new"] = "Нов";
+$lang["common_no"] = "";
 $lang["common_no_persons_to_display"] = "Няма хора за показване.";
-$lang["common_none_selected_text"] = "Нищо не е избрано.";
+$lang["common_none_selected_text"] = "Нищо не е избрано";
 $lang["common_or"] = "Или";
+$lang["common_people"] = "";
 $lang["common_phone_number"] = "Телефонен номер";
 $lang["common_phone_number_required"] = "";
 $lang["common_please_visit_my"] = "Моля, посетете";
+$lang["common_position"] = "";
 $lang["common_powered_by"] = "С подкрепата на";
 $lang["common_price"] = "Цена";
 $lang["common_print"] = "Принтиране";
@@ -58,6 +72,8 @@ $lang["common_return_policy"] = "Условия за връщане";
 $lang["common_search"] = "Търсене";
 $lang["common_search_options"] = "Опции за търсене";
 $lang["common_searched_for"] = "Търсене за";
+$lang["common_software_short"] = "";
+$lang["common_software_title"] = "";
 $lang["common_state"] = "Щат";
 $lang["common_submit"] = "Изпращане";
 $lang["common_total_spent"] = "Общо изразходвани";
@@ -66,5 +82,6 @@ $lang["common_view_recent_sales"] = "Преглед на последните п
 $lang["common_website"] = "Уебсайт";
 $lang["common_welcome"] = "Добре дошли";
 $lang["common_welcome_message"] = "Добре дошли в OSPOS, кликнете върху модул по-долу, за да започнете.";
+$lang["common_yes"] = "";
 $lang["common_you_are_using_ospos"] = "Вие използвате Open Source Point Оf Sale версия";
 $lang["common_zip"] = "Пощенски код";

application/language/bg/config_lang.php

@@ -2,6 +2,7 @@
 
 $lang["config_address"] = "Адрес на компанията";
 $lang["config_address_required"] = "Адресът на компанията е задължително поле.";
+$lang["config_all_set"] = "All file permissions are set correctly!";
 $lang["config_allow_duplicate_barcodes"] = "Разрешаване на дублирани баркодове";
 $lang["config_apostrophe"] = "апостроф";
 $lang["config_backup_button"] = "резервно копие";
@@ -30,12 +31,22 @@ $lang["config_barcode_tooltip"] = "Warning: This feature can cause duplicate ite
 $lang["config_barcode_type"] = "Barcode Type";
 $lang["config_barcode_width"] = "Width (px)";
 $lang["config_bottom"] = "Bottom";
+$lang["config_cash_button"] = "";
+$lang["config_cash_button_1"] = "";
+$lang["config_cash_button_2"] = "";
+$lang["config_cash_button_3"] = "";
+$lang["config_cash_button_4"] = "";
+$lang["config_cash_button_5"] = "";
+$lang["config_cash_button_6"] = "";
 $lang["config_cash_decimals"] = "Cash Decimals";
 $lang["config_cash_decimals_tooltip"] = "If Cash Decimals and Currency Decimals are the same then no cash rounding will take place.";
 $lang["config_cash_rounding"] = "Cash Rounding";
+$lang["config_category_dropdown"] = "";
 $lang["config_center"] = "Center";
+$lang["config_change_apperance_tooltip"] = "";
 $lang["config_comma"] = "comma";
 $lang["config_company"] = "Company Name";
+$lang["config_company_avatar"] = "";
 $lang["config_company_change_image"] = "Change Image";
 $lang["config_company_logo"] = "Company Logo";
 $lang["config_company_remove_image"] = "Remove Image";
@@ -47,6 +58,7 @@ $lang["config_country_codes_tooltip"] = "Comma separated list of country codes f
 $lang["config_currency_code"] = "";
 $lang["config_currency_decimals"] = "Currency Decimals";
 $lang["config_currency_symbol"] = "Currency Symbol";
+$lang["config_current_employee_only"] = "";
 $lang["config_customer_reward"] = "Reward";
 $lang["config_customer_reward_duplicate"] = "Reward must be unique.";
 $lang["config_customer_reward_enable"] = "Enable Customer Rewards";
@@ -84,6 +96,7 @@ $lang["config_default_tax_name_required"] = "Default Tax Name is a required fiel
 $lang["config_default_tax_rate"] = "Default Tax Rate %";
 $lang["config_default_tax_rate_1"] = "Tax 1 Rate";
 $lang["config_default_tax_rate_2"] = "Tax 2 Rate";
+$lang["config_default_tax_rate_3"] = "";
 $lang["config_default_tax_rate_number"] = "Default Tax Rate must be a number.";
 $lang["config_default_tax_rate_required"] = "Default Tax Rate is a required field.";
 $lang["config_derive_sale_quantity"] = "";
@@ -108,9 +121,16 @@ $lang["config_email_smtp_pass"] = "SMTP Password";
 $lang["config_email_smtp_port"] = "SMTP Port";
 $lang["config_email_smtp_timeout"] = "SMTP Timeout (s)";
 $lang["config_email_smtp_user"] = "SMTP Username";
+$lang["config_enable_avatar"] = "";
+$lang["config_enable_avatar_tooltip"] = "";
+$lang["config_enable_dropdown_tooltip"] = "";
+$lang["config_enable_new_look"] = "";
+$lang["config_enable_right_bar"] = "";
+$lang["config_enable_right_bar_tooltip"] = "";
 $lang["config_enforce_privacy"] = "";
 $lang["config_enforce_privacy_tooltip"] = "";
 $lang["config_fax"] = "Fax";
+$lang["config_file_perm"] = "There are problems with file permissions please fix and reload this page.";
 $lang["config_financial_year"] = "Fiscal Year Start";
 $lang["config_financial_year_apr"] = "1st of April";
 $lang["config_financial_year_aug"] = "1st of August";
@@ -124,6 +144,7 @@ $lang["config_financial_year_may"] = "1st of May";
 $lang["config_financial_year_nov"] = "1st of November";
 $lang["config_financial_year_oct"] = "1st of October";
 $lang["config_financial_year_sep"] = "1st of September";
+$lang["config_floating_labels"] = "";
 $lang["config_gcaptcha_enable"] = "Login Page reCAPTCHA";
 $lang["config_gcaptcha_secret_key"] = "reCAPTCHA Secret Key";
 $lang["config_gcaptcha_secret_key_required"] = "reCAPTCHA Secret Key is a required field";
@@ -135,9 +156,15 @@ $lang["config_general_configuration"] = "General Configuration";
 $lang["config_giftcard_number"] = "Gift Card Number";
 $lang["config_giftcard_random"] = "Generate Random";
 $lang["config_giftcard_series"] = "Generate in Series";
+$lang["config_image_allowed_file_types"] = "";
+$lang["config_image_max_height_tooltip"] = "";
+$lang["config_image_max_size_tooltip"] = "";
+$lang["config_image_max_width_tooltip"] = "";
+$lang["config_image_restrictions"] = "";
 $lang["config_include_hsn"] = "";
 $lang["config_info"] = "Information";
 $lang["config_info_configuration"] = "Store Information";
+$lang["config_input_groups"] = "";
 $lang["config_integrations"] = "";
 $lang["config_integrations_configuration"] = "";
 $lang["config_invoice"] = "Invoice";
@@ -147,6 +174,9 @@ $lang["config_invoice_email_message"] = "Invoice Email Template";
 $lang["config_invoice_enable"] = "Enable Invoicing";
 $lang["config_invoice_printer"] = "Invoice Printer";
 $lang["config_invoice_type"] = "";
+$lang["config_is_readable"] = "";
+$lang["config_is_writable"] = "is writable, but the permissions are higher than 750.";
+$lang["config_item_markup"] = "";
 $lang["config_jsprintsetup_required"] = "Warning: This functionality will only work if you have the FireFox jsPrintSetup addon installed. Save anyway?";
 $lang["config_language"] = "Language";
 $lang["config_last_used_invoice_number"] = "Last used Invoice Number";
@@ -165,6 +195,7 @@ $lang["config_locale_info"] = "Localization Configuration Information";
 $lang["config_location"] = "Stock";
 $lang["config_location_configuration"] = "Stock Locations";
 $lang["config_location_info"] = "Location Configuration Information";
+$lang["config_login_form"] = "";
 $lang["config_logout"] = "Do you want to make a backup before logging out? Click [OK] to backup or [Cancel] to logout.";
 $lang["config_mailchimp"] = "Mailchimp";
 $lang["config_mailchimp_api_key"] = "Mailchimp API Key";
@@ -184,6 +215,7 @@ $lang["config_msg_src_required"] = "SMS-API Sender ID is a required field";
 $lang["config_msg_uid"] = "SMS-API Username";
 $lang["config_msg_uid_required"] = "SMS-API Username is a required field";
 $lang["config_multi_pack_enabled"] = "";
+$lang["config_no_risk"] = "No security/vulnerability risks.";
 $lang["config_none"] = "none";
 $lang["config_notify_alignment"] = "Notification Popup Position";
 $lang["config_number_format"] = "Number Format";
@@ -191,8 +223,10 @@ $lang["config_number_locale"] = "Localization";
 $lang["config_number_locale_invalid"] = "The entered locale is invalid. Check the link in the tooltip to find a valid locale.";
 $lang["config_number_locale_required"] = "Number Locale is a required field.";
 $lang["config_number_locale_tooltip"] = "Find a suitable locale through this link.";
+$lang["config_os_timezone"] = "";
 $lang["config_ospos_info"] = "";
 $lang["config_payment_options_order"] = "Payment Options Order";
+$lang["config_perm_risk"] = "Permissions higher than 750 leaves this software at risk.";
 $lang["config_phone"] = "Company Phone";
 $lang["config_phone_required"] = "Company Phone is a required field.";
 $lang["config_print_bottom_margin"] = "Margin Bottom";
@@ -218,8 +252,10 @@ $lang["config_print_top_margin"] = "Margin Top";
 $lang["config_print_top_margin_number"] = "Margin Top must be a number.";
 $lang["config_print_top_margin_required"] = "Margin Top is a required field.";
 $lang["config_quantity_decimals"] = "Quantity Decimals";
+$lang["config_quick_cash_enable"] = "";
 $lang["config_quote_default_comments"] = "";
 $lang["config_receipt"] = "Receipt";
+$lang["config_receipt_category"] = "";
 $lang["config_receipt_configuration"] = "Receipt Print Settings";
 $lang["config_receipt_default"] = "Default";
 $lang["config_receipt_font_size"] = "Font Size";
@@ -231,12 +267,14 @@ $lang["config_receipt_short"] = "Short";
 $lang["config_receipt_show_company_name"] = "Show Company Name";
 $lang["config_receipt_show_description"] = "Show Description";
 $lang["config_receipt_show_serialnumber"] = "Show Serial Number";
+$lang["config_receipt_show_tax_ind"] = "";
 $lang["config_receipt_show_taxes"] = "Show Taxes";
 $lang["config_receipt_show_total_discount"] = "Show Total Discount";
 $lang["config_receipt_template"] = "Receipt Template";
 $lang["config_receiving_calculate_average_price"] = "Calc avg. Price (Receiving)";
 $lang["config_recv_invoice_format"] = "Receivings Invoice Format";
 $lang["config_register_mode_default"] = "Default Register Mode";
+$lang["config_report_an_issue"] = "";
 $lang["config_return_policy_required"] = "Return policy is a required field.";
 $lang["config_reward"] = "Reward";
 $lang["config_reward_configuration"] = "Reward Configuration";
@@ -245,7 +283,10 @@ $lang["config_sales_invoice_format"] = "Sales Invoice Format";
 $lang["config_sales_quote_format"] = "Sales Quote Format";
 $lang["config_saved_successfully"] = "Configuration save successful.";
 $lang["config_saved_unsuccessfully"] = "Configuration save failed.";
+$lang["config_security_issue"] = "Security Vulnerability Warning";
 $lang["config_server_notice"] = "Please use the below info for issue reporting.";
+$lang["config_service_charge"] = "";
+$lang["config_show_due_enable"] = "";
 $lang["config_show_office_group"] = "Show office icon";
 $lang["config_statistics"] = "Send Statistics";
 $lang["config_statistics_tooltip"] = "Send statistics for development and feature improvement purposes.";
@@ -253,10 +294,13 @@ $lang["config_stock_location"] = "Stock location";
 $lang["config_stock_location_duplicate"] = "Stock Location must be unique.";
 $lang["config_stock_location_invalid_chars"] = "Stock Location can not contain '_'.";
 $lang["config_stock_location_required"] = "Stock location is a required field.";
+$lang["config_suggestions_fifth_column"] = "";
 $lang["config_suggestions_first_column"] = "Column 1";
+$lang["config_suggestions_fourth_column"] = "";
 $lang["config_suggestions_layout"] = "Search Suggestions Layout";
 $lang["config_suggestions_second_column"] = "Column 2";
 $lang["config_suggestions_third_column"] = "Column 3";
+$lang["config_system_conf"] = "Setup & Conf";
 $lang["config_system_info"] = "System Info";
 $lang["config_table"] = "Table";
 $lang["config_table_configuration"] = "Table Configuration";
@@ -272,10 +316,14 @@ $lang["config_tax_decimals"] = "Tax Decimals";
 $lang["config_tax_id"] = "";
 $lang["config_tax_included"] = "Tax Included";
 $lang["config_theme"] = "Theme";
+$lang["config_theme_preview"] = "";
 $lang["config_thousands_separator"] = "Thousands Separator";
 $lang["config_timezone"] = "Timezone";
+$lang["config_timezone_error"] = "";
 $lang["config_top"] = "Top";
 $lang["config_use_destination_based_tax"] = "";
+$lang["config_user_timezone"] = "";
 $lang["config_website"] = "Website";
+$lang["config_wholesale_markup"] = "";
 $lang["config_work_order_enable"] = "Work Order Support";
 $lang["config_work_order_format"] = "Work Order Format";

application/language/bg/customers_lang.php

@@ -3,6 +3,7 @@
 $lang["customers_account_number"] = "Сметка #";
 $lang["customers_account_number_duplicate"] = "Номерът на сметката вече е в базата данни.";
 $lang["customers_available_points"] = "Налични точки";
+$lang["customers_available_points_value"] = "";
 $lang["customers_average"] = "Средно изразходвани";
 $lang["customers_avg_discount"] = "Средна отстъпка";
 $lang["customers_basic_information"] = "Информация";
@@ -12,20 +13,20 @@ $lang["customers_confirm_delete"] = "Наистина ли искате да и
 $lang["customers_confirm_restore"] = "Наистина ли искате да възстановите избраните клиенти?";
 $lang["customers_consent"] = "Съгласие за регистрация";
 $lang["customers_consent_required"] = "Регистрационното съгласие е задължително поле.";
+$lang["customers_csv_import_failed"] = "Вносът от CSV не бе успешен";
+$lang["customers_csv_import_nodata_wrongformat"] = "Каченият файл няма данни или е неправилно форматиран.";
+$lang["customers_csv_import_partially_failed"] = "Вносът на клиента е успешен с няколко грешки:";
+$lang["customers_csv_import_success"] = "Вносът на клиенти е успешен.";
 $lang["customers_customer"] = "Клиент";
 $lang["customers_date"] = "Дата";
 $lang["customers_discount"] = "Отстъпка";
-$lang["customers_discount_fixed"] = "";
-$lang["customers_discount_percent"] = "";
-$lang["customers_discount_type"] = "";
+$lang["customers_discount_fixed"] = "Фиксирана отстъпка";
+$lang["customers_discount_percent"] = "Процент отстъпка";
+$lang["customers_discount_type"] = "Вид отстъпка";
 $lang["customers_email_duplicate"] = "Имейл адресът вече е в базата данни.";
 $lang["customers_employee"] = "Служител";
 $lang["customers_error_adding_updating"] = "Добавянето или актуализирането на клиента е неуспешно.";
-$lang["customers_excel_import_failed"] = "Вносът от Excel не бе успешен";
-$lang["customers_excel_import_nodata_wrongformat"] = "Каченият файл няма данни или е неправилно форматиран.";
-$lang["customers_excel_import_partially_failed"] = "Вносът на клиента е успешен с няколко грешки:";
-$lang["customers_excel_import_success"] = "Вносът на клиенти е успешен.";
-$lang["customers_import_items_excel"] = "Импортиране на клиент от Excel";
+$lang["customers_import_items_csv"] = "Импортиране на клиент от CSV";
 $lang["customers_mailchimp_activity_click"] = "Email click";
 $lang["customers_mailchimp_activity_lastopen"] = "Последно отворен Имейл";
 $lang["customers_mailchimp_activity_open"] = "Имейлът е отворен";
@@ -47,7 +48,7 @@ $lang["customers_successful_adding"] = "Успешно добавихте кли
 $lang["customers_successful_deleted"] = "Вие успешно сте изтрили";
 $lang["customers_successful_updating"] = "Актуализирахте успешно клиента си";
 $lang["customers_tax_code"] = "Данъчен код";
-$lang["customers_tax_id"] = "";
+$lang["customers_tax_id"] = "Данъчен номер";
 $lang["customers_taxable"] = "Облагаем";
 $lang["customers_total"] = "Общо изразходвани средства";
 $lang["customers_update"] = "Актуализиране на клиента";

application/language/bg/employees_lang.php

@@ -1,8 +1,12 @@
 <?php 
 
+$lang["employees_administrator"] = "";
 $lang["employees_basic_information"] = "Информация";
 $lang["employees_cannot_be_deleted"] = "Невъзможно е да изтриете избрани служители, един или повече от тях са обработили продажби или се опитвате да изтриете профила си.";
+$lang["employees_change_employee"] = "";
 $lang["employees_change_password"] = "Промяна на паролата";
+$lang["employees_clerk"] = "";
+$lang["employees_commission"] = "";
 $lang["employees_confirm_delete"] = "Наистина ли искате да изтриете избрания служител (и)?";
 $lang["employees_confirm_restore"] = "Наистина ли искате да възстановите избраните служители?";
 $lang["employees_current_password"] = "Настояща парола";
@@ -13,6 +17,7 @@ $lang["employees_error_deleting_demo_admin"] = "Не може да изтрие
 $lang["employees_error_updating_demo_admin"] = "Не може да промените Пробният Администратор.";
 $lang["employees_language"] = "Език";
 $lang["employees_login_info"] = "Login";
+$lang["employees_manager"] = "";
 $lang["employees_new"] = "Нов служител";
 $lang["employees_none_selected"] = "Не сте избрали служител (и), който да изтриете.";
 $lang["employees_one_or_multiple"] = "служител (и)";
@@ -33,5 +38,6 @@ $lang["employees_system_language"] = "Системен език";
 $lang["employees_unsuccessful_change_password"] = "Промяната на паролата се провали.";
 $lang["employees_update"] = "Актуализиране на служителя";
 $lang["employees_username"] = "Потребител";
+$lang["employees_username_duplicate"] = "";
 $lang["employees_username_minlength"] = "Потребителското име трябва да е с дължина най-малко 5 знака.";
 $lang["employees_username_required"] = "Потребителското име е задължително поле.";