Add item_pic to escape ignore list (#3379)

Bumps [simple-get](https://github.com/feross/simple-get) from 3.1.0 to 3.1.1.
- [Release notes](https://github.com/feross/simple-get/releases)
- [Commits](https://github.com/feross/simple-get/compare/v3.1.0...v3.1.1)

---
updated-dependencies:
- dependency-name: simple-get
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>

.github/ISSUE_TEMPLATE.md

@@ -10,7 +10,7 @@ Please make sure you tick (add an x between the square brackets with no spaces)
 - [] Read the [FAQ](https://github.com/opensourcepos/opensourcepos#faq) for any known install and/or upgrade gotchas (in specific PHP extensions installed)
 - [] Read the [wiki](https://github.com/opensourcepos/opensourcepos/wiki)
 - [] Executed any database upgrade scripts if an upgrade pre 3.0.0 (e.g. database/2.4_to_3.0.sql)
-- [] Aware the installation code is in [bintray](https://bintray.com/jekkos/opensourcepos/opensourcepos/view/files?sort=updated&order=asc#files) (see README), and [GitHub master](https://github.com/opensourcepos/opensourcepos/tree/master) is for [developers only](https://github.com/opensourcepos/opensourcepos/wiki/Development-setup) and therefore not complete nor stable
+- [] Aware the installation code that [GitHub master](https://github.com/opensourcepos/opensourcepos/tree/master) is for [developers only](https://github.com/opensourcepos/opensourcepos/wiki/Development-setup) and therefore not complete nor stable.
 
 ### Installation information
 

.gitignore

@@ -1,40 +1,90 @@
-node_modules
-tmp
-database/database.sql
-database/migrate_phppos_dist.sql
-application/config/email.php
-application/sessions/*
-application/logs/*
-application/uploads/*
-public/license/.licenses
-public/license/bower.LICENSES
-public/dist
-generate_langauges.php
-dist/
-docs/
-public/bower_components
-npm_modules
+# Dependency directories
+/node_modules
+/vendor
+/public/bower_components
+
+# Logs
+/application/logs/*
+*.log
+npm-debug.log*
+
+# Build generated
+/tmp
+/public/license/.licenses
+/public/license/bower.LICENSES
+/public/dist
+
+# Docker
+!/docker/.env
+/docker/data/database/db/*
+/docker/data/certbot/conf/*
+/docker/data/ospos/app/*
+
+# Database
+/database/database.sql
+/database/migrate_phppos_dist.sql
+
+# Use files
+/application/config/email.php
+/application/sessions/*
+/application/uploads/*
+
+# Editors
+## SublimeText
+*.tmlanguage.cache
+*.tmPreferences.cache
+*.stTheme.cache
+*.sublime-workspace
+
+## VisualStudioCode
+.vscode/*
+!.vscode/settings.json
+!.vscode/tasks.json
+!.vscode/launch.json
+!.vscode/extensions.json
+
+## Vim
+*.sw[a-p]
+
+## WebStorm/IntelliJ
+/.idea
+modules.xml
+*.ipr
+*.iml
+
+# System files
+*.DS_Store
+Thumbs.db
+ehthumbs.db
+ehthumbs_vista.db
+Desktop.ini
+$RECYCLE.BIN/
+._*
+.DocumentRevisions-V100
+.fseventsd
+.Spotlight-V100
+.TemporaryItems
+.Trashes
+.VolumeIcon.icns
+.com.apple.timemachine.donotpresent
+
+# Other
+/generate_langauges.php
+/dist
+/docs
+/patches
+/translations
+/.buildpath
+/.project
+/.settings/*
 *.patch
-patches/
-translations/
-.idea/
 git-svn-diff.py
 *.bash
 .swp
-.buildpath
-.project
-.settings/*
-vendor/
 *.swp
 *.rej
 *.orig
 *~
 *.~
-*.log
 .env
-package-lock.json
 auth.json
-!/docker/.env
-/docker/data/database/db/*
-/docker/data/certbot/conf/*
-/docker/data/ospos/app/*

.travis.yml

@@ -1,5 +1,4 @@
 sudo: required
-if: tag IS blank
 
 branches:
   except:
@@ -21,35 +20,48 @@ script:
   - 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
+  - version=$(grep application_version application/config/config.php | sed "s/.*=\s'\(.*\)';/\1/g")
+  - echo "$version-$branch-$rev" 
+  - npm version "$version-$branch-$rev" --force || true
   - docker run --rm -it -v $(pwd):/app -w /app opensourcepos/node-grunt-bower
     sh -c "npm install && bower install && grunt package"
   - docker build . --target ospos -t ospos
   - docker-compose -f docker-compose.test.yml up --abort-on-container-exit
+  - docker build database/ -t jekkos/opensourcepos:sqlscript
 env:
   global:
   - DOCKER_COMPOSE_VERSION=1.29.1
-  - TAG=$(echo ${TRAVIS_BRANCH} | sed s/feature\\///)
+  - BRANCH=$(echo ${TRAVIS_BRANCH} | sed s/feature\\///)
   - date=`date +%Y%m%d%H%M%S` && branch=${TRAVIS_BRANCH} && rev=`git rev-parse --short=6 HEAD` 
 after_success:
+  - TAG=${TRAVIS_TAG:-$BRANCH}
   - docker login -u="$DOCKER_USERNAME" -p="$DOCKER_PASSWORD" && docker tag "ospos:latest"
-    "jekkos/opensourcepos:$TAG" && docker push "jekkos/opensourcepos:$TAG"
+    "jekkos/opensourcepos:$TAG" && docker push "jekkos/opensourcepos:$TAG" && docker push "jekkos/opensourcepos:sqlscript"
+  - sudo mv dist/opensourcepos.tgz "dist/opensourcepos.$version.$rev.tgz"
 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"
+  - npm set //npm.pkg.github.com/:_authToken "$NPM_TOKEN"
 deploy:
-  provider: releases
-  file: "dist/opensourcepos.$branch.$version.zip"
-  name: "OpensourcePos Unstable"
-  release_notes_file: WHATS_NEW.txt
-  prerelease: true
-  skip_cleanup: true
+  - provider: npm
+    file: dist/opensourcepos.$version.$rev.tgz
+    registry: npm.pkg.github.com
+    email: jeroen@steganos.dev
+    skip_cleanup: true
+    api_key:
+      secure: "bmOfMoGBi+wTEdTbIB7wPenNTCZrmHAa05xZnMxZSOjxplZpnZSO4Tvnnkihz9LpbF3xT1hm76AJJuZonu2HKtUez+6L4Fg+i/jS8Ij/BZlbvKBVTeB+2yN09ncXNmObnl1bShtm90d2WYQJKk3NJGuEboFQNxwJLYJXg33iMhc="
 
-  user: jekkos
-  overwrite: true
-  api_key:
-    secure: Ax25mMRDfHVf/HjRwqxYJe2oMnWC4sc2aKIiUxAOviVJJSCl4GMWhcFlUNnFsDcKIg2ofEGMVD6b9cTBuOwPDvymUDFnLNCCgDWve+vRDdWaTkTipn77Qk4c9UO9VvuzlPSKopChefPHlQ0n1rEmAMiKIXuqjUlNGqybW4FLP4E=
-  on:
-    all_branches: true
+    on:
+      all_branches: true
+  - provider: releases
+    file: dist/opensourcepos.$version.$rev.tgz
+    name: "OpensourcePos $version"
+    release_notes_file: WHATS_NEW.txt
+    prerelease: true
+    skip_cleanup: true
 
+    user: jekkos
+    overwrite: true
+    api_key:
+      secure: Ax25mMRDfHVf/HjRwqxYJe2oMnWC4sc2aKIiUxAOviVJJSCl4GMWhcFlUNnFsDcKIg2ofEGMVD6b9cTBuOwPDvymUDFnLNCCgDWve+vRDdWaTkTipn77Qk4c9UO9VvuzlPSKopChefPHlQ0n1rEmAMiKIXuqjUlNGqybW4FLP4E=
+    on:
+      tags: true
+      branch: master

CHANGELOG.md

@@ -0,0 +1,373 @@
+[unreleased]: https://github.com/opensourcepos/opensourcepos/compare/3.3.7...HEAD
+[3.3.6]: https://github.com/opensourcepos/opensourcepos/compare/3.3.6...3.3.7
+[3.3.5]: https://github.com/opensourcepos/opensourcepos/compare/3.3.4...3.3.5
+[3.3.4]: https://github.com/opensourcepos/opensourcepos/compare/3.3.3...3.3.4
+[3.3.3]: https://github.com/opensourcepos/opensourcepos/compare/3.3.2...3.3.3
+[3.3.2]: https://github.com/opensourcepos/opensourcepos/compare/3.3.1...3.3.2
+[3.3.1]: https://github.com/opensourcepos/opensourcepos/compare/3.3.0...3.3.1
+[3.3.0]: https://github.com/opensourcepos/opensourcepos/compare/3.2.3...3.3.0
+[3.2.3]: https://github.com/opensourcepos/opensourcepos/compare/3.2.2...3.2.3
+[3.2.2]: https://github.com/opensourcepos/opensourcepos/compare/3.2.1...3.2.2
+[3.2.1]: https://github.com/opensourcepos/opensourcepos/compare/3.2.0...3.2.1
+[3.2.0]: https://github.com/opensourcepos/opensourcepos/compare/3.1.1...3.2.0
+[3.1.1]: https://github.com/opensourcepos/opensourcepos/compare/3.1.0...3.1.1
+[3.1.0]: https://github.com/opensourcepos/opensourcepos/compare/3.0.2...3.1.0
+[3.0.2]: https://github.com/opensourcepos/opensourcepos/compare/3.0.1...3.0.2
+[3.0.1]: https://github.com/opensourcepos/opensourcepos/compare/3.0.0...3.0.1
+[3.0.0]: https://github.com/opensourcepos/opensourcepos/compare/2.4.0...3.0.0
+[2.4.0]: https://github.com/opensourcepos/opensourcepos/compare/2.3.4...2.4.0
+[2.3.4]: https://github.com/opensourcepos/opensourcepos/compare/2.3.3...2.3.4
+[2.3.3]: https://github.com/opensourcepos/opensourcepos/compare/2.3.2...2.3.3
+[2.3.2]: https://github.com/opensourcepos/opensourcepos/compare/2.3.1...2.3.2
+[2.3.1]: https://github.com/opensourcepos/opensourcepos/compare/2.3.0...2.3.1
+[2.3.0]: https://github.com/opensourcepos/opensourcepos/compare/2.2.2...2.3.0
+
+# Changelog
+
+All notable changes to this project will be documented here.
+
+## [Unreleased]
+
+List of changes in the `master` branch.
+
+- N/A
+
+## [3.3.7] - 2022-04-26
+
+- Translation updates (Thai, Indonesian, Swedish, Italian)
+- XSS fixes in bootstrap datatables
+- Invoice numbering fixes
+- Docker compose database scripts are now mounted from a container volume
+
+## [3.3.6] - 2022-01-08
+
+- Translation updates (Hungarian, Indonesian, Bosnian, Ukranian, Vietnamese, Spanish)
+- Make footer revision clickable (ref to github)
+- Minor reporting adjustments
+- Introduced new global keyboard shortcuts (see overview below)
+
+### Fixes
+
+- reCaptcha issue fix
+- Username verification bugfix
+- Clickjacking security mitigations
+- Fixes for the payment summary after refresh
+- Hardening against XSS by introducing a CSP header in the HTTP headers
+- Several CSRF and XSS fixes
+- Type juggling password fix for old logins
+
+
+## [3.3.5] - 2021-08-26
+
+- Translation updates (Romanian, Ukrainian, Vietnamese, Thai, Polish, Swedish, Portuguese, Arabic, French, Chinese, Dutch, Tamil, Turkish, Spanish)
+- New responsive login page based on Bootstrap `5`
+- Translation fallback to English when a string is untranslated for the selected language
+- Database and performance optimizations
+- Grunt/CI updates
+- CSV item import improvements
+
+### Fixes
+
+- Username verification fix on employee insert/update
+- Minor report fixes
+- Attribute encoding fix
+- Decimal render fix
+- Fixes for Docker to make it run on Windows
+- Blind SQL injection fix
+
+## [3.3.4] - 2021-04-18
+
+- Translation updates (Hungarian, Indonesian, Bosnian, Ukrainian, Vietnamese, Spanish)
+- Prevent data wipeout when calling GET directly on the 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
+- Cash rounding bugfixes
+- Fix daily overview cash sale totals
+- Show sale count in the transaction report
+- Button disable to prevent double submission
+- Add barcode field to item kits
+- Fix discount register parsing in some specific locales
+
+## [3.3.3] - 2020-12-31
+
+- 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
+
+## [3.3.2] - 2020-09-02
+
+- Fixed `only_full_group_by` issue with MySQL/MariaDB
+- Fixed POS transaction return failure if items were deleted
+- Various bug fixes
+
+## [3.3.1] - 2019-12-04
+
+- Various bug fixes (please disable `only_full_group_by` option from MySQL/MariaDB to avoid issues)
+
+## [3.3.0] - 2019-09-29
+
+- New logo
+- Upgrade CodeIgniter to version `3.1.11`
+- PHP `7.3` support
+- Attributes feature (allows extensibility of items replacing old custom fields)
+- India GST tax support + various tax support improvements
+- Cash up feature
+- Temporary items feature
+- Fixed sales discount
+- Supplier category feature
+- Improved items import and CSV file generation (to contain additional attributes)
+- Improved Docker installation with NGINX reverse proxy using Let's Encrypt TLS certificate
+- Database performance improvements
+- Added and udated translations
+- Fixed various reports issues
+- Fixed rounding issues
+- Fixed CSRF issues
+- Fixed database upgrade script issues
+- Various bug fixes
+
+## [3.2.3] - 2018-06-13
+
+- Upgrade CodeIgniter to version `3.1.9`
+- Further revert of CSRF change causing regression
+
+## [3.2.2] - 2018-06-06
+
+- Revert CSRF change causing regression
+
+## [3.2.1] - 2018-06-04
+
+- Support for GDPR
+- CSRF simplifications
+- Translation upgrades
+- Various bug fixes
+
+## [3.2.0] - 2018-04-14
+
+- Upgrade CodeIgniter to version `3.1.8`
+- PHP `7.2` support (use OpenSSL and not MCrypt)
+- Automatic database upgrades from `3.0.0` at first login (no more SQL scripts)
+- Home and (back)office menu switch (top menu can be organized in two views)
+- Expenses feature
+- Quote and work order features
+- Improved invoice support
+- Sale suspend, soft delete, complete as the state not as different tables or hard delete
+- Restore deleted sales
+- Improved item kits
+- Export tables all records and export to PDF
+- Table sticky header (headers visible during scrolling)
+- Allow duplicate barcodes (config option)
+- Search suggestion formatting (config option)
+- Define print and email checkboxes behavior (config option)
+- Edit customer from sales register
+- Added and updated translations
+- Various jQuery plugins upgrade
+- Fixed permission issues (e.g. password change)
+- Fixed various reports issues and renamed Sales to Transactions
+- Various bug fixes (e.g. tax, rounding, library circular dependency)
+
+## [3.1.1] - 2017-09-09
+
+- Updated en-US and en-GB translations, better grammar, and consistency
+- Fixed database migration issue with VAT tax included
+- Fixed database backup bug
+- Fixed gift card error
+- Fixed database `upgrade to 3.1.x` script (now it's to `3.1.1` and there is no `3.1.0` anymore)
+- Fixed old database upgrade scripts for people upgrading from `2.x` versions
+- Fixed `.htaccess` file in OSPOS root dir (it was not forwarding to `public` subdir)
+- Fixed few jQuery `2.0` upgrade issues
+
+## [3.1.0] - 2017-09-02
+
+- MySQL `5.7` and PHP `7.x` support
+- Advanced tax support with customer tax categories and more
+- Better horeca use case support with dinner table sale tagging
+- Customer rewards support
+- Added quote support and better invoice support
+- Added integration with Mailchimp to connect customer list with Mailchimp list
+- Prevent inserting two customers with the same email address
+- Customer total spending and stats
+- Added Google reCAPTCHA option for the login page to increase protection from brute force attacks
+- Added due payment for credit sale support
+- Gift card numbering with two options: series and random
+- Extended item kits functionality
+- Employees are allowed to change their own password by clicking their name in the top bar
+- Cash rounding support, extended decimals
+- Reworked item pictures, file names, and storing
+- Financial year start date and selection from date range pickers
+- Date time range filters can be date and time or date only
+- Added two new Bootswatch themes
+- Receipts font size support
+- Fix automatically people's name first capital letter, emails in lower case only
+- Fixes to Receiving
+- Various amendments to database script updates from older versions
+- Added dotenv support
+- Updates to language translations (split English to American English and British English)
+- Various Dockers support improvements
+- Minor bugfixes
+
+## [3.0.2] - 2016-12-31
+
+- Fixed error when performing scans multiple times in a row
+- Fixed summary reports
+- Protect employee privacy by printing just the first letter of the family name
+- Updates to language translations
+- Various Dockers support improvements
+- Minor bugfixes
+
+## [3.0.1] - 2016-11-27
+
+- Upgrade CodeIgniter to version `3.1.2`
+- Substantial database performance improvements
+- Improved security: email and SMS passwords encryption, removed `phpinfo.php`
+- Set code to be production and not development in `index.php`
+- Reports improvements, fixed table sorting, tax calculation and made profit to be net profit
+- Better Apache `2.4` support in `.htaccess`
+- Updates to language translations
+- Fixed excel template download links
+- Fixed employee name in sale receipt and invoice reprinting
+- Fixed `2.3.2_to_2.3.3.sql` database upgrade script mistake
+- Fixed `phppos to ospos` database migration script
+- Minor bug fixes and some general code clean up
+
+## [3.0.0] 2016-10-21
+
+- Upgrade CodeIgniter to version `3.1.0`
+- Major UI overhaul based on Bootstrap `3.0` and Bootswatch Themes
+- New tabular views with advanced filtering using Bootstrap Tables
+- New graphical reports with no more Adobe Flash dependency
+- Redesign of all modal dialogs
+- Updated Sales register with simplified payment flow
+- Improved security: MySQL injection, XSS, CSFR, BCrypt password encryption, safer project layout
+- Support for text messaging (interfacing to specific support required)
+- Email configuration
+- Improved Localisation support
+- Improved Store Config page
+- Docker container ready for cloud installation
+- Composer PHP support
+- More languages and integration with Weblate for continuous translation
+- About 280 closed issues under `3.0.0` release label, too many to produce a meaningful list
+- Various code cleanup, refactoring, optimization and etc.
+
+## [2.4.0] - 2016-04-02
+
+- Upgrade CodeIgniter to version `3.0.5`
+- Fix for spurious logouts
+- Apache `.htaccess` `mod_expiry` caching and security optimizations
+- Bulk item edit fixes (category, tax, and supplier fields)
+- Remove f-key shortcuts used for module navigation
+- Allow using custom invoice numbers when suspending a sale
+- PHP `7` fixes
+- Specific warnings to distinguish between reorder level and out of stock situation in sales
+- Fix malware detection issues due to usage of `base64` encoding for storing session variables
+- Improve language generation scripts (use PHP builtin functionality)
+- Add extra buttons for navigation and printing to receipt and invoice
+- Improve print layout for invoices
+- Make layout consistent for items between receipt and invoice templates
+- Minor bugfixes
+
+## [2.3.4] - 2016-02-08
+
+- Migration script fixes
+- Improved continuous integration setup
+- More integration tests
+- Virtualized container setup (`docker install`)
+- Live clock functionality and favicon
+- Improved PHP `7` compatibility
+- Added de_CH (German) as language
+- Minor code cleanup
+- Removal of annoying backup prompt on logout
+
+## [2.3.3] - 2016-01-05
+
+- Item kit fixes (search, list, ...)
+- Add date picker widgets in sale/receiving edit forms
+- Add date filter in items module
+- Add barcode generation logic for EAN8, EAN13
+- Add barcode validation and fallback logic for EAN8, EAN13
+- New config option to generate barcodes if `item_number` is empty
+- Add cost and count to inventory reports
+- Gift card fixes
+- Refactor sales overview (added date filtering + search options)
+- Better locale config support
+- Improve PHP compatibility
+- Fix invoice numbering bug on suspending a sale
+- Add configurable locale-dependent date format
+- Add grunt-cache-breaker plugin
+- Suspend button appears before adding a payment
+- Searching of deleted items, filtering part is removed
+- Remove infamous `0` after leaving sale or receiving comments empty
+- Add SQL script to clean zeroes in sales/receivings comments
+- Numerous other bug fixes
+
+## [2.3.2] - 2015-07-15
+
+- Nominatim (OpenStreetMap) customer address autocompletion
+- Sale invoice templating
+- Configurable barcode generation for items
+- Stock location filtering in detailed sales and receivings reports
+- Gift cards fixes
+- Proper pagination support for most modules
+- Language updates
+- Fix for decimal tax rates
+- Add gender and company name attributes to customer
+- Stock location config screen refactor
+- Basic Travis CI and PhantomJS setup
+- Database backup on admin logout
+- Modifiable item thumbnails
+- Email invoice PDF generation using DomPDF
+- Modifiable company logo
+- jQuery upgrade (`1.2` -> `1.8.3`)
+- JavaScript minification (using Grunt)
+- Numerous bugfixes
+
+## [2.3.1] - 2015-02-11
+
+- Extra report permissions (this includes a refactoring of the database model - new grants table)
+- Tax inclusive/exclusive pricing
+- Receivings amount multiplication (can be configured in items section)
+- Customizable sale and receiving numbering
+- Gift card improvements
+- Fix item import through CSV
+- Bug fixes for reports
+
+## [2.3.0] - 2014-08-19
+
+- Support for multiple stock locations
+
+## 2.2.2 - 2014-08-19
+
+- French language added
+- Thai language added
+- Upgrade CodeIgniter to version `2.2.0`
+- Database types for amounts all changed to decimal types (this will fix rounding errors in the sales and receivings reports)
+- Fix duplicated session cookies in HTTP headers (this broke the application when running on Nginx)
+
+## 2.1.1
+
+- Barcodes on the order receipt were not generated correctly
+- Sales edit screen for detailed sales reports is now available with ThickBox as in the rest of the application
+- Indonesian language files updated (Oktafianus)
+- Default language set to `en` in `config.php`
+- Fixed some CSS bugs in the suspended sales section
+- Default cookie `sess_time_expire` set to `86400` (24h)
+
+## 2.1.0
+
+- Various upgrades, too numerous to list here
+- Removed dependency on ofc upload library due to vulnerability found
+
+## 2.0.2
+
+- Fixed multiple gift cards issue per Bug #4 reported on Sourceforge where a second gift card added would have its balance set to `0` even if the sale did not require the total of the second gift card to pay the remaining amount due
+- Small code cleanup
+
+## 2.1.0
+
+- Upgrade CodeIgniter to version `2.1.0`
+- Various small improvements

DEVELOPMENT.md

@@ -0,0 +1,53 @@
+# package.json
+
+## scripts
+
+`npm run scriptname`
+
+- `clean` - wipe the dependencies downloaded by Composer, Bower, and npm
+```
+grunt clean:composer & grunt clean:bower & grunt clean:npm
+```
+- `install` - automatically runs the Composer and Bower install commands after installing the npm dependencies
+```
+composer install & bower install
+```
+- `update` - updates Composer and the dependencies downloaded by Composer and npm
+```
+npm update & composer self-update & composer update
+```
+
+## devDependencies
+
+- `grunt` - used for copying files downloaded by npm
+- `grunt-contrib-clean` - Grunt plugin to clean files before copying
+- `grunt-contrib-copy` - Grunt plugin to copy files downloaded by npm
+- `npm` - downloads project dependencies
+- the others are unlisted for now, because this will probably change pretty significantly in the near future
+
+## dependencies
+
+- `bootstrap` - main CSS framework used
+- `bootswatch` - themes for the UI
+
+## devDependencies (global)
+
+- `bower` - for the time being, Bower is still necessary
+
+
+# composer.json
+
+## require
+
+- `php` - this application runs on PHP
+- `codeigniter/framework` - the CodeIgniter PHP framework this application is build on
+- `dompdf/dompdf` - no description
+- `tamtamchik/namecase` - no description
+- `paragonie/random_compat` - no description
+- `vlucas/phpdotenv` - no description
+
+## require-dev
+
+- `mikey179/vfsstream` - no description
+- `phpunit/phpunit` - no description
+- `kenjis/ci-phpunit-test` - no description

Dockerfile

@@ -1,4 +1,5 @@
 FROM php:7.4-apache AS ospos
+LABEL maintainer="jekkos"
 
 RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y \
     libicu-dev \
@@ -15,9 +16,9 @@ RUN ln -s /app/*[^public] /var/www && rm -rf /var/www/html && ln -nsf /app/publi
 RUN chmod -R 750 /app/public/uploads /app/application/logs && chown -R www-data:www-data /app/public /app/application
 
 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
@@ -26,7 +27,7 @@ RUN php /app/vendor/kenjis/ci-phpunit-test/install.php -a /app/application -p /a
 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

Gruntfile.js

@@ -11,12 +11,12 @@ module.exports = function(grunt) {
 		bower_concat: {
 			all: {
 				mainFiles: {
-					'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", 
+					'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"]
@@ -63,14 +63,14 @@ module.exports = function(grunt) {
 				files: [
 					{
 						expand: true,
-						cwd: 'node_modules/bootstrap-5/dist/css',
+						cwd: 'node_modules/bootstrap/dist/css',
 						src: ['bootstrap.css', 'bootstrap.min.css'],
 						dest: 'public/dist/bootswatch-5/bootstrap/',
 						filter: 'isFile'
 					},
 					{
 						expand: true,
-						cwd: 'node_modules/bootswatch-5/dist',
+						cwd: 'node_modules/bootswatch/dist',
 						src: ['**/bootstrap.css', '**/bootstrap.min.css'],
 						dest: 'public/dist/bootswatch-5/',
 						filter: 'isFile'
@@ -85,7 +85,7 @@ module.exports = function(grunt) {
 					filter: 'isFile',},
 					{
 						expand: true,
-						cwd: 'node_modules/bootstrap-5',
+						cwd: 'node_modules/bootstrap',
 						src: 'LICENSE',
 						dest: 'public/license/',
 						rename: function(dest, src) { return dest + src.replace('LICENSE', 'bootstrap-5.license'); },
@@ -93,7 +93,7 @@ module.exports = function(grunt) {
 					},
 					{
 						expand: true,
-						cwd: 'node_modules/bootswatch-5',
+						cwd: 'node_modules/bootswatch',
 						src: 'LICENSE',
 						dest: 'public/license/',
 						rename: function(dest, src) { return dest + src.replace('LICENSE', 'bootswatch-5.license'); },
@@ -105,7 +105,7 @@ module.exports = function(grunt) {
 		cssmin: {
 			target: {
 				files: {
-					'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/dist/opensourcepos.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']
 				}
 			}
@@ -116,7 +116,7 @@ module.exports = function(grunt) {
 					separator: ';'
 				},
 				files: {
-					'tmp/<%= pkg.name %>.js': ['public/dist/jquery/jquery.js', 'tmp/opensourcepos_bower.js', 'public/js/*.js']
+					'tmp/opensourcepos.js': ['public/dist/jquery/jquery.js', 'tmp/opensourcepos_bower.js', 'public/js/*.js']
 				}
 			},
 			sql: {
@@ -131,11 +131,11 @@ module.exports = function(grunt) {
 		},
 		uglify: {
 			options: {
-				banner: '/*! <%= pkg.name %> <%= grunt.template.today("dd-mm-yyyy") %> */\n'
+				banner: '/*! opensourcepos <%= grunt.template.today("dd-mm-yyyy") %> */\n'
 			},
 			dist: {
 				files: {
-					'public/dist/<%= pkg.name %>.min.js': ['tmp/<%= pkg.name %>.js']
+					'public/dist/opensourcepos.min.js': ['tmp/opensourcepos.js']
 				}
 			}
 		},
@@ -223,7 +223,10 @@ module.exports = function(grunt) {
 			}
 		},
 		clean: {
-			license: ['public/bower_components/**/bower.json']
+			bower: ["public/bower_components"],
+			composer: ["vendor"],
+			license: ['public/bower_components/**/bower.json'],
+			npm: ["node_modules"]
 		},
 		license: {
 			all: {
@@ -258,8 +261,9 @@ module.exports = function(grunt) {
 		compress: {
 			main: {
 				options: {
-					mode: 'zip',
-					archive: 'dist/opensourcepos.zip'
+					mode: 'tar',
+					archive: 'dist/opensourcepos.tgz',
+					level: 2
 				},
 				files: [
 					{

INSTALL.md

@@ -1,81 +1,65 @@
-Server Requirements
--------------------
+## Server Requirements
 
-* 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.
+- 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 the extensions `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 `10.x` is supported and might offer better performance.
+- Apache `2.2` and `2.4` are supported. Nginx should work fine too, 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)>).
+- For Windows based installations please read [the wiki](https://github.com/opensourcepos/opensourcepos/wiki). There are closed issues about this subject, as this topic has been covered a lot.
 
-* MySQL 5.5, 5.6 and 5.7 are supported, also MariaDB replacement 10.x is supported and apparently offering better performance.
+## Local install
 
-* 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).
+First of all, if you're seeing the message `system folder missing` after launching your browser, that most likely means you have cloned the repository and have not built the project.
 
-* 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)).
+1. Download the a [pre-release for a specific branch](https://github.com/opensourcepos/opensourcepos/packages/1047637) or the latest stable [from GitHub here](https://github.com/opensourcepos/opensourcepos/releases). A repository clone will not work unless know how to build the 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 the web-server.
+5. Open `application/config/database.php` and modify credentials to connect to your database if needed.
+6. Open `application/config/config.php` and swap the encryption key with your own.
+7. Go to your install `public` dir via the browser.
+8. Log in using
+   - Username: admin
+   - Password: pointofsale
+9. Enjoy!
+10. Oops, an issue? Please make sure you read the FAQ, wiki page, and you checked open and closed issues on GitHub. PHP `display_errors` is disabled by default. Create an` application/config/.env` file from the `.env.example` to enable it in a development environment.
 
-* 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.
+## Local install using Docker
 
-
-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 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
-5. Modify application/config/database.php and modify credentials if needed to connect to your database
-6. Modify application/config/config.php encryption key with your own
-7. Go to your point of sale install public dir via the browser
-8. LOGIN using
-  * username: admin 
-  * password: pointofsale
-9. Enjoy
-10. Oops an issue? Please make sure you read the FAQ, wiki page and you checked open and closed issue on GitHub. PHP display_errors is disabled by default. Create an application/config/.env file from the .env.example to enable it in a development environment. 
-
-
-Local install using Docker
---------------------------
-
-From now onwards OSPOS can be deployed using Docker on Linux and Mac, locally or on a host (server).
+OSPOS can be deployed using Docker on Linux, Mac, and Windows. Locally or on a host (server).
 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.
+Docker runs natively on Mac and Linux. Windows requires WSL2 to be installed. Please refer to the Docker documentation for instructions on how to set it up on your platform.
 
-***Be aware that this setup is not suited for production usage. Change the default passwords in the compose file before exposing the containers publicly.***
+**Be aware that this setup is not suited for production usage! Change the default passwords in the compose file before exposing the containers publicly.**
 
-Start the containers using following command
+Start the containers using the following command
 
 ```
     docker-compose up
 ```
 
+## Nginx 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 Let's Encrypt TLS certificate termination (aka HTTPS connection).
+Let's Encrypt is a free certificate issuer, requiring a special installation that this Docker installation would take care of for you.
+Any Let's Encrypt TLS certificate renewal will be managed automatically, therefore there is no need to worry about those details.
 
-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).
-Letsencrypt is a free certificate issuer, requiring a special installation that this docker installation would take care for you.
-Any Letsencrypt TLS certificate renewal will be managed automatically for you, therefore there is no need to worry about those details.
+Before starting your installation, you should edit the `docker/.env` file and configure it to contain the correct MySQL/MariaDB and phpMyAdmin passwords (don't use the defaults!).
+You will also need to register to Let's Encrypt. Configure your host domain name and Let's Encrypt email address in the `docker/.env` file.
+The variable `STAGING` needs to be set to `0` when you are confident your configuration is correct so that Let's Encrypt will issue a final proper TLS certificate.
 
-Before starting your installation, you would need to edit docker/.env file and configure it to contain the correct MySQL/MariaDB and phpMyAdmin passwords (don't use the defaults!).
-You will also need to register to Letsencrypt and configure your host domain name, Letsencrypt email address in docker/.env file.
-The variable STAGING needs to be set to 0 when you are confident your configuration is correct so that Letsencrypt will issue a final proper TLS certificate.
-
-Follow local install steps, but instead of 
+Follow local install steps, but instead use
 
 ```
     docker/install-nginx.sh
 ```
 
-Do not use 
+Do **not** use below command on live deployments unless you want to tear everything down. All your disk content will be wiped!
 
 ```
     docker/uninstall.sh
 ```
 
-on live deployments unless you want to tear down everything because all your disk content will be wiped out!
-
-
-Cloud install
--------------
-
-If you choose *DigitalOcean*:
-[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.
+## Cloud install
 
+If you choose DigitalOcean:
+[Through this link](https://m.do.co/c/ac38c262507b), you will get a [**free $100, 60-day credit**](https://m.do.co/c/ac38c262507b). [Check the wiki](https://github.com/opensourcepos/opensourcepos/wiki/Getting-Started-installations) for further instructions on how to install the necessary components.

LICENSE

@@ -1,4 +1,4 @@
-The MIT License (MIT)
+MIT License
 
 Copyright (c) 2013-2021 jekkos
 Copyright (c) 2015-2021 FrancescoUK (aka daN4cat)
@@ -7,6 +7,7 @@ Copyright (c) 2017-2021 objecttothis
 Copyright (c) 2017-2021 odiea
 Copyright (c) 2017-2021 WebShells
 Copyright (c) 2020-2021 Andriux1990
+Copyright (c) 2021 BudsieBuds
 Copyright (c) 2019 Loyd Jayme (aka loydjayme25)
 Copyright (c) 2018 Erasto Marroquin (aka Erastus)
 Copyright (c) 2018 Nathan Sas (aka nathanzky)
@@ -36,34 +37,19 @@ 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.
+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.
 
-Versions ≥ 3.3.2:
+Additionally, you cannot claim copyright or ownership of the Software.
 
-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 footer signatures 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.
+Footer signatures are in the format
+"© 2010 - current year · opensourcepos.org · version - commit"
+or "Open Source Point of Sale".

README.md

@@ -1,165 +1,143 @@
-[![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)
-[![GitHub version](https://badge.fury.io/gh/jekkos%2Fopensourcepos.svg)](https://badge.fury.io/gh/jekkos%2Fopensourcepos)
-[![Translation status](http://translate.opensourcepos.org/widgets/opensourcepos/-/svg-badge.svg)](http://translate.opensourcepos.org/engage/opensourcepos/?utm_source=widget)
+<p align="center"><img src="branding/emblem.svg" alt="Open Source Point of Sale Logo" width="auto" height="200"></p>
+<h3 align="center">Open Source Point of Sale</h3>
 
+<p align="center">
+  <a href="#-introduction">Introduction</a> · <a href="#-live-demo">Demo</a> · <a href="#-installation">Installation</a> · 
+  <a href="#-contributing">Contributing</a> · <a href="#-reporting-bugs">Bugs</a> · <a href="#-faq">FAQ</a> · 
+  <a href="#-keep-the-machine-running">Donate</a> · <a href="#-license">License</a> · <a href="#-credits">Credits</a>
+</p>
 
-Introduction
-------------
+<p align="center">
+<a href="https://travis-ci.org/opensourcepos/opensourcepos" target="_blank"><img src="https://travis-ci.com/opensourcepos/opensourcepos.svg?branch=master" alt="Build Status"></a>
+<a href="https://gitter.im/opensourcepos?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge" target="_blank"><img src="https://badges.gitter.im/jekkos/opensourcepos.svg" alt="Join the chat at https://gitter.im/opensourcepos"></a>
+<a href="https://badge.fury.io/gh/jekkos%2Fopensourcepos" target="_blank"><img src="https://badge.fury.io/gh/jekkos%2Fopensourcepos.svg" alt="Project Version"></a>
+<a href="http://translate.opensourcepos.org/engage/opensourcepos/?utm_source=widget" target="_blank"><img src="http://translate.opensourcepos.org/widgets/opensourcepos/-/svg-badge.svg" alt="Translation Status"></a>
+</p>
 
-Open Source Point of Sale is a web based point of sale system.
-The main features are:
-* Stock management (Items and Kits with extensible list of Attributes)
-* VAT, GST, customer and multi tiers taxation
-* Sale register with transactions logging
-* Quotation and invoicing
-* Expenses logging
-* Cashup
-* Receipt and invoice printing and/or emailing
-* Barcode generation and printing
-* Suppliers and Customers database
-* Multiuser with permission control
-* Reporting on sales, orders, expenses, inventory status
-* Receivings
-* Giftcard
-* Rewards
-* Restaurant tables
-* Messaging (SMS)
-* Multilanguage
-* Selectable Boostrap (Bootswatch) based UI theme
-* Mailchimp integration
-* reCAPTCHA to protect login page from brute force attacks
-* GDPR ready
+## 👋 Introduction
 
-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.
+Open Source Point of Sale is a web-based point of sale system. The application is written in PHP, 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 uses CodeIgniter version 3 as framework.
-It also has improved functionality and security.
+The latest `3.x` version is a complete overhaul of the original software. It uses CodeIgniter 3 as a framework and is based on Bootstrap 3 using Bootswatch themes. Along with improved functionality and security.
 
-DEMO / DEV
-----------
+The features include:
 
-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.
+- Stock management (items and kits with an extensible list of attributes)
+- VAT, GST, customer, and multi tiers taxation
+- Sale register with transactions logging
+- Quotation and invoicing
+- Expenses logging
+- Cash up function
+- Printing and emailing of receipts, invoices and quotations
+- Barcode generation and printing
+- Database of customers and suppliers
+- Multiuser with permission control
+- Reporting on sales, orders, expenses, inventory status and more
+- Receivings
+- Gift cards
+- Rewards
+- Restaurant tables
+- Messaging (SMS)
+- Multilanguage
+- Selectable Bootstrap based UI theme with Bootswatch
+- Mailchimp integration
+- Optional Google reCAPTCHA to protect login page from brute force attacks
+- GDPR ready
 
-LOGIN using
-* username: admin
-* password: pointofsale
+## 🧪 Live Demo
 
-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.
+We've got a live version of our latest master running for you to play around with and test everything out. It's a containerized install that will reinitialize when new functionality is merged into our code repository.
 
-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.
+You can [find the demo here](https://demo.opensourcepos.org/) and log in with these credentials.  
+👤 Username `admin`  
+🔒 Password `pointofsale`
 
-Installation
-------------
+If you bump into an issue, please check [the status page here](https://status.opensourcepos.org/) to confirm if the server is up and running.
 
-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.
+## 🖥️ Development Demo
 
-This application **can be setup in many different ways** and we only **support the ones described in the INSTALL file linked below**.
+Besides the demo of the latest master, we also have a development server that builds when there's a new commit to our repository. It's mainly used for testing out new code before merging it into the master. [It can be found here](https://dev.opensourcepos.org/).
 
-Read the [INSTALL.md](https://github.com/opensourcepos/opensourcepos/blob/master/INSTALL.md) in our repository.
+The log in credentials are the same as the regular live demo.
 
-[Check our wiki](https://github.com/opensourcepos/opensourcepos/wiki/Supported-hardware-datasheet) for info and recommendations on supported receipt printers and barcode scanners.
+## 💾 Installation
 
-License
--------
+Please **refrain from creating issues** about installation problems before having read 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.
+
+This application can be set up in _many_ different ways and we only support the ones described in [the INSTALL.md file](INSTALL.md).
+
+For more information and recommendations on support hardware, like receipt printers and barcode scanners, read [this page](https://github.com/opensourcepos/opensourcepos/wiki/Supported-hardware-datasheet) on our wiki.
+
+## ✨ Contributing
+
+Everyone is more than welcome to help us improve this project. If you think you've got something to help us go forward, feel free to open a [pull request]().
+
+Want to help translate Open Source Point of Sale in your language? You can find [our Weblate here](https://translate.opensourcepos.org), sign up, and start translating. You can subscribe to different languages to receive a notification once a new string is added or needs updating. Have a look at our [guidelines](https://github.com/opensourcepos/opensourcepos/wiki/Adding-translations) below to help you get started.
+
+Only with the help of the community, we can keep language translations up to date. Thanks!
+
+## 🐛 Reporting Bugs
+
+Before creating a new issue, you'll need copy and include the info under the `System Info` tab in the configuration section in most cases. If that information is not provided in full, your issue might be tagged as pending.
+
+If you're reporting a potential security issue, please refer to our security policy found in the [SECURITY.md](SECURITY.md) file.
+
+NOTE: If you're running non-release code, please make sure you always run the latest database upgrade script and you download the latest master code.
+
+## 📖 FAQ
+
+- If you get the message `system folder missing`, then you have cloned the source using git and you need to run a build first. Check [INSTALL.md](INSTALL.md) for instructions or download latest zip file from [GitHub releases](https://github.com/opensourcepos/opensourcepos/releases) 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](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).
+
+- If you installed your OSPOS under a web server subdir, please edit `public/.htaccess` and go to the lines with the comments `if in web root` or `if in subdir`, uncomment one and replace `<OSPOS path>` with your path and follow the instruction on the second comment line. If you face more issues, please read [issue #920](https://github.com/opensourcepos/opensourcepos/issues/920) for more information.
+
+- Apache server configurations are SysAdmin issues and not strictly related to OSPOS. Please make sure you 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 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.
+
+## 🏃 Keep the Machine Running
+
+If you like our project, please consider buying us a coffee through the button below so we can keep adding features.
+
+[![Donate](https://www.paypalobjects.com/en_US/i/btn/btn_donate_LG.gif)](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=MUN6AEG7NY6H8)\
+Or refer to the [FUNDING.yml](.github/FUNDING.yml) file.
+
+If you choose to deploy OSPOS in the cloud, you can contribute to the project by using DigitalOcean and signing up through our referral link. You'll receive a [free $100, 60-day credit](https://m.do.co/c/ac38c262507b) if you run OSPOS in a DigitalOcean droplet through [our referral link](https://m.do.co/c/ac38c262507b).
+
+## 📄 License
 
 Open Source Point of Sale is licensed under MIT terms with an important addition:
 
-_The footer signature "You are using Open Source Point Of Sale" with version, 
-hash and link to the original distribution of the code MUST BE RETAINED, 
-MUST BE VISIBLE IN EVERY PAGE and CANNOT BE MODIFIED._
+The footer signature "© 2010 - _current year_ · opensourcepos.org · 3.x.x - _hash_" including the version, hash and link our website MUST BE RETAINED, MUST BE VISIBLE IN EVERY PAGE and CANNOT BE MODIFIED.
 
 Also worth noting:
 
-_The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software._
+_The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software._
 
-For more details please read the file [LICENSE](https://github.com/opensourcepos/opensourcepos/blob/master/LICENSE).
+For more details please read the [LICENSE](LICENSE) file.
 
-It's important to understand that althought you are free to use the software the copyright stays and the license agreement applies in all cases.
-Therefore any actions like:
+It's important to understand that although you are free to use the application the copyright has to stay and the license agreement applies in all cases. Therefore any actions like:
 
-- Removing LICENSE and any license files is prohibited
+- Removing LICENSE and/or any license files is prohibited
 - Authoring the footer notice replacing it with your own or even worse claiming the copyright is absolutely prohibited
 - Claiming full ownership of the code is prohibited
 
-In short you are free to use the software but you cannot claim any property on it.
+In short, you are free to use the application but you cannot claim any property on it.
 
-Any person or company found breaching the license agreement will have a bunch of monkeys at the door ready to destroy their servers.
+Any person or company found breaching the license agreement might find a bunch of monkeys at the door ready to destroy their servers.
 
+## 🙏 Credits
 
-Keep the Machine Running
-------------------------
-
-If you like the project, and you are making money out of it in some form, then consider buying us a coffee so we can keep adding features.
-
-[![Donate](https://www.paypalobjects.com/en_US/i/btn/btn_donate_LG.gif)](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=MUN6AEG7NY6H8)
-
-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
----------------------
-
-To help us with OSPOS translations please use [Weblate website here](http://translate.opensourcepos.org) and sign up. After registering you can subscribe to different languages and you will be notified once a new translation is added.
-
-Please also read the [wiki page here](https://github.com/opensourcepos/opensourcepos/wiki/Adding-translations) to find our Translations Guideline.
-
-Only with the help of the community we can keep language translations up to date.
-
-
-Reporting Bugs
---------------
-
-If you are taking a release candidate code please make sure you always run the latest database upgrade script and you took the latest code from master.
-Please DO NOT post issues if you have not completed this step.
-
-- Versions **≥ 3.3.0**:
-
-Please **Copy** the info under **System Info tab in configuration section** in order to give us the required details.
-
-- Versions **< 3.2.3**:
-
-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 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)
-9. Optionally some screenshots to illustrate each step
-
-If above information is not provided in full, your issue will be tagged as pending.
-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 [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).
-
-* If you installed your OSPOS under a web server subdir, please edit public/.htaccess and go to the lines with comment `if in web root` and `if in subdir comment above line, uncomment below one and replace <OSPOS path> with your path` and follow the instruction on the second comment line. If you face more issues please read [issue #920](https://github.com/opensourcepos/opensourcepos/issues/920) for more help.
-
-* 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 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|
-|:-:|:-:|
-|![IntelliJ IDEA](https://raw.githubusercontent.com/wiki/j-easy/easy-batch/images/logo/intellijidea-logo.png)|[Travis CI](https://travis-ci.com/images/logos/TravisCI-Full-Color.png)|
-|Many thanks to [JetBrains](https://www.jetbrains.com/) for providing a free license of [IntelliJ IDEA](https://www.jetbrains.com/idea/) to kindly support the development of OSPOS|Many thanks to [Travis CI](https://travis-ci.org) for providing a free continuous integration service for open source projects.|
+| <div align="center">JetBrains</div> | <div align="center">Travis CI</div> |
+|--- | --- |
+| <div align="center"><img src="https://upload.wikimedia.org/wikipedia/commons/9/9c/IntelliJ_IDEA_Icon.svg" alt="IntelliJ IDEA Logo" height="50"></div> | <div align="center"><img src="https://secrethub.io/img/travis-ci.svg" alt="Travis CI Logo" height="50"></div> |
+| Many thanks to [JetBrains](https://www.jetbrains.com/) for providing a free license of [IntelliJ IDEA](https://www.jetbrains.com/idea/) to kindly support the development of OSPOS. | Many thanks to [Travis CI](https://travis-ci.org) for providing a free continuous integration service for open source projects. |

SECURITY.md

@@ -12,8 +12,7 @@
 
 ## Supported Versions
 
-We release patches for security vulnerabilities. Which versions are eligible
-receiving such patches depend on the CVSS v3.0 Rating:
+We release patches for security vulnerabilities. Which versions are eligible to receive such patches depend on the CVSS v3.0 Rating:
 
 | CVSS v3.0 | Supported Versions                                 |
 | --------- | -------------------------------------------------- |
@@ -22,7 +21,4 @@ receiving such patches depend on the CVSS v3.0 Rating:
 
 ## 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.
+Please report (suspected) security vulnerabilities to **[jekkos@opensourcepos.org](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.

UPGRADE.md

@@ -0,0 +1,17 @@
+## How to Upgrade
+
+1. Back up all your current database and OSPOS code.
+2. Make sure you have a copy of `application/config/config.php` and `application/config/database.php`.
+3. Remove all directories.
+4. Install the new OSPOS.
+5. (Only applicable if upgrading from pre `3.0.0`) Run the database upgrade scripts from `database` dir (check which ones you need according to the version you are upgrading from).
+6. Take the saved old `config.php` and upgrade the new `config.php` with any additional changes you made in the old.
+   Take time to understand if new config rules require some changes (e.g. encryption keys).
+7. Take the saved old `database.php` and change the new `database.php` to contain all the configurations you had in the old setup.
+   Please try not to use the old layout, use the new one and copy the content of the config variables.
+8. Restore the content of the old `uploads` folder into `public/uploads` one.
+9. Once the new code is in place, the database is manually updated, and the config files are in place, you're good to go.
+10. The first login will take longer because OSPOS post `3.0.0` will upgrade automatically to the latest version.
+11. If everything went according to plan, you'll be able to use your upgraded version of OSPOS.
+12. Still have issues? Please check the [README](README.md) and [GitHub issues](https://github.com/opensourcepos/opensourcepos/issues).
+    Maybe a similar issue has already been reported, and you can find your answer there.

UPGRADE.txt

@@ -1,16 +0,0 @@
-How to Upgrade
--------------------------
-1. Backup all your current database and OSPOS code
-2. Make sure you have a copy of application/config/config.php and application/config/database.php
-3. Remove all directories
-4. Install the new OSPOS
-5. (Only applicable if upgrading from pre 3.0.0) Run the database upgrade scripts from database/ dir (check which ones you need according to the version you are upgrading from)
-6. Take the saved old config.php and upgrade the new config.php with any additional changes you made in the old.
-   Take time to understand if new config rules require some changes (e.g. encryption keys)
-7. Take the saved old database.php and change the new database.php to contain all the configuration you had in the old setup.
-   Please try not to use the old layout, use the new one and just copy the content of the config variables
-8. Restore the content of the old uploads/ folder into public/uploads/ one
-9. Once the new code is in place, database is manually updated and config files are sorted you are good to start the new OSPOS
-10. The first login will take longer because OSPOS post 3.0.0 will upgrade automatically to the latest version
-11. Now you can use OSPOS
-12. If any issue please check README, FAQ and GitHub issues as somebody else might have had your problem already before creating a new issue

WHATS_NEW.txt

@@ -1,313 +0,0 @@
-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
-+ Code Igniter 3.1.11 upgrade
-+ PHP 7.3 support
-+ Attributes feature (allows extensibility of Items replacing old custom fields)
-+ India GST Tax support + various Tax support improvements
-+ Cashup feature
-+ Temporary items feature
-+ Fixed Sales Discount
-+ Supplier category feature
-+ Improved Items import and csv file generation (to contain additional attributes)
-+ Improved Docker installation with nginx reverse proxy using Let's encrypt TLS certificate
-+ Database performance improvements
-+ Added and Updated translations
-+ Fixed various reports issues
-+ Fixed rounding issues
-+ Fixed CSRF issues
-+ Fixed database upgrade script issues
-+ Various bug fixes
-
-Version 3.2.3
--------------
-+ Further revert of CSRF change causing regression
-+ Code Igniter 3.1.9 upgrade
-
-Version 3.2.2
--------------
-+ Revert CSRF change causing regression
-
-Version 3.2.1
--------------
-+ Support for GDPR
-+ CSRF simplifications
-+ Translation upgrades
-+ Various bug fixes
-
-Version 3.2.0
--------------
-+ Code Igniter 3.1.8 upgrade
-+ PHP 7.2 support (use OpenSSL and not MCrypt)
-+ Automatic database upgrades from vs 3.0.0 at first login (no more sql scripts)
-+ Home and (back) Office menu switch (top menu can be organised in two views)
-+ Expenses feature
-+ Quote, Work Order features
-+ Improved Invoice support
-+ Sale suspend, soft delete, complete as state not as different tables or hard delete
-+ Restore deleted Sales
-+ Improved Items Kits
-+ Export tables all records and export to pdf
-+ Table sticky header (headers visible during scrolling)
-+ Allow duplicate barcodes (Config option)
-+ Search suggestion formatting (Config option)
-+ Define print and email checkboxes behaviour (Config option)
-+ Edit customer from sale register
-+ Added and Updated translations
-+ Various Jquery plugins upgrade
-+ Fixed permission issues (e.g. password change)
-+ Fixed various reports issues and renamed Sales to Transactions
-+ Various bug fixes (e.g. Tax, Rounding, Library circular dependency)
-
-Version 3.1.1
--------------
-+ Updated en-US and en-GB translations, better grammar and consistency
-+ Fixed database migration issue with VAT tax included
-+ Fixed database backup bug
-+ Fixed Gift card error
-+ Fixed database upgrade to 3.1.x script (now it's to 3.1.1 and there is no 3.1.0 anymore)
-+ Fixed old database upgrade scripts for people upgrading from 2.x versions
-+ Fixed .htaccess file in opensourcepos root dir (it was not forwarding to public subdir)
-+ Fixed few jQuery 2.0 upgrade issues
-
-Version 3.1.0
--------------
-+ MySQL 5.7 and PHP 7.x support
-+ Advanced Tax support with customer tax categories and etc,
-+ Better HORECA use case support with Dinner Table sale tagging
-+ Customer Rewards support
-+ Added quote support and better invoice support
-+ Added integration with Mailchimp to connect Customer list with Mailchimp list
-+ Prevent inserting two customers with same email address
-+ Customer total spending and stats
-+ Added reCAPTCHA to Login page to increase protection from Brute Force attacks
-+ Added due payment for credit sale support
-+ Gifcard numbering with two options: Series and Random
-+ Extended Item Kits functionality
-+ Employee allowed to change their own password clicking their name on top bar
-+ Cash rounding support, extended decimals
-+ Reworked Item Pictures and file name and storing
-+ Financial year start date and selection from date range pickers
-+ Date time range filters can be date & time or date only
-+ Added two new Bootswatch themes
-+ Receipts font size support
-+ Fix automatically people's name first capital letter, emails in lower case only
-+ Fixes to Receiving
-+ Various amendments to database script updates from older versions
-+ Added dotenv support
-+ Updates to language translations (split English to American English and British English)
-+ Various Dockers support improvements
-+ Minor bugfixes
-
-Version 3.0.2
--------------
-+ Fixed error when performing scans multiple times in a row
-+ Fixed summary reports
-+ Protect Employee privacy printing just the first letter of the family name
-+ Updates to language translations
-+ Various Dockers support improvements
-+ Minor bugfixes
-
-Version 3.0.1
--------------
-+ *CodeIgniter 3.1.2 Upgrade*
-+ *Substantial database performance improvements*
-+ *Improved security: email and sms passwords encryption, removed phpinfo.php*
-+ *Set code to be production and not development in index.php*
-+ *Reports improvements, fixed table sorting, tax calculation and made profit to be net profit*
-+ Better Apache 2.4 support in .htaccess
-+ Updates to language translations
-+ Fixed excel template download links
-+ Fixed employee name in Sale receipt and invoice reprinting
-+ Fixed 2.3.2_to_2.3.3.sql database upgrade script mistake
-+ Fixed phppos to ospos database migration script
-+ Minor bugfixes and some general code clean up
-
-Version 3.0.0
--------------
-+ *CodeIgniter 3.1 Upgrade*
-+ Major UI overhaul based on *Boostrap 3.0 and Bootswatch Themes*
-+ New tabular views with advanced filtering using *Bootstrap Tables*
-+ New graphical reports with no more Adobe flash dependency
-+ Redesign of all modal dialogs
-+ Updated Sales register with simplified payment flow
-+ *Improved security: MySQL injection, XSS, CSFR, BCrypt password encryption, safer project layout*
-+ Support for TXT messaging (interfacing to specific support required)
-+ Email configuration
-+ Improved Localisation support
-+ Improved Store Config page
-+ Docker container ready for Cloud installation
-+ Composer PHP support
-+ More languages and integration with Weblate for continuous translation
-+ About 280 closed issues under 3.0.0 release label, too many to produce a meaningful list
-+ Various code cleanup, refactoring, optimisation and etc.
-
-Version 2.4.0
--------------
-+ *CodeIgniter 3.0.5* Upgrade (please read UPGRADE.txt)
-+ Fix for spurious logouts
-+ Apache .htaccess mod_expiry caching and security optimizations
-+ Bulk item edit fixes (category, tax and supplier fields)
-+ Remove f-key shortcuts used for module navigation
-+ Allow to use custom invoice numbers when suspending sale
-+ PHP7 fixes
-+ Specific warnings to distinguish between reorder level and out of stock situation in sales
-+ Fix malware detection issues due to usage of base64 encoding for storing session variables
-+ Improve language generation scripts (use PHP builtin functionality)
-+ Add extra buttons for navigation and printing to receipt and invoice
-+ Improve print layout for invoices
-+ Make layout consistent for items between receipt and invoice templates
-+ Minor bugfixes
- 
-Version 2.3.4
--------------
-+ Migration script fixes
-+ Improved continuous integration setup
-+ More integration tests
-+ Virtualized container setup (docker install)
-+ Live clock functionality + favicon
-+ Improved PHP 7 compatbility
-+ Added de_CH (German) as language 
-+ Minor code cleanup
-+ Removal of annoying backup prompt on logout
-
-Version 2.3.3
--------------
-+ Item kit fixes (search, list, ..)
-+ Add datepicker widgets in sale/receiving edit forms
-+ Add date filter in items module
-+ Add barcode generation logic for EAN8, EAN13
-+ Add barcode validation + fallback logic for EAN8, EAN13
-+ New config option to generate barcodes if item_number empty
-+ Add cost + count to inventory reports
-+ Giftcard fixes
-+ Refactor sales overview (added date filtering + search options)
-+ Better locale config support
-+ Improve php compatibility
-+ Fix invoice numbering bug on suspend
-+ Add configurable locale-dependent dateformat
-+ Add grunt-cache-breaker plugin
-+ Suspend button appeaers before adding a payment
-+ Searching of deleted items, filtering part is removed
-+ Remove infamous "0" after leaving sale or receiving comments empty
-+ Add SQL script to clean zeroes in sales/receivings comments
-+ Numerous other bug fixes
-
-Version 2.3.2
--------------
-+ Nominatim (OpenStreetMap) customer address autocompletion
-+ Sale invoice templating
-+ Configurable barcode generation for items
-+ Stock location filtering in detailed sales and receivings reports
-+ Giftcards bugfixes
-+ Proper pagination support for most modules
-+ Language updates
-+ Bugfix for decimal taxrates
-+ Add gender + company name attributes to customer
-+ Stock location config screen refactor
-+ Basic travis-ci + phantomJs setup
-+ Database backup on admin logout
-+ Modifiable item thumbnails
-+ Email invoice PDF generation using DomPDF
-+ Modifiable company logo
-+ jQuery upgrade (1.2 -> 1.8.3)
-+ Javascript minification (using grunt)
-+ Numerous bugfixes
-
-Version 2.3.1
--------------
-+ Extra report permissions (this includes a refactoring of the database model - new grants table)
-+ Tax inclusive/exclusive pricing
-+ Receivings amount multiplication (can be configured in items section)
-+ Customizable sale and receiving numbering
-+ Giftcard improvements
-+ Fix item import through csv
-+ Bug fixes for reports
-
-Version 2.3.0
--------------
-+ Support for multiple stock locations
-
-Version 2.2.2
--------------
-+ French language added
-+ Thai language added
-+ Upgrade to CodeIgniter 2.2 (contains several security fixes)
-+ Database types for amounts all changed to decimal types (this will fix rounding errors in the sales and receivings reports) the rest of the application
-+ Fix duplicated session cookies in http headers (this broke the application when running on nginx)
-
-Version 2.1.1
----------------
-+ Barcodes on the order receipt weren't generated correctly
-+ Sales edit screen for detailed sales reports is now available with thickbox as in the rest of the application
-+ Indonesian language files updated (Oktafianus)
-+ Default language set to 'en' in config.php
-+ Fix some css bugs in suspended sales section
-+ Default cookie sess_time_expire set to 86400 (24h)
-
-Version 2.1.0
--------------
-+ Various upgrades, too numerous to list here.
-+ Removed dependancy on ofc upload library due to vulnerability found.
-
-Version 2.0.2
--------------
-+ Fixed multiple giftcards issue per Bug #4 reported on Sourceforge where a
-  second giftcard added would have its balance set to $0 even if the sale did
-  not require the total of the second giftcard to pay the remaining amount due.
-+ Small code cleanup
-
-Version 2.1.0
--------------
-* Upgrade to CodeIgniter 2.1.0
-* Various small improvements

application/config/config.php

@@ -8,7 +8,7 @@
 | 
 | 
 */ 
-$config['application_version'] = '3.3.6';
+$config['application_version'] = '3.3.7';
 
 /* 
 |-------------------------------------------------------------------------- 

application/controllers/Reports.php

@@ -231,6 +231,7 @@ class Reports extends Secure_Controller
 			$tabular_data[] = $this->xss_clean(array(
 				'item_name' => $row['name'],
 				'category' => $row['category'],
+				'cost_price' => $row['cost_price'],
 				'unit_price' => $row['unit_price'],
 				'quantity' => to_quantity_decimals($row['quantity_purchased']),
 				'subtotal' => to_currency($row['subtotal']),

application/controllers/Sales.php

@@ -627,8 +627,7 @@ class Sales extends Secure_Controller
 		if($this->sale_lib->is_invoice_mode())
 		{
 			$invoice_format = $this->config->item('sales_invoice_format');
-
-			// 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
+			// generate final invoice numbr (if using the invoice in sales by receipt mode then the invoice number can be manually entered or altered in some way
 			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.
@@ -1105,14 +1104,15 @@ 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_number = $this->sale_lib->get_invoice_number();
+		$temp_invoice_number = $this->sale_lib->get_invoice_number();
+		$invoice_format = $this->config->item('sales_invoice_format');
 
-		if ($this->sale_lib->get_invoice_number() == NULL)
+		if ($temp_invoice_number == NULL || $temp_invoice_number == '')
 		{
-			$invoice_number = $this->config->item('sales_invoice_format');
+			$temp_invoice_number = $this->token_lib->render($invoice_format, array(), FALSE);
 		}
 
-		$data['invoice_number'] = $invoice_number;
+		$data['invoice_number'] = $temp_invoice_number;
 
 		$data['print_after_sale'] = $this->sale_lib->is_print_after_sale();
 		$data['price_work_orders'] = $this->sale_lib->is_price_work_orders();

application/helpers/tabular_helper.php

@@ -42,6 +42,7 @@ function transform_headers($array, $readonly = FALSE, $editable = TRUE)
 		$result[] = array('field' => key($element),
 			'title' => current($element),
 			'switchable' => isset($element['switchable']) ? $element['switchable'] : !preg_match('(^$|&nbsp)', current($element)),
+			'escape' => !preg_match("/(edit|phone_number|email|messages|item_pic)/", key($element)) && !(isset($element['escape']) && !$element['escape']),
 			'sortable' => isset($element['sortable']) ? $element['sortable'] : current($element) != '',
 			'checkbox' => isset($element['checkbox']) ? $element['checkbox'] : FALSE,
 			'class' => isset($element['checkbox']) || preg_match('(^$|&nbsp)', current($element)) ? 'print_hide' : '',
@@ -72,10 +73,10 @@ function get_sales_manage_table_headers()
 	if($CI->config->item('invoice_enable') == TRUE)
 	{
 		$headers[] = array('invoice_number' => $CI->lang->line('sales_invoice_number'));
-		$headers[] = array('invoice' => '&nbsp', 'sortable' => FALSE);
+		$headers[] = array('invoice' => '&nbsp', 'sortable' => FALSE, 'escape' => FALSE);
 	}
 
-	$headers[] = array('receipt' => '&nbsp', 'sortable' => FALSE);
+	$headers[] = array('receipt' => '&nbsp', 'sortable' => FALSE, 'escape' => FALSE);
 
 	return transform_headers($headers);
 }
@@ -137,10 +138,10 @@ function get_sale_data_last_row($sales)
 
 	return array(
 		'sale_id' => '-',
-		'sale_time' => '<b>'.$CI->lang->line('sales_total').'</b>',
-		'amount_due' => '<b>'.to_currency($sum_amount_due).'</b>',
-		'amount_tendered' => '<b>'. to_currency($sum_amount_tendered).'</b>',
-		'change_due' => '<b>'.to_currency($sum_change_due).'</b>'
+		'sale_time' => $CI->lang->line('sales_total'),
+		'amount_due' => to_currency($sum_amount_due),
+		'amount_tendered' => to_currency($sum_amount_tendered),
+		'change_due' => to_currency($sum_change_due)
 	);
 }
 
@@ -350,8 +351,8 @@ function get_items_manage_table_headers()
 		$headers[] = array($definition_id => $definition_name, 'sortable' => FALSE);
 	}
 
-	$headers[] = array('inventory' => '');
-	$headers[] = array('stock' => '');
+	$headers[] = array('inventory' => '', 'escape' => FALSE);
+	$headers[] = array('stock' => '', 'escape' => FALSE);
 
 	return transform_headers($headers);
 }
@@ -717,9 +718,9 @@ function get_expenses_data_last_row($expense)
 
 	return array(
 		'expense_id' => '-',
-		'date' => '<b>'.$CI->lang->line('sales_total').'</b>',
-		'amount' => '<b>'. to_currency($sum_amount_expense).'</b>',
-		'tax_amount' => '<b>'. to_currency($sum_tax_amount_expense).'</b>'
+		'date' => $CI->lang->line('sales_total'),
+		'amount' => to_currency($sum_amount_expense),
+		'tax_amount' => to_currency($sum_tax_amount_expense)
 	);
 }
 

application/hooks/method_hook.php

@@ -5,7 +5,7 @@ function validate_method()
 
     $url = $_SERVER['REQUEST_URI'];
 
-    $post_required = preg_match('/(save|delete*|remove*)\/?\d*?/', $url);
+    $post_required = preg_match('/\/(save|delete*|remove*)\/?\d*?/', $url);
 
     if($post_required && $_SERVER["REQUEST_METHOD"] != "POST" && empty($_POST))
     {

application/language/bs-BA/common_lang.php

@@ -1,5 +1,4 @@
-<?php 
-
+<?php
 $lang["common_address_1"] = "Adresa 1";
 $lang["common_address_2"] = "Adresa 2";
 $lang["common_admin"] = "";
@@ -20,41 +19,41 @@ $lang["common_det"] = "Detalji";
 $lang["common_download_import_template"] = "Preuzmite šablon za uvoz(CSV)";
 $lang["common_edit"] = "Uredi";
 $lang["common_email"] = "E-mail";
-$lang["common_email_invalid_format"] = "Neispravan e-mail";
+$lang["common_email_invalid_format"] = "Adresa e-pošte nije u ispravnom formatu.";
 $lang["common_export_csv"] = "CSV izvoz";
 $lang["common_export_csv_no"] = "Ne";
 $lang["common_export_csv_yes"] = "Da";
 $lang["common_fields_required_message"] = "Polja u crvenom su obavezna";
 $lang["common_fields_required_message_unique"] = "";
 $lang["common_first_name"] = "Ime";
-$lang["common_first_name_required"] = "Ime je obavezno";
+$lang["common_first_name_required"] = "Ime je obavezno polje.";
 $lang["common_first_page"] = "Prva";
 $lang["common_gender"] = "Pol";
 $lang["common_gender_female"] = "Ž";
 $lang["common_gender_male"] = "M";
 $lang["common_gender_undefined"] = "";
-$lang["common_icon"] = "";
-$lang["common_id"] = "Id";
+$lang["common_icon"] = "Ikona";
+$lang["common_id"] = "ID";
 $lang["common_import"] = "Uvoz";
 $lang["common_import_change_file"] = "Promjena";
 $lang["common_import_csv"] = "CSV uvoz";
-$lang["common_import_full_path"] = "Potrebna je potpuna putanja do CSV datoteke";
+$lang["common_import_full_path"] = "Potrebna je puna putanja do CSV datoteke";
 $lang["common_import_remove_file"] = "Ukloni";
 $lang["common_import_select_file"] = "Odaberite datoteku";
 $lang["common_inv"] = "Zaliha";
 $lang["common_last_name"] = "Prezime";
-$lang["common_last_name_required"] = "Prezime je obavezno";
+$lang["common_last_name_required"] = "Prezime je obavezno polje.";
 $lang["common_last_page"] = "Poslednja";
-$lang["common_learn_about_project"] = "da biste saznali najnovije informacije o projektu";
+$lang["common_learn_about_project"] = "da biste saznali najnovije informacije o projektu.";
 $lang["common_list_of"] = "Lista";
-$lang["common_logo"] = "";
-$lang["common_logo_mark"] = "";
+$lang["common_logo"] = "Logo";
+$lang["common_logo_mark"] = "Znak";
 $lang["common_logout"] = "Odjava";
 $lang["common_manager"] = "";
 $lang["common_migration_needed"] = "Premještanje baze podataka na %1 počinje nakon prijave.";
 $lang["common_new"] = "Novi";
 $lang["common_no"] = "";
-$lang["common_no_persons_to_display"] = "Nema dobavljača za prikaz";
+$lang["common_no_persons_to_display"] = "Nema ljudi za prikaz.";
 $lang["common_none_selected_text"] = "[Izaberi]";
 $lang["common_or"] = "Ili";
 $lang["common_people"] = "";
@@ -72,8 +71,8 @@ $lang["common_return_policy"] = "Povratna informacija";
 $lang["common_search"] = "Traži";
 $lang["common_search_options"] = "Opcije pretrage";
 $lang["common_searched_for"] = "Traženo";
-$lang["common_software_short"] = "";
-$lang["common_software_title"] = "";
+$lang["common_software_short"] = "OSPOS";
+$lang["common_software_title"] = "Prodajno mjesto otvorenog koda";
 $lang["common_state"] = "Entitet";
 $lang["common_submit"] = "Prihvati";
 $lang["common_total_spent"] = "Ukupno potrošeno";
@@ -81,7 +80,7 @@ $lang["common_unknown"] = "Nepoznato";
 $lang["common_view_recent_sales"] = "Pogledaj nedavne prodaje";
 $lang["common_website"] = "opensourcepos.org";
 $lang["common_welcome"] = "Dobrodošli";
-$lang["common_welcome_message"] = "Dobrodošli u OSPOS, kliknite na modul ispod da biste započeli";
+$lang["common_welcome_message"] = "Dobrodošli u OSPOS, kliknite na modul ispod da biste započeli.";
 $lang["common_yes"] = "";
 $lang["common_you_are_using_ospos"] = "";
 $lang["common_zip"] = "Poštanski broj";

application/language/bs-BA/config_lang.php

@@ -1,7 +1,6 @@
-<?php 
-
+<?php
 $lang["config_address"] = "Adresa kompanije";
-$lang["config_address_required"] = "Adresa kompanije je obavezno polje";
+$lang["config_address_required"] = "Adresa kompanije je obavezno polje.";
 $lang["config_all_set"] = "Sva su dopuštenja datoteka ispravno postavljena!";
 $lang["config_allow_duplicate_barcodes"] = "Dozvoli dvostruke barkodove";
 $lang["config_apostrophe"] = "apostrof";
@@ -14,7 +13,7 @@ $lang["config_barcode_content"] = "Sadržaj barkoda";
 $lang["config_barcode_first_row"] = "1 red";
 $lang["config_barcode_font"] = "Font";
 $lang["config_barcode_formats"] = "Unesi format";
-$lang["config_barcode_generate_if_empty"] = "Generiši ako je prazno";
+$lang["config_barcode_generate_if_empty"] = "Generiši ako je prazno.";
 $lang["config_barcode_height"] = "Visina(px)";
 $lang["config_barcode_id"] = "Id / naziv artikla";
 $lang["config_barcode_info"] = "Informacije o konfiguraciji barkoda";
@@ -22,12 +21,12 @@ $lang["config_barcode_layout"] = "Izgled barkoda";
 $lang["config_barcode_name"] = "Naziv";
 $lang["config_barcode_number"] = "Barkod";
 $lang["config_barcode_number_in_row"] = "Broj u redu";
-$lang["config_barcode_page_cellspacing"] = "Prikaži razmak ćelija na stranici";
+$lang["config_barcode_page_cellspacing"] = "Prikaži razmak ćelija na stranici.";
 $lang["config_barcode_page_width"] = "Širina stranice";
 $lang["config_barcode_price"] = "Cijena";
 $lang["config_barcode_second_row"] = "2.red";
 $lang["config_barcode_third_row"] = "3.red";
-$lang["config_barcode_tooltip"] = "Upozorenje: Ovo svokstvo može dovesti do uvoza ili kreiranja duplih stavki. Nemojte koristiti ako to ne želite";
+$lang["config_barcode_tooltip"] = "Upozorenje: Ova funkcija može prouzrokovati uvoz ili kreiranje duplikata. Ne koristite ako ne želite duple barkodove.";
 $lang["config_barcode_type"] = "Tip barkoda";
 $lang["config_barcode_width"] = "Širina (px)";
 $lang["config_bottom"] = "Dno";
@@ -52,7 +51,7 @@ $lang["config_company_logo"] = "Logo kompanije";
 $lang["config_company_remove_image"] = "Ukloni logo";
 $lang["config_company_required"] = "Naziv kompanije je obavezno polje";
 $lang["config_company_select_image"] = "Izaberite sliku";
-$lang["config_company_website_url"] = "Adresa web stranice nije valjana (http://...)";
+$lang["config_company_website_url"] = "Veb lokacija kompanije nije važeća URL adresa (http://...).";
 $lang["config_country_codes"] = "Kod zemlje";
 $lang["config_country_codes_tooltip"] = "Lista kodova zemalja odvojena zarezima za traženje nominalnih adresa.";
 $lang["config_currency_code"] = "Kod valute";
@@ -68,41 +67,41 @@ $lang["config_customer_sales_tax_support"] = "";
 $lang["config_date_or_time_format"] = "Filter datuma i vremena";
 $lang["config_datetimeformat"] = "Format datuma i vremena";
 $lang["config_decimal_point"] = "Decimalna točka";
-$lang["config_default_barcode_font_size_number"] = "Veličina fonta za barkod mora biti broj";
-$lang["config_default_barcode_font_size_required"] = "Veličina fonta barkoda je obavezno polje";
-$lang["config_default_barcode_height_number"] = "Visina barkoda mora biti broj";
-$lang["config_default_barcode_height_required"] = "Visina barkoda je obavezno polje";
-$lang["config_default_barcode_num_in_row_number"] = "Broj barkoda u redu mora biti broj";
-$lang["config_default_barcode_num_in_row_required"] = "Broj barkoda u redu je obavezno polje";
-$lang["config_default_barcode_page_cellspacing_number"] = "Razmak ćelija sa barkodom mora biti broj";
+$lang["config_default_barcode_font_size_number"] = "Veličina fonta za barkod mora biti broj.";
+$lang["config_default_barcode_font_size_required"] = "Veličina fonta barkoda je obavezno polje.";
+$lang["config_default_barcode_height_number"] = "Visina barkoda mora biti broj.";
+$lang["config_default_barcode_height_required"] = "Visina barkoda je obavezno polje.";
+$lang["config_default_barcode_num_in_row_number"] = "Broj barkoda u redu mora biti broj.";
+$lang["config_default_barcode_num_in_row_required"] = "Broj barkoda u redu je obavezno polje.";
+$lang["config_default_barcode_page_cellspacing_number"] = "Razmak između ćelija sa barkodom mora biti broj.";
 $lang["config_default_barcode_page_cellspacing_required"] = "Rastojanje ćelija na stranici sa barkodom je obavezno polje.";
-$lang["config_default_barcode_page_width_number"] = "Širina stranice barkoda mora biti broj";
-$lang["config_default_barcode_page_width_required"] = "Širina stranice barkoda je obavezno polje";
-$lang["config_default_barcode_width_number"] = "Standardna širina barkoda mora biti broj";
-$lang["config_default_barcode_width_required"] = "Širina barkoda mora bit broj";
+$lang["config_default_barcode_page_width_number"] = "Širina stranice sa bar kodom mora biti broj.";
+$lang["config_default_barcode_page_width_required"] = "Širina stranice sa barkodom je obavezno polje.";
+$lang["config_default_barcode_width_number"] = "Standardna širina barkoda mora biti broj.";
+$lang["config_default_barcode_width_required"] = "Širina barkoda je obavezno polje.";
 $lang["config_default_item_columns"] = "Vidljiva stavka kolone";
 $lang["config_default_origin_tax_code"] = "Šifra poreza";
 $lang["config_default_receivings_discount"] = "Popust za ulaze";
-$lang["config_default_receivings_discount_number"] = "Popust za ulaz mora biti broj";
-$lang["config_default_receivings_discount_required"] = "Popust za ulaz je obavezno polje";
+$lang["config_default_receivings_discount_number"] = "Popust za ulaz mora biti broj.";
+$lang["config_default_receivings_discount_required"] = "Popust za ulaz je obavezno polje.";
 $lang["config_default_sales_discount"] = "Popust na prodaju";
-$lang["config_default_sales_discount_number"] = "Popust na prodaju mora biti broj";
-$lang["config_default_sales_discount_required"] = "Popust na prodaju je obavezno polje";
+$lang["config_default_sales_discount_number"] = "Popust na prodaju mora biti broj.";
+$lang["config_default_sales_discount_required"] = "Popust na prodaju je obavezno polje.";
 $lang["config_default_tax_category"] = "Poreska kategorija";
 $lang["config_default_tax_code"] = "Poreska šifra";
 $lang["config_default_tax_jurisdiction"] = "Poreska uprava";
 $lang["config_default_tax_name_number"] = "Naziv poreza mora biti string.";
-$lang["config_default_tax_name_required"] = "Naziv poreza je obavezno polje";
+$lang["config_default_tax_name_required"] = "Naziv poreza je obavezno polje.";
 $lang["config_default_tax_rate"] = "Stopa poreza %";
 $lang["config_default_tax_rate_1"] = "Stopa poreza 1 %";
 $lang["config_default_tax_rate_2"] = "Stopa poreza 2 %";
 $lang["config_default_tax_rate_3"] = "";
-$lang["config_default_tax_rate_number"] = "Stopa poreza mora biti broj";
-$lang["config_default_tax_rate_required"] = "Stopa poreza je obavezno polje";
+$lang["config_default_tax_rate_number"] = "Stopa poreza mora biti broj.";
+$lang["config_default_tax_rate_required"] = "Stopa poreza je obavezno polje.";
 $lang["config_derive_sale_quantity"] = "Dozvoli izvedenu količinu prodaje";
 $lang["config_derive_sale_quantity_tooltip"] = "Ako se izabere, za artikle naručene po produženom iznosu biće obezbjeđen novi tip artikla";
 $lang["config_dinner_table"] = "Sto";
-$lang["config_dinner_table_duplicate"] = "Sto mora biti jedinstven";
+$lang["config_dinner_table_duplicate"] = "Sto mora biti jedinstven.";
 $lang["config_dinner_table_enable"] = "Omogući stolove za večeru";
 $lang["config_dinner_table_invalid_chars"] = "Naziv stola ne može sadržavati '_'.";
 $lang["config_dinner_table_required"] = "Sto je obavezno polje.";
@@ -144,16 +143,16 @@ $lang["config_financial_year_may"] = "1. Maj";
 $lang["config_financial_year_nov"] = "1. Novembar";
 $lang["config_financial_year_oct"] = "1. Oktobar";
 $lang["config_financial_year_sep"] = "1. Septembar";
-$lang["config_floating_labels"] = "";
+$lang["config_floating_labels"] = "Plutajuće etikete";
 $lang["config_gcaptcha_enable"] = "Stranica za prijavu reCAPTCHA";
 $lang["config_gcaptcha_secret_key"] = "reCAPTCHA tajni ključ";
 $lang["config_gcaptcha_secret_key_required"] = "reCAPTCHA tajni ključ je obavezno polje";
 $lang["config_gcaptcha_site_key"] = "reCAPTCHA ključ sajta";
 $lang["config_gcaptcha_site_key_required"] = "reCAPTCHA Ključ sajta je obavezno polje";
-$lang["config_gcaptcha_tooltip"] = "Zaštitite stranicu za prijavu pomoću Google reCAPTCHA, kliknite na ikonu za nabavku API ključa";
+$lang["config_gcaptcha_tooltip"] = "Zaštitite stranicu za prijavu pomoću Google reCAPTCHA, kliknite na ikonu za par API ključeva.";
 $lang["config_general"] = "Generalno";
 $lang["config_general_configuration"] = "Opšta konfiguracija";
-$lang["config_giftcard_number"] = "Broj poklon bona";
+$lang["config_giftcard_number"] = "Broj poklon kartice";
 $lang["config_giftcard_random"] = "Generiši nasumice";
 $lang["config_giftcard_series"] = "Generiši u seriji";
 $lang["config_image_allowed_file_types"] = "Dozvoljeni tipovi datoteka";
@@ -164,7 +163,7 @@ $lang["config_image_restrictions"] = "Ograničenja za učitavanje slike";
 $lang["config_include_hsn"] = "Uključite podršku za HSN kodove";
 $lang["config_info"] = "Informacije";
 $lang["config_info_configuration"] = "Info o web trgovini";
-$lang["config_input_groups"] = "";
+$lang["config_input_groups"] = "Grupe unosa";
 $lang["config_integrations"] = "Integracije";
 $lang["config_integrations_configuration"] = "Integracije trećih strana";
 $lang["config_invoice"] = "Faktura";
@@ -187,22 +186,22 @@ $lang["config_license"] = "Licenca";
 $lang["config_license_configuration"] = "Izjava o licenci";
 $lang["config_line_sequence"] = "Redoslijed linija";
 $lang["config_lines_per_page"] = "Linija po stranici";
-$lang["config_lines_per_page_number"] = "Linije po stranici moraju biti broj";
-$lang["config_lines_per_page_required"] = "Broj linija po stranici je obavezan podatak";
+$lang["config_lines_per_page_number"] = "Redovi po stranici moraju biti broj.";
+$lang["config_lines_per_page_required"] = "Broj linija po stranici je obavezno polje.";
 $lang["config_locale"] = "Lokalizacija";
 $lang["config_locale_configuration"] = "Konfiguracija";
 $lang["config_locale_info"] = "Info o lokalnoj konfiguraciji";
 $lang["config_location"] = "Skladište";
 $lang["config_location_configuration"] = "Lokacije skladišta";
 $lang["config_location_info"] = "Informacije o konfiguraciji lokacije";
-$lang["config_login_form"] = "";
+$lang["config_login_form"] = "Stil formulara za prijavu";
 $lang["config_logout"] = "Zar ne želite da napravite rezervnu kopiju prije odjave? Kliknite [OK] za sigurnosnu kopiju, [Cancel] da biste se odjavili.";
-$lang["config_mailchimp"] = "Mailchimp";
-$lang["config_mailchimp_api_key"] = "Mailchimp API ključ";
-$lang["config_mailchimp_configuration"] = "Mailchimp konfiguracija";
-$lang["config_mailchimp_key_successfully"] = "API ključ je važeći";
-$lang["config_mailchimp_key_unsuccessfully"] = "API ključ je nevažeći";
-$lang["config_mailchimp_lists"] = "Mailchimp lista";
+$lang["config_mailchimp"] = "MeilChimp";
+$lang["config_mailchimp_api_key"] = "MailChimp API ključ";
+$lang["config_mailchimp_configuration"] = "MailChimp konfiguracija";
+$lang["config_mailchimp_key_successfully"] = "API ključ je važeći.";
+$lang["config_mailchimp_key_unsuccessfully"] = "API ključ je nevažeći.";
+$lang["config_mailchimp_lists"] = "MailChimp lista(e)";
 $lang["config_mailchimp_tooltip"] = "Kliknite na ikonu za API ključ.";
 $lang["config_message"] = "Poruke";
 $lang["config_message_configuration"] = "Konfigurisanje poruke";
@@ -220,37 +219,37 @@ $lang["config_none"] = "nijedan";
 $lang["config_notify_alignment"] = "Položaj iskačuće obavijesti";
 $lang["config_number_format"] = "Format broja";
 $lang["config_number_locale"] = "Lokalizacija";
-$lang["config_number_locale_invalid"] = "Uneseni jezik nije važeći. Provjerite vezu u opisu alata kako biste pronašli osjetljivu vrijednost";
-$lang["config_number_locale_required"] = "Broj lokacije je obavezno polje";
-$lang["config_number_locale_tooltip"] = "Pronađite odgovarajuću lokaciju na ovom linku";
+$lang["config_number_locale_invalid"] = "Unijeti jezik je nevažeći. Provjerite vezu u opisu alatke da biste pronašli važeći jezik.";
+$lang["config_number_locale_required"] = "Broj lokacije je obavezno polje.";
+$lang["config_number_locale_tooltip"] = "Pronađite odgovarajuću lokaciju na ovom linku.";
 $lang["config_os_timezone"] = "OSPOS vremenska zona:";
 $lang["config_ospos_info"] = "OSPOS instalacione informacije";
 $lang["config_payment_options_order"] = "Narudžba opcije plaćanja";
 $lang["config_perm_risk"] = "Dozvole veće od 750 za pisanje i 660 za čitanje dovode ovaj program u rizik.";
 $lang["config_phone"] = "Telefon kompanije";
-$lang["config_phone_required"] = "Telefon kompanije je obavezan";
+$lang["config_phone_required"] = "Telefon kompanije je obavezno polje.";
 $lang["config_print_bottom_margin"] = "Donja margina";
-$lang["config_print_bottom_margin_number"] = "Donja margina mora biti broj";
-$lang["config_print_bottom_margin_required"] = "Donja margina je obavezna";
+$lang["config_print_bottom_margin_number"] = "Donja margina mora biti broj.";
+$lang["config_print_bottom_margin_required"] = "Donja margina je obavezno polje.";
 $lang["config_print_delay_autoreturn"] = "Automatski povratak na odgodu prodaje";
-$lang["config_print_delay_autoreturn_number"] = "Automatski povratak na odgodu prodaje je obavezno polje";
-$lang["config_print_delay_autoreturn_required"] = "Automatski povratak na odgodu prodaje mora biti broj";
+$lang["config_print_delay_autoreturn_number"] = "Odgoda automatskog povratka na prodaju je obavezno polje.";
+$lang["config_print_delay_autoreturn_required"] = "Odlaganje automatskog povratka na prodaju mora biti broj.";
 $lang["config_print_footer"] = "Štampanje podnožja";
 $lang["config_print_header"] = "Štampanje zaglavlja";
 $lang["config_print_left_margin"] = "Lijeva margina";
-$lang["config_print_left_margin_number"] = "Lijeva margina mora biti broj";
-$lang["config_print_left_margin_required"] = "Lijeva margina je obavezna";
+$lang["config_print_left_margin_number"] = "Lijeva margina mora biti broj.";
+$lang["config_print_left_margin_required"] = "Lijeva margina je obavezno polje.";
 $lang["config_print_receipt_check_behaviour"] = "Polje za potvrdu štampanja računa";
 $lang["config_print_receipt_check_behaviour_always"] = "Uvijek potvrđeno";
 $lang["config_print_receipt_check_behaviour_last"] = "Zapamti poslednji izbor";
 $lang["config_print_receipt_check_behaviour_never"] = "Uvijek nepotvrđeno";
 $lang["config_print_right_margin"] = "Desna margina";
-$lang["config_print_right_margin_number"] = "Desna margina mora biti broj";
-$lang["config_print_right_margin_required"] = "Desna margina je obavezna";
+$lang["config_print_right_margin_number"] = "Desna margina mora biti broj.";
+$lang["config_print_right_margin_required"] = "Desna margina je obavezno polje.";
 $lang["config_print_silently"] = "Prikaži dijalog za štampanje";
 $lang["config_print_top_margin"] = "Gornja margina";
-$lang["config_print_top_margin_number"] = "Gornja margina mora biti broj";
-$lang["config_print_top_margin_required"] = "Gornja margina je obavezna";
+$lang["config_print_top_margin_number"] = "Gornja margina mora biti broj.";
+$lang["config_print_top_margin_required"] = "Gornja margina je obavezno polje.";
 $lang["config_quantity_decimals"] = "Decimale količine";
 $lang["config_quick_cash_enable"] = "";
 $lang["config_quote_default_comments"] = "Difoltni komentari citata";
@@ -259,8 +258,8 @@ $lang["config_receipt_category"] = "";
 $lang["config_receipt_configuration"] = "Podešavanja štamapnja";
 $lang["config_receipt_default"] = "Podrazumijevano";
 $lang["config_receipt_font_size"] = "Veličina fonta";
-$lang["config_receipt_font_size_number"] = "Veličina fonta mora biti broj";
-$lang["config_receipt_font_size_required"] = "Veličina fonta je obavezno polje";
+$lang["config_receipt_font_size_number"] = "Veličina fonta mora biti broj.";
+$lang["config_receipt_font_size_required"] = "Veličina fonta je obavezno polje.";
 $lang["config_receipt_info"] = "Informacije o POS računu";
 $lang["config_receipt_printer"] = "POS štampač";
 $lang["config_receipt_short"] = "Kratko";
@@ -271,29 +270,29 @@ $lang["config_receipt_show_tax_ind"] = "Prikaži poreski indikator";
 $lang["config_receipt_show_taxes"] = "Prikaži porez";
 $lang["config_receipt_show_total_discount"] = "Prikaži ukupni popust";
 $lang["config_receipt_template"] = "Šablon računa";
-$lang["config_receiving_calculate_average_price"] = "Kalk. prosječnih cijena (ulaza)";
+$lang["config_receiving_calculate_average_price"] = "Izrač. prosječnih cijena (ulaza)";
 $lang["config_recv_invoice_format"] = "Format računa fakture";
 $lang["config_register_mode_default"] = "Mod registracije";
 $lang["config_report_an_issue"] = "Prijavi problem";
-$lang["config_return_policy_required"] = "Politika povrata je obavezno polje";
+$lang["config_return_policy_required"] = "Politika povrata je obavezno polje.";
 $lang["config_reward"] = "Nagrada";
 $lang["config_reward_configuration"] = "Konfigurisanje poklona";
 $lang["config_right"] = "Desno";
 $lang["config_sales_invoice_format"] = "Format fakture";
 $lang["config_sales_quote_format"] = "Format navedene prodaje";
-$lang["config_saved_successfully"] = "Konfiguracija je uspješno snimljena";
-$lang["config_saved_unsuccessfully"] = "Konfiguracija nije uspješno snimljena";
-$lang["config_security_issue"] = "Upozorenje o ugroženosti sigurnosti";
-$lang["config_server_notice"] = "Upotrijebite dolje navedene podatke za izvještavanje o problemima.";
+$lang["config_saved_successfully"] = "Konfiguracija je uspješno snimljena.";
+$lang["config_saved_unsuccessfully"] = "Konfiguracija nije uspješno snimljena.";
+$lang["config_security_issue"] = "Upozorenje o sigurnosnoj ranjivosti";
+$lang["config_server_notice"] = "Koristite informacije u nastavku za prijavljivanje problema.";
 $lang["config_service_charge"] = "";
 $lang["config_show_due_enable"] = "";
-$lang["config_show_office_group"] = "Prikaži ikonu poslovnice";
+$lang["config_show_office_group"] = "Prikaži ikonu kancelarije";
 $lang["config_statistics"] = "Pošalji statistiku";
-$lang["config_statistics_tooltip"] = "Pošaljite statistike za potrebe razvoja i poboljšanja namjene";
+$lang["config_statistics_tooltip"] = "Pošaljite statistiku u svrhu razvoja i poboljšanja funkcija.";
 $lang["config_stock_location"] = "Lokacija skladišta";
-$lang["config_stock_location_duplicate"] = "Molim koristite jedinstveni naziv skladišta";
-$lang["config_stock_location_invalid_chars"] = "Naziv skaldišta ne može sadržavati '_'";
-$lang["config_stock_location_required"] = "Naziv skladišta je obavezno polje";
+$lang["config_stock_location_duplicate"] = "Lokacija zaliha mora biti jedinstvena.";
+$lang["config_stock_location_invalid_chars"] = "Lokacija skaldišta ne može sadržavati '_'.";
+$lang["config_stock_location_required"] = "Lokacija skladišta je obavezno polje.";
 $lang["config_suggestions_fifth_column"] = "";
 $lang["config_suggestions_first_column"] = "Kolona 1";
 $lang["config_suggestions_fourth_column"] = "";
@@ -310,13 +309,13 @@ $lang["config_tax_category"] = "Kategorija";
 $lang["config_tax_category_duplicate"] = "Unesena kategorija već postoji.";
 $lang["config_tax_category_invalid_chars"] = "Unesena kategorija je nevažeća.";
 $lang["config_tax_category_required"] = "Obavezna je kategorija.";
-$lang["config_tax_category_used"] = "Kategorija se ne može izbrisati jer se koristi";
+$lang["config_tax_category_used"] = "Kategorija se ne može izbrisati jer se koristi.";
 $lang["config_tax_configuration"] = "Konfigurisanje poreza";
 $lang["config_tax_decimals"] = "Poreske decimale";
-$lang["config_tax_id"] = "Poreska identifikacija";
+$lang["config_tax_id"] = "ID poreza";
 $lang["config_tax_included"] = "Uključen porez";
 $lang["config_theme"] = "Tema";
-$lang["config_theme_preview"] = "";
+$lang["config_theme_preview"] = "Pregled teme:";
 $lang["config_thousands_separator"] = "Separator za hiljade";
 $lang["config_timezone"] = "Vremenska zona";
 $lang["config_timezone_error"] = "Vremenska zona OSPOS razlikuje se od vaše lokalne vremenske zone.";

application/language/bs-BA/customers_lang.php

@@ -1,8 +1,7 @@
-<?php 
-
+<?php
 $lang["customers_account_number"] = "Račun #";
-$lang["customers_account_number_duplicate"] = "Ovaj broj računa već postoji";
-$lang["customers_available_points"] = "Dostupni bodovi";
+$lang["customers_account_number_duplicate"] = "Broj računa već postoji u bazi podataka.";
+$lang["customers_available_points"] = "Dostupni poeni";
 $lang["customers_available_points_value"] = "";
 $lang["customers_average"] = "Prosječna potrošnja";
 $lang["customers_avg_discount"] = "Prosječni popust";
@@ -14,18 +13,18 @@ $lang["customers_confirm_restore"] = "Da li ste sigurni da želite da povratite
 $lang["customers_consent"] = "Pristanak na registraciju";
 $lang["customers_consent_required"] = "Prihvatanje registracije je obavezno polje.";
 $lang["customers_csv_import_failed"] = "Greška kod uvoza iz CSV-a";
-$lang["customers_csv_import_nodata_wrongformat"] = "Vaša učitana datoteka nema podataka ili je pogrešnog formata";
-$lang["customers_csv_import_partially_failed"] = "Većina kupaca je uvezena. Ali neki nisu, evo liste";
-$lang["customers_csv_import_success"] = "Uvoz kupaca je uspješan";
+$lang["customers_csv_import_nodata_wrongformat"] = "Učitana datoteka nema podataka ili je pogrešno formatirana.";
+$lang["customers_csv_import_partially_failed"] = "Uvoz klijenata je uspio sa nekim greškama:";
+$lang["customers_csv_import_success"] = "Uvoz korisnika je uspješan.";
 $lang["customers_customer"] = "Kupac";
 $lang["customers_date"] = "Datum";
 $lang["customers_discount"] = "Popust";
 $lang["customers_discount_fixed"] = "Fiksni popust";
 $lang["customers_discount_percent"] = "Procenat popusta";
-$lang["customers_discount_type"] = "Tip popusta";
+$lang["customers_discount_type"] = "Vrsta popusta";
 $lang["customers_email_duplicate"] = "E-mail adresa već postoji u bazi podataka.";
 $lang["customers_employee"] = "Zaposlenik";
-$lang["customers_error_adding_updating"] = "Greška kod dodavanja/ažuriranja kupca";
+$lang["customers_error_adding_updating"] = "Dodavanje ili ažuriranje kupca nije uspjelo.";
 $lang["customers_import_items_csv"] = "Uvezi kupce iz CSV datoteke";
 $lang["customers_mailchimp_activity_click"] = "Klik na e-mail";
 $lang["customers_mailchimp_activity_lastopen"] = "Zadnji otvoreni e-mail";
@@ -33,15 +32,15 @@ $lang["customers_mailchimp_activity_open"] = "E-mail otvoren";
 $lang["customers_mailchimp_activity_total"] = "E-mail poslat";
 $lang["customers_mailchimp_activity_unopen"] = "E-mail nije otvoren";
 $lang["customers_mailchimp_email_client"] = "E-mail klijenta";
-$lang["customers_mailchimp_info"] = "Mailchimp";
-$lang["customers_mailchimp_member_rating"] = "Rejting";
+$lang["customers_mailchimp_info"] = "MeilChimp";
+$lang["customers_mailchimp_member_rating"] = "Ocjena";
 $lang["customers_mailchimp_status"] = "Status";
 $lang["customers_mailchimp_vip"] = "VIP";
 $lang["customers_max"] = "Maks. potrošeno";
 $lang["customers_min"] = "Min. potrošeno";
 $lang["customers_new"] = "Novi kupac";
-$lang["customers_none_selected"] = "Niste odabrali nijednog kupca za brisanje";
-$lang["customers_one_or_multiple"] = "Kupaci";
+$lang["customers_none_selected"] = "Niste izabrali nijednog kupca za brisanje.";
+$lang["customers_one_or_multiple"] = "kupac(i)";
 $lang["customers_quantity"] = "Količina";
 $lang["customers_stats_info"] = "Statistika";
 $lang["customers_successful_adding"] = "Uspješno ste dodali kupca";

application/language/bs-BA/employees_lang.php

@@ -1,8 +1,7 @@
-<?php 
-
+<?php
 $lang["employees_administrator"] = "";
 $lang["employees_basic_information"] = "Informacije";
-$lang["employees_cannot_be_deleted"] = "Nije moguće izbrisati odabrane zaposlenike, jedan ili više njih su obradili prodaju ili pokušavate izbrisati svoj nalog.)";
+$lang["employees_cannot_be_deleted"] = "Nije moguće izbrisati odabrane zaposlenike, jedan ili više njih su obradili prodaju ili pokušavate izbrisati svoj nalog.";
 $lang["employees_change_employee"] = "";
 $lang["employees_change_password"] = "Promijeni lozinku";
 $lang["employees_clerk"] = "";
@@ -12,25 +11,25 @@ $lang["employees_confirm_restore"] = "Da li ste sigurni da želite da vratite iz
 $lang["employees_current_password"] = "Trenutna lozinka";
 $lang["employees_current_password_invalid"] = "Trenutna lozinka je nevažeća.";
 $lang["employees_employee"] = "Zaposlenik";
-$lang["employees_error_adding_updating"] = "Greška kod dodavanja/ažuriranja zaposlenika";
-$lang["employees_error_deleting_demo_admin"] = "Ne možete izbrisati demo admin korisnika";
-$lang["employees_error_updating_demo_admin"] = "Ne možete promijeniti demo admin korisnika";
+$lang["employees_error_adding_updating"] = "Dodavanje ili ažuriranje zaposlenika nije uspjelo.";
+$lang["employees_error_deleting_demo_admin"] = "Ne možete izbrisati demo korisnika administratora.";
+$lang["employees_error_updating_demo_admin"] = "Ne možete promijeniti korisnika demo administratora.";
 $lang["employees_language"] = "Jezik";
 $lang["employees_login_info"] = "Prijava";
 $lang["employees_manager"] = "";
 $lang["employees_new"] = "Novi zaposlenik";
-$lang["employees_none_selected"] = "Nije izabran nijedan zaposlenik za brisanje";
+$lang["employees_none_selected"] = "Nije izabran nijedan zaposlenik za brisanje.";
 $lang["employees_one_or_multiple"] = "Zaposlenici";
 $lang["employees_password"] = "Lozinka";
-$lang["employees_password_minlength"] = "Lozinka mora imati najmanje 8 znakova";
-$lang["employees_password_must_match"] = "Lozinka se ne podudara";
+$lang["employees_password_minlength"] = "Lozinka mora imati najmanje 8 znakova.";
+$lang["employees_password_must_match"] = "Lozinke se ne podudaraju.";
 $lang["employees_password_not_must_match"] = "Trenutna lozinka i nova lozinka moraju biti jedinstvene.";
-$lang["employees_password_required"] = "Lozinka je obavezna";
-$lang["employees_permission_desc"] = "Odaberite module za dozvolu";
+$lang["employees_password_required"] = "Lozinka je obavezna.";
+$lang["employees_permission_desc"] = "Označite polja u nastavku da biste odobrili pristup modulima.";
 $lang["employees_permission_info"] = "Dozvole";
 $lang["employees_repeat_password"] = "Ponovite lozinku";
-$lang["employees_subpermission_required"] = "Dodajte barem jedno odobrenje po modulu";
-$lang["employees_successful_adding"] = "Uspješno ste dodali zaposlenika";
+$lang["employees_subpermission_required"] = "Dodajte najmanje jedno odobrenje za svaki modul.";
+$lang["employees_successful_adding"] = "Uspješno ste dodali zaposlenika.";
 $lang["employees_successful_change_password"] = "Promjena lozinke je uspješna.";
 $lang["employees_successful_deleted"] = "Uspješno ste izbrisali zaposlenika";
 $lang["employees_successful_updating"] = "Uspješno ste ažurirali zaposlenika";
@@ -38,6 +37,6 @@ $lang["employees_system_language"] = "Sistemski jezik";
 $lang["employees_unsuccessful_change_password"] = "Promjena lozinke nije uspjela.";
 $lang["employees_update"] = "Ažuriraj zaposlenika";
 $lang["employees_username"] = "Korisničko ime";
-$lang["employees_username_duplicate"] = "";
-$lang["employees_username_minlength"] = "Korisničko ime mora imati najmanje 5 znakova";
-$lang["employees_username_required"] = "Korisničko ime je obavezno polje";
+$lang["employees_username_duplicate"] = "Korisničko ime zaposlenog je već u upotrebi. Molimo izaberite drugo.";
+$lang["employees_username_minlength"] = "Korisničko ime mora imati najmanje 5 znakova.";
+$lang["employees_username_required"] = "Korisničko ime je obavezno polje.";

application/language/bs-BA/enum_lang.php

@@ -1,9 +1,8 @@
-<?php 
-
-$lang["enum_half_down"] = "Half Down";
-$lang["enum_half_even"] = "Half Even";
-$lang["enum_half_five"] = "Half Five";
-$lang["enum_half_odd"] = "Half Odd";
-$lang["enum_half_up"] = "Half Up";
-$lang["enum_round_down"] = "Round Down";
-$lang["enum_round_up"] = "Round Up";
+<?php
+$lang["enum_half_down"] = "Pola dolje";
+$lang["enum_half_even"] = "Pola ravnomjerno";
+$lang["enum_half_five"] = "Pola na pet";
+$lang["enum_half_odd"] = "Pola neparno";
+$lang["enum_half_up"] = "Pola gore";
+$lang["enum_round_down"] = "Zaokruži naniže";
+$lang["enum_round_up"] = "Zaokruži naviše";

application/language/bs-BA/expenses_lang.php

@@ -1,5 +1,4 @@
-<?php 
-
+<?php
 $lang["expenses_add_item"] = "Dodaj trošak";
 $lang["expenses_amount"] = "Iznos";
 $lang["expenses_amount_number"] = "Iznos mora biti broj";
@@ -12,8 +11,8 @@ $lang["expenses_categories_name"] = "Kategorija";
 $lang["expenses_category_required"] = "kategorija je obavezno polje";
 $lang["expenses_check"] = "Ček";
 $lang["expenses_check_filter"] = "Ček";
-$lang["expenses_confirm_delete"] = "Da li ste sigurni da želite da izbrišete izabrani trošak?";
-$lang["expenses_confirm_restore"] = "Da li ste sigurni da želite da vratite izabrani trošak?";
+$lang["expenses_confirm_delete"] = "Da li ste sigurni da želite da izbrišete izabrane troškove?";
+$lang["expenses_confirm_restore"] = "Da li ste sigurni da želite da vratite izabrane troškove?";
 $lang["expenses_credit"] = "Kreditna kartica";
 $lang["expenses_credit_filter"] = "Kreditna kartica";
 $lang["expenses_date"] = "Datum";

application/language/bs-BA/giftcards_lang.php

@@ -1,70 +1,69 @@
-<?php 
-
-$lang["giftcards_add_minus"] = "Zalihu dodati ili oduzeti";
+<?php
+$lang["giftcards_add_minus"] = "Zaliha za dodavanje ili oduzimanje.";
 $lang["giftcards_allow_alt_description"] = "Dozvoli Alt opis";
 $lang["giftcards_bulk_edit"] = "Skupno uređivanje";
-$lang["giftcards_cannot_be_deleted"] = "Nije moguće izbrisati poklon bon, jedan ili više poklon bonova ima prodaju.";
-$lang["giftcards_cannot_find_giftcard"] = "Ne možemo pronaći informacije o poklon bonu";
-$lang["giftcards_cannot_use"] = "Poklon bon %1 se ne može koristiti za ovu prodaju. Nevažeći kupac!";
+$lang["giftcards_cannot_be_deleted"] = "Nije moguće izbrisati poklon karticu, jedna ili više poklon kartica ima prodaju.";
+$lang["giftcards_cannot_find_giftcard"] = "Poklon kartica nije pronađena.";
+$lang["giftcards_cannot_use"] = "Poklon kartica %1 se ne može koristiti za ovu prodaju: nevažeći kupac.";
 $lang["giftcards_card_value"] = "Vrijednost";
 $lang["giftcards_category"] = "Kategorija";
-$lang["giftcards_change_all_to_allow_alt_desc"] = "Dozvoli Alt opis za sve";
-$lang["giftcards_change_all_to_not_allow_allow_desc"] = "Nije dozvoljen Alt opis za sve";
+$lang["giftcards_change_all_to_allow_alt_desc"] = "Dozvoli alternativni opis za sve.";
+$lang["giftcards_change_all_to_not_allow_allow_desc"] = "Nije dozvoljen alternativni opis za sve.";
 $lang["giftcards_change_all_to_serialized"] = "Promijeni sve u serijalizovano";
-$lang["giftcards_change_all_to_unserialized"] = "Promijeni sve u neserializovano";
-$lang["giftcards_confirm_bulk_edit"] = "Da li ste sigurni da želite da uredite sve izabrane poklon bonove?";
-$lang["giftcards_confirm_delete"] = "Da li ste sigurni da želite da izbrišete izabrani poklon bon?";
-$lang["giftcards_confirm_restore"] = "Da li ste sigurni da želite da vratite izabrane poklon bonove?";
-$lang["giftcards_cost_price"] = "FC";
+$lang["giftcards_change_all_to_unserialized"] = "Promijeni sve u neserijalizovano";
+$lang["giftcards_confirm_bulk_edit"] = "Da li ste sigurni da želite da uredite izabranu poklon karticu(e)?";
+$lang["giftcards_confirm_delete"] = "Da li ste sigurni da želite da izbrišete izabranu poklon karticu(e)?";
+$lang["giftcards_confirm_restore"] = "Da li ste sigurni da želite da vratite izabranu poklon karticu(e)?";
+$lang["giftcards_cost_price"] = "Fakturna cijena";
 $lang["giftcards_count"] = "Ažuriraj zalihu";
-$lang["giftcards_csv_import_failed"] = "Greška kod CSV uvoza";
+$lang["giftcards_csv_import_failed"] = "CSV uvoz nije uspio.";
 $lang["giftcards_current_quantity"] = "Trenutna količina";
 $lang["giftcards_description"] = "Opis";
 $lang["giftcards_details_count"] = "Detalji o popisu zaliha";
 $lang["giftcards_do_nothing"] = "Ne radi ništa";
-$lang["giftcards_edit_fields_you_want_to_update"] = "Uredi polja za sve izabrane poklon bonove";
-$lang["giftcards_edit_multiple_giftcards"] = "Uređivanje više poklon bonova";
-$lang["giftcards_error_adding_updating"] = "Dodavanje/ažuriranje poklon bona nije uspjelo";
-$lang["giftcards_error_updating_multiple"] = "Ažuriranje poklon bonova nije uspjelo";
+$lang["giftcards_edit_fields_you_want_to_update"] = "Uredite polja za izabrane poklon kartice.";
+$lang["giftcards_edit_multiple_giftcards"] = "Uređivanje više poklon kartica.";
+$lang["giftcards_error_adding_updating"] = "Dodavanje ili ažuriranje poklon kartice nije uspjelo.";
+$lang["giftcards_error_updating_multiple"] = "Ažuriranje poklon kartice(a) nije uspjelo.";
 $lang["giftcards_generate_barcodes"] = "Generiši barkod";
-$lang["giftcards_giftcard"] = "Poklon bon";
-$lang["giftcards_giftcard_number"] = "Broj poklon bona";
+$lang["giftcards_giftcard"] = "Poklon kartica";
+$lang["giftcards_giftcard_number"] = "Broj poklon kartice";
 $lang["giftcards_info_provided_by"] = "Informacije pruža";
 $lang["giftcards_inventory_comments"] = "Komentari";
-$lang["giftcards_is_serialized"] = "Poklon bon ima serijski broj";
-$lang["giftcards_low_inventory_giftcards"] = "Niska zaliha poklon bonova";
+$lang["giftcards_is_serialized"] = "Poklon kartica ima serijski broj";
+$lang["giftcards_low_inventory_giftcards"] = "Poklon kartice niske zalihe";
 $lang["giftcards_manually_editing_of_quantity"] = "Ručna promjena količine";
-$lang["giftcards_must_select_giftcard_for_barcode"] = "Morate izabrati bar jedan poklon bon da generišete barkod";
-$lang["giftcards_new"] = "Novi poklon bon";
-$lang["giftcards_no_description_giftcards"] = "Poklon bon nema opisa";
-$lang["giftcards_no_giftcards_to_display"] = "Nema poklon bona za prikaz";
+$lang["giftcards_must_select_giftcard_for_barcode"] = "Morate izabrati najmanje jednu (1) poklon karticu za generisanje bar kodova.";
+$lang["giftcards_new"] = "Nova poklon kartica";
+$lang["giftcards_no_description_giftcards"] = "Poklon kartica nema opisa";
+$lang["giftcards_no_giftcards_to_display"] = "Nema poklon kartica za prikaz.";
 $lang["giftcards_none"] = "Ništa";
-$lang["giftcards_none_selected"] = "Nijedan poklon bon nije izabran za uređivanje";
-$lang["giftcards_number"] = "Broj poklon bona mora biti broj";
-$lang["giftcards_number_information"] = "Broj poklon bona";
-$lang["giftcards_number_required"] = "Broj poklon bona je obavezan";
-$lang["giftcards_one_or_multiple"] = "Poklon bonovi";
+$lang["giftcards_none_selected"] = "Nijedna poklon kartica nije izabrana za uređivanje.";
+$lang["giftcards_number"] = "Broj poklon kartice mora biti broj.";
+$lang["giftcards_number_information"] = "Broj poklon kartice";
+$lang["giftcards_number_required"] = "Broj poklon kartice je obavezno polje.";
+$lang["giftcards_one_or_multiple"] = "Poklon kartica(e)";
 $lang["giftcards_person_id"] = "Kupac";
 $lang["giftcards_quantity"] = "Količina";
-$lang["giftcards_quantity_required"] = "Količina je obavezno polje. Zatvorite (X) da biste odustali";
-$lang["giftcards_remaining_balance"] = "Na poklon bonu %1 ostala je još vrijednost %2!";
+$lang["giftcards_quantity_required"] = "Količina je obavezno polje. Zatvorite (X) da biste odustali.";
+$lang["giftcards_remaining_balance"] = "Na poklon kartici %1 ostala je još vrijednost %2!";
 $lang["giftcards_reorder_level"] = "Nivo narudžbe";
-$lang["giftcards_retrive_giftcard_info"] = "Preuzmi informacije o poklon bonu";
+$lang["giftcards_retrive_giftcard_info"] = "Preuzmi informacije o poklon kartici";
 $lang["giftcards_sales_tax_1"] = "Prodajni porez 1";
 $lang["giftcards_sales_tax_2"] = "Prodajni porez 2";
-$lang["giftcards_serialized_giftcards"] = "Serijalizovani poklon bonovi";
-$lang["giftcards_successful_adding"] = "Uspješno ste dodali poklon bon";
-$lang["giftcards_successful_bulk_edit"] = "Uspješno ste ažurirali izabrane poklon bonove";
-$lang["giftcards_successful_deleted"] = "Uspješno ste izbrisali poklon bon";
-$lang["giftcards_successful_updating"] = "Uspješno ste ažurirali poklon bon";
+$lang["giftcards_serialized_giftcards"] = "Serijalizovane poklon kartice";
+$lang["giftcards_successful_adding"] = "Uspješno ste dodali poklon karticu";
+$lang["giftcards_successful_bulk_edit"] = "Uspješno ste ažurirali izabranu poklon karticu(e)";
+$lang["giftcards_successful_deleted"] = "Uspješno ste izbrisali poklon karticu";
+$lang["giftcards_successful_updating"] = "Uspješno ste ažurirali poklon karticu";
 $lang["giftcards_supplier"] = "Dobavljač";
 $lang["giftcards_tax_1"] = "Porez 1";
 $lang["giftcards_tax_2"] = "Porez 2";
 $lang["giftcards_tax_percent"] = "% poreza";
 $lang["giftcards_tax_percents"] = "% poreza";
-$lang["giftcards_unit_price"] = "MPC";
+$lang["giftcards_unit_price"] = "Maloprodajna cijena";
 $lang["giftcards_upc_database"] = "Barkod tablica";
-$lang["giftcards_update"] = "Ažurirajte poklon bon";
+$lang["giftcards_update"] = "Ažurirajte poklon karticu";
 $lang["giftcards_use_inventory_menu"] = "Koristite meni zalihe";
-$lang["giftcards_value"] = "Vrijednost poklon bona mora biti broj";
-$lang["giftcards_value_required"] = "Vrijednost poklon bona je obavezno polje";
+$lang["giftcards_value"] = "Vrijednost poklon kartice mora biti broj.";
+$lang["giftcards_value_required"] = "Vrijednost poklon kartice je obavezno polje.";

application/language/bs-BA/item_kits_lang.php

@@ -1,16 +1,15 @@
-<?php 
-
+<?php
 $lang["item_kits_add_item"] = "Dodaj artikal";
 $lang["item_kits_all"] = "Sve";
-$lang["item_kits_cannot_be_deleted"] = "Brisanje kompleta nije uspjelo";
-$lang["item_kits_confirm_delete"] = "Da li ste sigurni da želite izbrisati izabrani komplet predmeta";
-$lang["item_kits_confirm_restore"] = "Da li ste sigurni da želite povratiti komplet";
+$lang["item_kits_cannot_be_deleted"] = "Brisanje kompleta artikala nije uspjelo.";
+$lang["item_kits_confirm_delete"] = "Da li ste sigurni da želite izbrisati izabrani komplet artikala?";
+$lang["item_kits_confirm_restore"] = "Da li ste sigurni da želite da vratite izabrane komplete stavki?";
 $lang["item_kits_description"] = "Opis kompleta";
 $lang["item_kits_discount"] = "Popust";
 $lang["item_kits_discount_fixed"] = "Fiksni popust";
 $lang["item_kits_discount_percent"] = "Procenat popusta";
 $lang["item_kits_discount_type"] = "Vrsta popusta";
-$lang["item_kits_error_adding_updating"] = "Dodavanje ili ažuriranje kompleta predmeta nije uspjelo";
+$lang["item_kits_error_adding_updating"] = "Dodavanje ili ažuriranje kompleta artikala nije uspjelo.";
 $lang["item_kits_find_kit_item"] = "Stavka kompleta";
 $lang["item_kits_info"] = "Informacije o kompletu";
 $lang["item_kits_item"] = "Artikal";
@@ -25,8 +24,8 @@ $lang["item_kits_kit_and_stock"] = "Komplet i zaliha";
 $lang["item_kits_kit_only"] = "Samo komplet";
 $lang["item_kits_name"] = "Naziv kompleta";
 $lang["item_kits_new"] = "Novi komplet";
-$lang["item_kits_no_item_kits_to_display"] = "Nema kompleta za prikaz";
-$lang["item_kits_none_selected"] = "Niste odabrali nijedan komplet";
+$lang["item_kits_no_item_kits_to_display"] = "Nema kompleta artikala za prikaz.";
+$lang["item_kits_none_selected"] = "Niste odabrali nijedan komplet artikala.";
 $lang["item_kits_one_or_multiple"] = "Stavka(e) kompleta";
 $lang["item_kits_price_option"] = "Opcija cijene";
 $lang["item_kits_priced_only"] = "Samo po cijeni";

application/language/bs-BA/items_lang.php

@@ -1,40 +1,39 @@
-<?php 
-
-$lang["items_add_minus"] = "Zaliha za dodavanje ili oduzimanje";
+<?php
+$lang["items_add_minus"] = "Zaliha za dodavanje ili oduzimanje.";
 $lang["items_allow_alt_description"] = "Dozvoli Alt opis";
 $lang["items_amount_entry"] = "Unos iznosa";
 $lang["items_bulk_edit"] = "Skupno uređivanje";
-$lang["items_buy_price_required"] = "MPC je obavezno polje";
+$lang["items_buy_price_required"] = "Nabavna cijena je obavezno polje.";
 $lang["items_cannot_be_deleted"] = "Nije moguće izbrisati izabrane artikle, jedan ili više izabranih predmeta imaju prodaju.";
-$lang["items_cannot_find_item"] = "Nema informacije o izabranoj stavci";
+$lang["items_cannot_find_item"] = "Artikal nije pronađen.";
 $lang["items_categories"] = "";
 $lang["items_category"] = "Kategorija";
 $lang["items_category_new"] = "";
-$lang["items_category_required"] = "Kategorija je obavezno polje";
-$lang["items_change_all_to_allow_alt_desc"] = "Dozvoli Alt opis za sve";
-$lang["items_change_all_to_not_allow_allow_desc"] = "Nije dozvoljen Alt opis za sve";
+$lang["items_category_required"] = "Kategorija je obavezno polje.";
+$lang["items_change_all_to_allow_alt_desc"] = "Dozvoli alternativni opis za sve.";
+$lang["items_change_all_to_not_allow_allow_desc"] = "Ne dozvoli alternativni opis za sve.";
 $lang["items_change_all_to_serialized"] = "Promijeni sve u seriju";
 $lang["items_change_all_to_unserialized"] = "Promijenite sve u ne seriju";
 $lang["items_change_image"] = "Promijeni sliku";
 $lang["items_confirm_bulk_edit"] = "Da li ste sigurni da želite urediti izabrane artikle?";
-$lang["items_confirm_bulk_edit_wipe_taxes"] = "Sve informacije o porezu na artikal biće zamjenjene";
+$lang["items_confirm_bulk_edit_wipe_taxes"] = "Sve informacije o porezu na artikal biće zamjenjene.";
 $lang["items_confirm_delete"] = "Da li ste sigurni da želite izbrisati izabrani artikal?";
 $lang["items_confirm_restore"] = "Da li ste sigurni da želite da vratite izabrani artikal?";
-$lang["items_cost_price"] = "FC";
-$lang["items_cost_price_number"] = "FC mora biti broj";
-$lang["items_cost_price_required"] = "FC je obavezno polje";
+$lang["items_cost_price"] = "Fakturna cijena";
+$lang["items_cost_price_number"] = "Fakturna cijena mora biti broj.";
+$lang["items_cost_price_required"] = "Fakturna cijena je obavezno polje.";
 $lang["items_count"] = "Ažuriraj zalihu";
 $lang["items_csv_import_failed"] = "Uvoz CSV-a nije uspio";
-$lang["items_csv_import_nodata_wrongformat"] = "Vaša učitana datoteka nema podataka ili je pogrešnog formata";
-$lang["items_csv_import_partially_failed"] = "Uvezena je većina artikala. Ali neki nisu, evo liste";
-$lang["items_csv_import_success"] = "Uvoz artikla je uspješan";
+$lang["items_csv_import_nodata_wrongformat"] = "Učitana CSV datoteka nema podatke ili je pogrešno formatirana.";
+$lang["items_csv_import_partially_failed"] = "Bilo je %1 grešaka pri uvozu stavke na liniji: %2. Nijedan red nije uvezen.";
+$lang["items_csv_import_success"] = "Uvoz CSV stavke je uspješan.";
 $lang["items_current_quantity"] = "Trenutna količina";
 $lang["items_default_pack_name"] = "Svaki";
 $lang["items_description"] = "Opis";
 $lang["items_details_count"] = "Detalji o količinama zalihe";
 $lang["items_do_nothing"] = "Ne radi ništa";
 $lang["items_edit"] = "";
-$lang["items_edit_fields_you_want_to_update"] = "Uredite polja koja želite da uredite za sve izabrane artikle";
+$lang["items_edit_fields_you_want_to_update"] = "Uredite željena polja za odabrane artikle.";
 $lang["items_edit_multiple_items"] = "Uređivanje više artikala";
 $lang["items_empty_upc_items"] = "Artikli sa praznim barkodom";
 $lang["items_error_adding_updating"] = "Greška pri dodavanju / ažuriranju artikla";
@@ -58,34 +57,34 @@ $lang["items_is_serialized"] = "Artikal ima ser. broj";
 $lang["items_item"] = "Artikal";
 $lang["items_item_id"] = "";
 $lang["items_item_number"] = "Barkod";
-$lang["items_item_number_duplicate"] = "Broj artikla već postoji u bazi podataka";
-$lang["items_kit"] = "Garnitura";
+$lang["items_item_number_duplicate"] = "Broj artikla već postoji u bazi podataka.";
+$lang["items_kit"] = "Komplet";
 $lang["items_location"] = "Mjesto";
 $lang["items_low_inventory_items"] = "Prodaja artikala";
 $lang["items_low_sell_item"] = "Niska prodaja artikla";
 $lang["items_manually_editing_of_quantity"] = "Ručno uređivanje količine";
 $lang["items_markup"] = "";
 $lang["items_name"] = "Naziv artikla";
-$lang["items_name_required"] = "Naziv artikla je obavezno polje";
+$lang["items_name_required"] = "Naziv artikla je obavezno polje.";
 $lang["items_new"] = "Novi artikal";
 $lang["items_no_description_items"] = "Artikal nema opisa";
-$lang["items_no_items_to_display"] = "Nema artikla za prikaz";
+$lang["items_no_items_to_display"] = "Nema artikala za prikaz.";
 $lang["items_none"] = "Nijedan";
 $lang["items_none_selected"] = "Niste odabrali nijedan artikal za uređivanje";
 $lang["items_nonstock"] = "Bez zaliha";
 $lang["items_number_information"] = "Redni broj";
-$lang["items_number_required"] = "Barkod je obavezno polje";
+$lang["items_number_required"] = "Barkod je obavezno polje.";
 $lang["items_one_or_multiple"] = "artikal(i)";
 $lang["items_pack_name"] = "Naziv pakovanja";
 $lang["items_qty_per_pack"] = "Količina po pakovanju";
 $lang["items_quantity"] = "Količina";
-$lang["items_quantity_number"] = "Količina mora biti broj";
+$lang["items_quantity_number"] = "Količina mora biti broj.";
 $lang["items_quantity_required"] = "Količina je obavezno polje.";
 $lang["items_receiving_quantity"] = "Zaprimljena količina";
 $lang["items_remove_image"] = "Ukloni sliku";
 $lang["items_reorder_level"] = "Minimalna zaliha";
-$lang["items_reorder_level_number"] = "Nivo preuređivanja mora biti broj";
-$lang["items_reorder_level_required"] = "Nivo preuređivanja je obavezno polje";
+$lang["items_reorder_level_number"] = "Nivo preuređivanja mora biti broj.";
+$lang["items_reorder_level_required"] = "Nivo preuređivanja je obavezno polje.";
 $lang["items_retrive_item_info"] = "Preuzmi informacije o artiklu";
 $lang["items_sales_tax_1"] = "Prodajni porez";
 $lang["items_sales_tax_2"] = "Prodajni porez 2";
@@ -107,13 +106,13 @@ $lang["items_tax_3"] = "";
 $lang["items_tax_category"] = "Kategorija poreza";
 $lang["items_tax_percent"] = "Procenat poreza";
 $lang["items_tax_percent_number"] = "Procenat poreza mora biti numerička vrijednost";
-$lang["items_tax_percent_required"] = "Procenat poreza je obavezno polje";
+$lang["items_tax_percent_required"] = "Procenat poreza je obavezno polje.";
 $lang["items_tax_percents"] = "Porez %";
 $lang["items_temp"] = "Privremeno";
 $lang["items_type"] = "Vrsta artikla";
-$lang["items_unit_price"] = "MPC";
-$lang["items_unit_price_number"] = "MPC mora biti broj";
-$lang["items_unit_price_required"] = "MPC je obavezno polje";
+$lang["items_unit_price"] = "Maloprodajna cijena";
+$lang["items_unit_price_number"] = "Jedinična cijena mora biti broj.";
+$lang["items_unit_price_required"] = "Maloprodajna cijena je obavezno polje.";
 $lang["items_upc_database"] = "Baza podataka bar-kodova";
 $lang["items_update"] = "Ažuriraj artikal";
 $lang["items_use_inventory_menu"] = "Koristite meni zalihe";

application/language/bs-BA/login_lang.php

@@ -1,13 +1,12 @@
-<?php 
-
+<?php
 $lang["login_gcaptcha"] = "Ja nisam robot.";
 $lang["login_go"] = "Idi";
-$lang["login_invalid_gcaptcha"] = "Pogrešno ja nisam robot.";
+$lang["login_invalid_gcaptcha"] = "Molimo potvrdite da niste robot.";
 $lang["login_invalid_installation"] = "Instalacija nije ispravna, provjerite vašu php.ini datoteku.";
-$lang["login_invalid_username_and_password"] = "Pogrešno korisničko ime ili lozinka";
+$lang["login_invalid_username_and_password"] = "Pogrešno korisničko ime i/ili lozinka.";
 $lang["login_login"] = "Prijava";
-$lang["login_logout"] = "";
-$lang["login_migration_needed"] = "";
+$lang["login_logout"] = "Odjava";
+$lang["login_migration_needed"] = "Migracija baze podataka na %1 će početi nakon prijavljivanja.";
 $lang["login_password"] = "Lozinka";
 $lang["login_username"] = "Korisničko ime";
-$lang["login_welcome"] = "";
+$lang["login_welcome"] = "Dobrodošli u %1!";

application/language/bs-BA/module_lang.php

@@ -1,46 +1,45 @@
-<?php 
-
+<?php
 $lang["module_admin_cashups"] = "";
 $lang["module_admin_cashups_desc"] = "";
 $lang["module_attributes"] = "Atributi";
-$lang["module_attributes_desc"] = "Dodajte, ažurirajte, izbrišite i pretražite atribute.";
+$lang["module_attributes_desc"] = "Dodavanje, ažuriranje, brisanje i pretraživanje atributa.";
 $lang["module_both"] = "Oba";
-$lang["module_cashups"] = "Isplate";
-$lang["module_cashups_desc"] = "Dodajte, ažurirajte, izbrišite i pretražite isplate.";
+$lang["module_cashups"] = "Gotovinsko plaćanje";
+$lang["module_cashups_desc"] = "Dodavanje, ažuriranje, brisanje i pretraživanje isplata.";
 $lang["module_config"] = "Podešavanja";
-$lang["module_config_desc"] = "Promijenite OSPOS-ovu konfiguraciju";
+$lang["module_config_desc"] = "Promijenite konfiguraciju OSPOS-a.";
 $lang["module_customers"] = "Kupci";
-$lang["module_customers_desc"] = "Dodajte, ažurirajte, izbrišite i pretražite kupce";
+$lang["module_customers_desc"] = "Dodavanje, ažuriranje, brisanje i pretraživanje kupaca.";
 $lang["module_employees"] = "Zaposleni";
-$lang["module_employees_desc"] = "Dodajte, ažurirajte, izbrišite i pretražite zaposlene";
+$lang["module_employees_desc"] = "Dodavanje, ažuriranje, brisanje i pretraživanje zaposlenih.";
 $lang["module_expenses"] = "Troškovi";
 $lang["module_expenses_categories"] = "Kategorije";
-$lang["module_expenses_categories_desc"] = "Dodajte, ažurirajte, izbrišite i pretražite kategorije.";
-$lang["module_expenses_desc"] = "Dodajte, ažurirajte, izbrišite i pretražite troškove.";
-$lang["module_giftcards"] = "Poklon bonovi";
-$lang["module_giftcards_desc"] = "Dodajte, ažurirajte, izbrišite i pretražite poklon bonove";
+$lang["module_expenses_categories_desc"] = "Dodavanje, ažuriranje, i brisanje kategorija.";
+$lang["module_expenses_desc"] = "Dodavanje, ažuriranje, brisanje i pretraživanje troškova.";
+$lang["module_giftcards"] = "Poklon kartice";
+$lang["module_giftcards_desc"] = "Dodavanje, ažuriranje, brisanje i pretraživanje poklon kartica.";
 $lang["module_home"] = "Početna";
-$lang["module_home_desc"] = "Lista modula početnog menija";
+$lang["module_home_desc"] = "Lista modula početnog menija.";
 $lang["module_item_kits"] = "Kompleti artikala";
-$lang["module_item_kits_desc"] = "Dodajte, ažurirajte, izbrišite ili pretražite komplete artikala";
+$lang["module_item_kits_desc"] = "Dodavanje, ažuriranje, brisanje i pretraživanje kompleta artikala.";
 $lang["module_items"] = "Artikli";
-$lang["module_items_desc"] = "Dodajte, ažurirajte, izbrišite ili pretražite artikle";
+$lang["module_items_desc"] = "Dodavanje, ažuriranje, brisanje i pretraživanje artikala.";
 $lang["module_messages"] = "Poruke";
-$lang["module_messages_desc"] = "Šaljite poruke kupcima, dobavljačima i zaposlenima.";
+$lang["module_messages_desc"] = "Slanje poruka kupcima, dobavljačima i zaposlenima.";
 $lang["module_migrate"] = "Migracija";
-$lang["module_migrate_desc"] = "Ažurirajte OSPOS bazu podataka";
+$lang["module_migrate_desc"] = "Ažurirajte OSPOS bazu podataka.";
 $lang["module_office"] = "Administracija";
-$lang["module_office_desc"] = "Lista modula kancelarijskog menija";
+$lang["module_office_desc"] = "Lista modula kancelarijskog menija.";
 $lang["module_receivings"] = "Ulazi";
-$lang["module_receivings_desc"] = "Obrada narudžbenice";
+$lang["module_receivings_desc"] = "Obrada narudžbenica.";
 $lang["module_reports"] = "Izvještaji";
-$lang["module_reports_desc"] = "Pogledajte i generišite izvještaje";
+$lang["module_reports_desc"] = "Pogledajte i generišite izvještaje.";
 $lang["module_sales"] = "Prodaja";
-$lang["module_sales_desc"] = "Obrada prodaje i povrata";
+$lang["module_sales_desc"] = "Obrada prodaje i povrata.";
 $lang["module_suppliers"] = "Dobavljači";
-$lang["module_suppliers_desc"] = "Dodajte, ažurirajte, izbrišite ili pretražite dobavljače";
+$lang["module_suppliers_desc"] = "Dodajte, ažurirajte, izbrišite i pretražite dobavljače.";
 $lang["module_taxes"] = "Porezi";
-$lang["module_taxes_desc"] = "Konfigurišite poreze na promet";
+$lang["module_taxes_desc"] = "Konfigurišite poreze na promet.";
 $lang["module_timeclocks"] = "";
 $lang["module_timeclocks_categories"] = "";
 $lang["module_timeclocks_categories_desc"] = "";

application/language/bs-BA/receivings_lang.php

@@ -1,8 +1,7 @@
-<?php 
-
+<?php
 $lang["receivings_amount_due"] = "";
 $lang["receivings_cancel_receiving"] = "Otkaži";
-$lang["receivings_cannot_be_deleted"] = "Ulaz(i) ne mogu biti Izbrisani";
+$lang["receivings_cannot_be_deleted"] = "Ulaz(i) ne mogu biti Izbrisani.";
 $lang["receivings_comments"] = "Komentar";
 $lang["receivings_complete_receiving"] = "Završi";
 $lang["receivings_confirm_cancel_receiving"] = "Da li ste sigurni da želite da izbrišete ovaj prijem? Sve stavke će biti izbrisane.";
@@ -12,15 +11,15 @@ $lang["receivings_confirm_restore"] = "";
 $lang["receivings_cost"] = "Trošak";
 $lang["receivings_daily"] = "";
 $lang["receivings_date"] = "Datum";
-$lang["receivings_date_required"] = "Mora se unijeti ispravan datum";
-$lang["receivings_date_type"] = "Datum je obavezno polje";
+$lang["receivings_date_required"] = "Mora se unijeti ispravan datum.";
+$lang["receivings_date_type"] = "Datum je obavezno polje.";
 $lang["receivings_delete_entire_sale"] = "Izbriši cijelu prodaju";
 $lang["receivings_discount"] = "Popust";
 $lang["receivings_edit"] = "Uredi";
 $lang["receivings_edit_sale"] = "Uređivanje ulaza";
 $lang["receivings_employee"] = "Zaposleni";
-$lang["receivings_error_editing_item"] = "Uređivanje stavke nije uspjelo";
-$lang["receivings_error_requisition"] = "Nije moguće premjestiti zalihu sa ili na istu lokaciju skladišta";
+$lang["receivings_error_editing_item"] = "Uređivanje stavke nije uspjelo.";
+$lang["receivings_error_requisition"] = "Nije moguće premjestiti zalihu sa ili na istu lokaciju skladišta.";
 $lang["receivings_find_or_scan_item"] = "Pronađite ili skenirajte artikal";
 $lang["receivings_find_or_scan_item_or_receipt"] = "Pronađite ili skenirajte stavku ili račun";
 $lang["receivings_id"] = "ID prijema";
@@ -35,7 +34,7 @@ $lang["receivings_receipt_number"] = "Ulazni račun #";
 $lang["receivings_receiving"] = "Ulaz";
 $lang["receivings_reference"] = "Referenca";
 $lang["receivings_register"] = "Stavke ulaza";
-$lang["receivings_requisition"] = "Trebovanje.";
+$lang["receivings_requisition"] = "Trebovanje";
 $lang["receivings_return"] = "Povrat";
 $lang["receivings_select_supplier"] = "Izaberite dobavljača (neobavezno)";
 $lang["receivings_ship_pack"] = "Otpremanje pakovanja";
@@ -51,7 +50,7 @@ $lang["receivings_supplier_address"] = "Adresa";
 $lang["receivings_supplier_email"] = "E-mail";
 $lang["receivings_supplier_location"] = "Mjesto";
 $lang["receivings_total"] = "Ukupno";
-$lang["receivings_transaction_failed"] = "Transakcija prijema nije uspjela";
-$lang["receivings_unable_to_add_item"] = "Dodavanje stavke u prijem nije uspjelo";
-$lang["receivings_unsuccessfully_updated"] = "Ažuriranje ulaza nije uspjelo";
+$lang["receivings_transaction_failed"] = "Transakcija(e) prijema nije uspela.";
+$lang["receivings_unable_to_add_item"] = "Dodavanje stavke u prijem nije uspelo.";
+$lang["receivings_unsuccessfully_updated"] = "Ažuriranje ulaza nije uspjelo.";
 $lang["receivings_update"] = "Ažuriraj";

application/language/bs-BA/reports_lang.php

@@ -1,5 +1,4 @@
-<?php 
-
+<?php
 $lang["reports_all"] = "Svi";
 $lang["reports_authority"] = "Ovlašćenja";
 $lang["reports_canceled"] = "Otkazano";
@@ -19,8 +18,8 @@ $lang["reports_complete"] = "Završena prodaja i povrat";
 $lang["reports_completed_sales"] = "Kompletirana prodaja";
 $lang["reports_confirm_delete"] = "Da li ste sigurni da želite da izbrišete izabrani unos?";
 $lang["reports_confirm_restore"] = "Da li ste sigurni da želite da vratite izabrani unos?";
-$lang["reports_cost"] = "Trošak";
-$lang["reports_cost_price"] = "FC";
+$lang["reports_cost"] = "Cijena";
+$lang["reports_cost_price"] = "Fakturna cijena";
 $lang["reports_count"] = "Broj";
 $lang["reports_customer"] = "Kupac";
 $lang["reports_customers"] = "Kupci";
@@ -73,7 +72,7 @@ $lang["reports_low_inventory_report"] = "Izvještaj niske zalihe";
 $lang["reports_low_sell_quantity"] = "Niska prodaja";
 $lang["reports_more_than_zero"] = "Više od nule";
 $lang["reports_name"] = "Naziv";
-$lang["reports_no_reports_to_display"] = "Nema artikala za prikaz";
+$lang["reports_no_reports_to_display"] = "Nema artikala za prikaz.";
 $lang["reports_payment_type"] = "Tip plaćanja";
 $lang["reports_payments"] = "Plaćanja";
 $lang["reports_payments_summary_report"] = "Zbirni izvještaj plaćanja";
@@ -115,33 +114,33 @@ $lang["reports_sold_to"] = "Prodano";
 $lang["reports_stock_location"] = "Lokacija skladišta";
 $lang["reports_sub_total_value"] = "Međuzbir";
 $lang["reports_subtotal"] = "Međuzbir";
-$lang["reports_summary_reports"] = "Zbirni izvještaj";
+$lang["reports_summary_reports"] = "Zbirni izvještaji";
 $lang["reports_supplied_by"] = "Nabavljeno od";
 $lang["reports_supplier"] = "Dobavljač";
 $lang["reports_suppliers"] = "Dobavljači";
 $lang["reports_suppliers_summary_report"] = "Zbirni izvještaj po dobavljačima";
 $lang["reports_tax"] = "Porez";
 $lang["reports_tax_category"] = "Kategorija poreza";
-$lang["reports_tax_name"] = "";
+$lang["reports_tax_name"] = "Naziv poreza";
 $lang["reports_tax_percent"] = "Procenat poreza";
 $lang["reports_tax_rate"] = "Poreska stopa";
 $lang["reports_taxes"] = "Porezi";
 $lang["reports_taxes_summary_report"] = "Zbirni izvještaj poreza";
 $lang["reports_total"] = "Ukupno";
 $lang["reports_total_inventory_value"] = "Ukupan iznos zalihe";
-$lang["reports_total_low_sell_quantity"] = "Ukupna količina niskih prodaja";
+$lang["reports_total_low_sell_quantity"] = "Ukupno količina niskih prodaja";
 $lang["reports_total_quantity"] = "Ukupna količina";
 $lang["reports_total_retail"] = "Ukupna vrijednost zalihe na malo";
 $lang["reports_trans_amount"] = "Iznos transakcije";
 $lang["reports_trans_due"] = "Dug";
-$lang["reports_trans_group"] = "Grpa transakcija";
+$lang["reports_trans_group"] = "Grupa transakcije";
 $lang["reports_trans_nopay_sales"] = "Prodaje bez plaćanja";
 $lang["reports_trans_payments"] = "Plaćanja";
 $lang["reports_trans_refunded"] = "Refundirano";
 $lang["reports_trans_sales"] = "Prodaja";
 $lang["reports_trans_type"] = "Tip transakcije";
 $lang["reports_type"] = "Tip";
-$lang["reports_unit_price"] = "MPC";
+$lang["reports_unit_price"] = "Maloprodajna cijena";
 $lang["reports_used"] = "Korišćeni poeni";
 $lang["reports_work_orders"] = "Radni nalozi";
 $lang["reports_zero_and_less"] = "Nula i manje";

application/language/bs-BA/sales_lang.php

@@ -1,6 +1,5 @@
-<?php 
-
-$lang["customers_available_points"] = "Dostupni bodovi";
+<?php
+$lang["customers_available_points"] = "Dostupni poeni";
 $lang["rewards_package"] = "Nagrade";
 $lang["rewards_remaining_balance"] = "Preostala vrijednost nagradnih bodova je ";
 $lang["sales_account_number"] = "Broj računa";
@@ -14,7 +13,7 @@ $lang["sales_cash_1"] = "";
 $lang["sales_cash_2"] = "";
 $lang["sales_cash_3"] = "";
 $lang["sales_cash_4"] = "";
-$lang["sales_cash_adjustment"] = "";
+$lang["sales_cash_adjustment"] = "Usklađivanje gotovine";
 $lang["sales_cash_deposit"] = "Polog gotovine";
 $lang["sales_cash_filter"] = "Gotovina";
 $lang["sales_change_due"] = "Kusur";
@@ -40,7 +39,7 @@ $lang["sales_customer_address"] = "Adresa kupca";
 $lang["sales_customer_discount"] = "Popust";
 $lang["sales_customer_email"] = "E-mail kupca";
 $lang["sales_customer_location"] = "Mjesto kupca";
-$lang["sales_customer_mailchimp_status"] = "Mailchimp status";
+$lang["sales_customer_mailchimp_status"] = "Status MailChimp-a";
 $lang["sales_customer_optional"] = "(Potrebno za odloženo plaćanje)";
 $lang["sales_customer_required"] = "Obavezno";
 $lang["sales_customer_total"] = "Ukupno";
@@ -48,15 +47,15 @@ $lang["sales_customer_total_spent"] = "";
 $lang["sales_daily_sales"] = "";
 $lang["sales_date"] = "Datum prodaje";
 $lang["sales_date_range"] = "Period";
-$lang["sales_date_required"] = "Morate unijeti ispravan datum";
-$lang["sales_date_type"] = "Datum je obavezno polje";
+$lang["sales_date_required"] = "Morate unijeti ispravan datum.";
+$lang["sales_date_type"] = "Datum je obavezno polje.";
 $lang["sales_debit"] = "Dugovna kartica";
 $lang["sales_debit_filter"] = "";
 $lang["sales_delete"] = "Dozvoli brisanje";
-$lang["sales_delete_confirmation"] = "Da li ste sigurni da želite da izbrišete ovu prodaju? Ova radnja se ne može opozvati?";
+$lang["sales_delete_confirmation"] = "Da li ste sigurni da želite da izbrišete ovu prodaju? Ova radnja se ne može opozvati.";
 $lang["sales_delete_entire_sale"] = "Izbriši cijelu prodaju";
-$lang["sales_delete_successful"] = "Prodaja izbrisana uspješna";
-$lang["sales_delete_unsuccessful"] = "Brisanje prodaje nije uspjelo";
+$lang["sales_delete_successful"] = "Prodaja je uspješno izbrisana.";
+$lang["sales_delete_unsuccessful"] = "Brisanje prodaje nije uspjelo.";
 $lang["sales_description_abbrv"] = "Opis";
 $lang["sales_discard"] = "Odbaci";
 $lang["sales_discard_quote"] = "";
@@ -74,10 +73,10 @@ $lang["sales_entry"] = "Ulaz";
 $lang["sales_error_editing_item"] = "Greška pri uređivanju artikla";
 $lang["sales_find_or_scan_item"] = "Pronađi/Skeniraj artikal";
 $lang["sales_find_or_scan_item_or_receipt"] = "Pronađi/Skeniraj artikal ili priznanicu";
-$lang["sales_giftcard"] = "Poklon bon";
-$lang["sales_giftcard_balance"] = "Saldo poklon bona";
+$lang["sales_giftcard"] = "Poklon kartica";
+$lang["sales_giftcard_balance"] = "Saldo poklon kartice";
 $lang["sales_giftcard_filter"] = "";
-$lang["sales_giftcard_number"] = "Broj poklon bona";
+$lang["sales_giftcard_number"] = "Broj poklon kartice";
 $lang["sales_group_by_category"] = "Grupiraj po kategoriji";
 $lang["sales_group_by_type"] = "Grupiraj po tipu";
 $lang["sales_hsn"] = "HSN";
@@ -87,9 +86,9 @@ $lang["sales_invoice"] = "Faktura";
 $lang["sales_invoice_confirm"] = "Ova faktura će biti poslata na";
 $lang["sales_invoice_enable"] = "Broj fakture";
 $lang["sales_invoice_filter"] = "Fakture";
-$lang["sales_invoice_no_email"] = "Kupac nema ispravan e-mail";
+$lang["sales_invoice_no_email"] = "Kupac nema važeću adresu e-pošte.";
 $lang["sales_invoice_number"] = "Broj fakture";
-$lang["sales_invoice_number_duplicate"] = "Broj fakture %1 mora biti jedinstven";
+$lang["sales_invoice_number_duplicate"] = "Broj fakture %1 mora biti jedinstven.";
 $lang["sales_invoice_sent"] = "Faktura poslata";
 $lang["sales_invoice_total"] = "Ukupan iznos fakture";
 $lang["sales_invoice_type_custom_invoice"] = "Prilagođena faktura (custom_invoice.php)";
@@ -98,10 +97,10 @@ $lang["sales_invoice_type_invoice"] = "Faktura (invoice.php)";
 $lang["sales_invoice_type_tax_invoice"] = "Poreska faktura (tax_invoice.php)";
 $lang["sales_invoice_unsent"] = "Faktura nije poslata";
 $lang["sales_invoice_update"] = "Ažuriranje";
-$lang["sales_item_insufficient_of_stock"] = "Artikla nema na zalihi";
+$lang["sales_item_insufficient_of_stock"] = "Artikla nema dovoljno na zalihi.";
 $lang["sales_item_name"] = "Naziv artikla";
 $lang["sales_item_number"] = "Barkod";
-$lang["sales_item_out_of_stock"] = "Stavka je rasprodana";
+$lang["sales_item_out_of_stock"] = "Artikal je rasprodan.";
 $lang["sales_key_browser"] = "";
 $lang["sales_key_cancel"] = "Cancels Current Quote/Invoice/Sale";
 $lang["sales_key_customer_search"] = "Customer Search";
@@ -125,21 +124,21 @@ $lang["sales_key_tendered"] = "Edit Amount Tendered";
 $lang["sales_key_title"] = "Sales Keyboard Shortcuts";
 $lang["sales_mc"] = "";
 $lang["sales_mode"] = "Mod registrovanja";
-$lang["sales_must_enter_numeric"] = "Morate unijeti numeričku vrijednost za količinu";
-$lang["sales_must_enter_numeric_giftcard"] = "Morate unijeti numeričku vrijednost za poklon bon";
+$lang["sales_must_enter_numeric"] = "Ponuđeni iznos mora biti broj.";
+$lang["sales_must_enter_numeric_giftcard"] = "Broj poklon kartice mora biti broj.";
 $lang["sales_new_customer"] = "Novi kupac";
 $lang["sales_new_item"] = "Novi artikal";
 $lang["sales_no_description"] = "Nema opisa";
 $lang["sales_no_filter"] = "Svi";
-$lang["sales_no_items_in_cart"] = "Košarica je prazna";
-$lang["sales_no_sales_to_display"] = "Nema artikala za prikaz";
-$lang["sales_none_selected"] = "Niste izabrali nijedu prodaju za brisanje";
+$lang["sales_no_items_in_cart"] = "Nema artikala u korpi.";
+$lang["sales_no_sales_to_display"] = "Nema prodaje za prikaz.";
+$lang["sales_none_selected"] = "Niste izabrali nijedu prodaju za brisanje.";
 $lang["sales_nontaxed_ind"] = " ";
 $lang["sales_not_authorized"] = "Ova radnja nije ovlašćena.";
 $lang["sales_one_or_multiple"] = "Prodaja";
 $lang["sales_payment"] = "Tip plaćanja";
 $lang["sales_payment_amount"] = "Iznos";
-$lang["sales_payment_not_cover_total"] = "Iznos plaćanja mora biti veći ili jednak ukupnom iznosu";
+$lang["sales_payment_not_cover_total"] = "Iznos plaćanja mora biti veći ili jednak ukupnom iznosu.";
 $lang["sales_payment_type"] = "Tip";
 $lang["sales_payments"] = "";
 $lang["sales_payments_total"] = "Ukupno plaćeno";
@@ -147,7 +146,7 @@ $lang["sales_price"] = "Cijena";
 $lang["sales_print_after_sale"] = "Štampaj poslije prodaje";
 $lang["sales_quantity"] = "Količina";
 $lang["sales_quantity_less_than_reorder_level"] = "Upozorenje! Željena količina je ispod minimalne.";
-$lang["sales_quantity_less_than_zero"] = "Upozorenje! Željena količina je nedovoljna. Možete nastaviti prodaju, ali provjerite svoju zalihu.";
+$lang["sales_quantity_less_than_zero"] = "Upozorenje: Željena količina je nedovoljna. Možete nastaviti prodaju, ali provjerite svoju zalihu.";
 $lang["sales_quantity_of_items"] = "Količina od %1 stavke(i)";
 $lang["sales_quote"] = "Ponuda";
 $lang["sales_quote_number"] = "Broj ponude";
@@ -156,7 +155,7 @@ $lang["sales_quote_sent"] = "Ponuda poslata na";
 $lang["sales_quote_unsent"] = "Ponuda nije poslata na";
 $lang["sales_receipt"] = "Račun";
 $lang["sales_receipt_no_email"] = "Ovaj kupac nema važeću e-mail adresu.";
-$lang["sales_receipt_number"] = "Račun br.";
+$lang["sales_receipt_number"] = "Rasprodaja #";
 $lang["sales_receipt_sent"] = "Račun poslat";
 $lang["sales_receipt_unsent"] = "Račun nije poslat";
 $lang["sales_refund"] = "Tip povrata";
@@ -183,14 +182,14 @@ $lang["sales_show_due"] = "";
 $lang["sales_show_invoice"] = "Pokaži fakturu";
 $lang["sales_show_receipt"] = "Pokaži račun";
 $lang["sales_start_typing_customer_name"] = "Počnite upisivati naziv kupca ...";
-$lang["sales_start_typing_item_name"] = "Počnite upisivati naziv artikla ili skenirajte barkod";
+$lang["sales_start_typing_item_name"] = "Počnite upisivati naziv artikla ili skenirajte barkod...";
 $lang["sales_stock"] = "Zaliha";
 $lang["sales_stock_location"] = "Lokacija skladišta";
 $lang["sales_sub_total"] = "Međuzbir";
 $lang["sales_successfully_deleted"] = "Uspješno ste izbrisali";
 $lang["sales_successfully_restored"] = "Uspješno ste obnovili";
-$lang["sales_successfully_suspended_sale"] = "Obustava prodaje je uspjela";
-$lang["sales_successfully_updated"] = "Uspješno ste ažurirali prodaju";
+$lang["sales_successfully_suspended_sale"] = "Obustava prodaje je uspjela.";
+$lang["sales_successfully_updated"] = "Prodaja je uspješno ažurirana.";
 $lang["sales_suspend_sale"] = "Obustavi";
 $lang["sales_suspended_doc_id"] = "Dokument";
 $lang["sales_suspended_sale_id"] = "ID";
@@ -201,15 +200,15 @@ $lang["sales_tax"] = "Porez";
 $lang["sales_tax_id"] = "Porez Id";
 $lang["sales_tax_invoice"] = "Poreska faktura";
 $lang["sales_tax_percent"] = "Porez %";
-$lang["sales_taxed_ind"] = "T";
+$lang["sales_taxed_ind"] = "P";
 $lang["sales_total"] = "Ukupno";
 $lang["sales_total_tax_exclusive"] = "Porez isključen";
 $lang["sales_transaction_failed"] = "Obrada nije ispravna.";
-$lang["sales_unable_to_add_item"] = "Artikal nije moguće dodati";
-$lang["sales_unsuccessfully_deleted"] = "Prodaju(e) nije moguće izbrisati";
+$lang["sales_unable_to_add_item"] = "Dodavanje artikla u rasprodaju nije uspjelo";
+$lang["sales_unsuccessfully_deleted"] = "Brisanje prodaje nije uspjelo.";
 $lang["sales_unsuccessfully_restored"] = "Obnova prodaje(a) nije uspjela.";
-$lang["sales_unsuccessfully_suspended_sale"] = "Obustava prodaje nije uspjela";
-$lang["sales_unsuccessfully_updated"] = "Prodaju(e) nije moguće ažurirati";
+$lang["sales_unsuccessfully_suspended_sale"] = "Obustava prodaje nije uspjela.";
+$lang["sales_unsuccessfully_updated"] = "Ažuriranje prodaje nije uspjelo.";
 $lang["sales_unsuspend"] = "Odustani";
 $lang["sales_unsuspend_and_delete"] = "Akcija";
 $lang["sales_update"] = "Ažuriranje";

application/language/bs-BA/suppliers_lang.php

@@ -1,5 +1,4 @@
-<?php 
-
+<?php
 $lang["suppliers_account_number"] = "Broj računa";
 $lang["suppliers_agency_name"] = "Naziv agencije";
 $lang["suppliers_cannot_be_deleted"] = "Brisanje izabranih dobavljača nije uspjelo. Jedan ili više njih imaju prodaju.";
@@ -9,10 +8,10 @@ $lang["suppliers_company_name_required"] = "Dobavljač je obavezan.";
 $lang["suppliers_confirm_delete"] = "Da li ste sigurni da želite da izbrišete izabranog dobavljača?";
 $lang["suppliers_confirm_restore"] = "Da li ste sigurni da želite vratiti izabranog dobavljača?";
 $lang["suppliers_cost"] = "Trošak dobavljača";
-$lang["suppliers_error_adding_updating"] = "Ažuriranje ili dodavanje dobavljača nije uspjelo";
+$lang["suppliers_error_adding_updating"] = "Ažuriranje ili dodavanje dobavljača nije uspjelo.";
 $lang["suppliers_goods"] = "Roba dobavljača";
 $lang["suppliers_new"] = "Novi dobavljač";
-$lang["suppliers_none_selected"] = "Niste izabrali nijednog dobavljača za brisanje";
+$lang["suppliers_none_selected"] = "Niste izabrali nijednog dobavljača za brisanje.";
 $lang["suppliers_one_or_multiple"] = "Dobavljač(i)";
 $lang["suppliers_successful_adding"] = "Uspješno ste dodali dobavljača";
 $lang["suppliers_successful_deleted"] = "Uspješno ste Izbrisali dobavljača";

application/language/bs-BA/taxes_lang.php

@@ -1,11 +1,10 @@
-<?php 
-
+<?php
 $lang["taxes_add_exception"] = "Dodaj izuzetak";
 $lang["taxes_cascade"] = "Kaskada";
-$lang["taxes_cascade_sequence"] = "Kaskadni slijed";
+$lang["taxes_cascade_sequence"] = "Kaskadni redoslijed";
 $lang["taxes_city"] = "Mjesto";
 $lang["taxes_code"] = "Šifra poreza";
-$lang["taxes_confirm_delete"] = "Da li ste sigurni da želite da izbrišete ovu šifru poreza? Ova radnja se ne može opozvati?";
+$lang["taxes_confirm_delete"] = "Da li ste sigurni da želite da izbrišete ovu šifru poreza? Ova radnja se ne može opozvati";
 $lang["taxes_confirm_restore"] = "Da li ste sigurni da želite da vratite izabranu šifru poreza?";
 $lang["taxes_default_tax_category"] = "Podrazumjevana kategorija";
 $lang["taxes_default_tax_rate"] = "Podrazumjevana stopa poreza";
@@ -17,11 +16,11 @@ $lang["taxes_new"] = "Nova šifra poreza";
 $lang["taxes_no_taxes"] = "";
 $lang["taxes_no_taxes_to_display"] = "Nije dostupna nijedan šifra poreza";
 $lang["taxes_reporting_authority"] = "Organ za izvještavanje";
-$lang["taxes_round_half_down"] = "Half Down";
-$lang["taxes_round_half_even"] = "Half Even";
-$lang["taxes_round_half_odd"] = "Half Odd";
-$lang["taxes_round_half_up"] = "Half Up";
-$lang["taxes_rounding_code"] = "Zaokruživanje";
+$lang["taxes_round_half_down"] = "Pola dolje";
+$lang["taxes_round_half_even"] = "Pola ravnomjerno";
+$lang["taxes_round_half_odd"] = "Pola neparno";
+$lang["taxes_round_half_up"] = "Pola gore";
+$lang["taxes_rounding_code"] = "Kod zaokruživanja";
 $lang["taxes_sales_tax"] = "Porez na promet";
 $lang["taxes_sales_tax_by_invoice"] = "Porez na promet po fakturi";
 $lang["taxes_sequence"] = "Sekv.";

application/language/en-GB/common_lang.php

@@ -1,5 +1,4 @@
-<?php 
-
+<?php
 $lang["common_address_1"] = "Address 1";
 $lang["common_address_2"] = "Address 2";
 $lang["common_admin"] = "";
@@ -81,7 +80,7 @@ $lang["common_unknown"] = "Unknown";
 $lang["common_view_recent_sales"] = "View Recent Sales";
 $lang["common_website"] = "opensourcepos.org";
 $lang["common_welcome"] = "Welcome";
-$lang["common_welcome_message"] = "Welcome to OSPOS, click on a module to get started.";
+$lang["common_welcome_message"] = "Welcome to OSPOS, click a module below to get started.";
 $lang["common_yes"] = "";
 $lang["common_you_are_using_ospos"] = "";
 $lang["common_zip"] = "Post Code";

application/language/en-US/sales_lang.php

@@ -1,5 +1,4 @@
-<?php 
-
+<?php
 $lang["customers_available_points"] = "Available Points";
 $lang["rewards_package"] = "Rewards";
 $lang["rewards_remaining_balance"] = "Reward Points remaining value is ";
@@ -105,7 +104,7 @@ $lang["sales_item_out_of_stock"] = "Item is out of stock.";
 $lang["sales_key_browser"] = "Helpful Shortcuts";
 $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_quote"] = "Finish Quote/Invoice without payment";
 $lang["sales_key_finish_sale"] = "Add Payment and Complete Invoice/Sale";
 $lang["sales_key_full"] = "Open in Full Screen Mode";
 $lang["sales_key_function"] = "Function";

application/language/es/sales_lang.php

@@ -1,5 +1,4 @@
-<?php 
-
+<?php
 $lang["customers_available_points"] = "Puntos disponibles";
 $lang["rewards_package"] = "Premios";
 $lang["rewards_remaining_balance"] = "El remanente de puntos es ";
@@ -147,7 +146,7 @@ $lang["sales_price"] = "Precio";
 $lang["sales_print_after_sale"] = "Imprimir recibo después de una venta";
 $lang["sales_quantity"] = "Cantidad";
 $lang["sales_quantity_less_than_reorder_level"] = "Advertencia. La cantidad deseada es insuficiente.";
-$lang["sales_quantity_less_than_zero"] = "Advertencia. La cantidad deseada está agotada en stock. Puedes procesar la venta pero audita el inventario.";
+$lang["sales_quantity_less_than_zero"] = "Advertencia. La cantidad deseada no tiene stock suficiente. Puedes procesar la venta pero revisa tu inventario.";
 $lang["sales_quantity_of_items"] = "Cantidad de %1 articulos";
 $lang["sales_quote"] = "Cotizar";
 $lang["sales_quote_number"] = "Número de Presupuesto";
@@ -205,7 +204,7 @@ $lang["sales_taxed_ind"] = "Ventas gravadas";
 $lang["sales_total"] = "Total";
 $lang["sales_total_tax_exclusive"] = "Sin impuesto";
 $lang["sales_transaction_failed"] = "La transacción de venta falló.";
-$lang["sales_unable_to_add_item"] = "Error al agregar artículo a la venta. Agotado";
+$lang["sales_unable_to_add_item"] = "Error al agregar artículo a la venta.  Stock Agotado";
 $lang["sales_unsuccessfully_deleted"] = "Ha fallado la eliminación de la Venta.";
 $lang["sales_unsuccessfully_restored"] = "Restaurar Venta fallida.";
 $lang["sales_unsuccessfully_suspended_sale"] = "Venta suspendida satisfactoriamente.";

application/language/fr/bootstrap_tables_lang.php

@@ -1,10 +1,9 @@
-<?php 
-
+<?php
 $lang["tables_all"] = "Tous";
 $lang["tables_columns"] = "Colonnes";
 $lang["tables_hide_show_pagination"] = "Masquer/Afficher la pagination";
-$lang["tables_loading"] = "Chargement en cours, patientez, s?il vous pla?t ...";
+$lang["tables_loading"] = "Chargement en cours, patientez, s'il vous plaît ...";
 $lang["tables_page_from_to"] = "Affichage des lignes {0} à {1} sur {2} lignes au total";
-$lang["tables_refresh"] = "Rafra?chir";
+$lang["tables_refresh"] = "Rafraîchir";
 $lang["tables_rows_per_page"] = "{0} lignes par page";
 $lang["tables_toggle"] = "Alterner";

application/language/fr/sales_lang.php

@@ -1,5 +1,4 @@
-<?php 
-
+<?php
 $lang["customers_available_points"] = "Points Disponibles";
 $lang["rewards_package"] = "Récompenses";
 $lang["rewards_remaining_balance"] = "Vos points fidélité restants ";
@@ -17,7 +16,7 @@ $lang["sales_cash_4"] = "";
 $lang["sales_cash_adjustment"] = "";
 $lang["sales_cash_deposit"] = "Dépôt d'Espèce";
 $lang["sales_cash_filter"] = "Espèce";
-$lang["sales_change_due"] = "Monnaie Rendu";
+$lang["sales_change_due"] = "Monnaie Rendue";
 $lang["sales_change_price"] = "";
 $lang["sales_check"] = "Chèque";
 $lang["sales_check_balance"] = "Rappel de chèque";
@@ -49,7 +48,7 @@ $lang["sales_daily_sales"] = "";
 $lang["sales_date"] = "Date de Vente";
 $lang["sales_date_range"] = "Intervalle de dates";
 $lang["sales_date_required"] = "Un bon format de date doit être entré.";
-$lang["sales_date_type"] = "Le Date est requis.";
+$lang["sales_date_type"] = "La Date est requise.";
 $lang["sales_debit"] = "Carte de Débit";
 $lang["sales_debit_filter"] = "";
 $lang["sales_delete"] = "Autoriser la suppression";
@@ -102,27 +101,27 @@ $lang["sales_item_insufficient_of_stock"] = "Stock trop faible.";
 $lang["sales_item_name"] = "Nom";
 $lang["sales_item_number"] = "# Article";
 $lang["sales_item_out_of_stock"] = "Stock épuisé.";
-$lang["sales_key_browser"] = "";
-$lang["sales_key_cancel"] = "Cancels Current Quote/Invoice/Sale";
+$lang["sales_key_browser"] = "Raccourcis utiles";
+$lang["sales_key_cancel"] = "Annule l'Offre/Facture/Vente en cours";
 $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_full"] = "Ouvrir en Mode Plein Écran";
 $lang["sales_key_function"] = "Function";
-$lang["sales_key_help"] = "Shortcuts";
-$lang["sales_key_help_modal"] = "Open Shortcuts Window";
+$lang["sales_key_help"] = "Raccourcis";
+$lang["sales_key_help_modal"] = "Ouvrir la fenêtre de raccourcis";
 $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_print"] = "Imprimer la page";
+$lang["sales_key_restore"] = "Restaurer le Zoom initial";
 $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_key_title"] = "Raccourcis Claviers des Ventes";
 $lang["sales_mc"] = "";
 $lang["sales_mode"] = "Mode d'Enregistrement";
 $lang["sales_must_enter_numeric"] = "Veuillez entrer une valeur numérique pour la somme.";
@@ -142,12 +141,12 @@ $lang["sales_payment_amount"] = "Somme";
 $lang["sales_payment_not_cover_total"] = "Le Paiement ne couvre pas le Total.";
 $lang["sales_payment_type"] = "Type";
 $lang["sales_payments"] = "";
-$lang["sales_payments_total"] = "Total Paiments";
+$lang["sales_payments_total"] = "Total Paiements";
 $lang["sales_price"] = "Prix";
 $lang["sales_print_after_sale"] = "Imprimer un recu après vente";
 $lang["sales_quantity"] = "Qté";
 $lang["sales_quantity_less_than_reorder_level"] = "Avertissement, Quantité Demandée Insuffisante.";
-$lang["sales_quantity_less_than_zero"] = "Avertissement, Quantité Demandée Insuffisante. Vous pouvez accomplir la ventre, mais veuillez vérifier votre inventaire.";
+$lang["sales_quantity_less_than_zero"] = "Avertissement : Quantité Demandée insuffisante. Vous pouvez accomplir la vente, mais veuillez vérifier votre inventaire.";
 $lang["sales_quantity_of_items"] = "Quantité d'articles %1";
 $lang["sales_quote"] = "Offre";
 $lang["sales_quote_number"] = "Offre n°";

application/language/id/common_lang.php

@@ -1,5 +1,4 @@
-<?php 
-
+<?php
 $lang["common_address_1"] = "Alamat 1";
 $lang["common_address_2"] = "Alamat 2";
 $lang["common_admin"] = "";
@@ -33,8 +32,8 @@ $lang["common_gender"] = "Jenis Kelamin";
 $lang["common_gender_female"] = "P";
 $lang["common_gender_male"] = "L";
 $lang["common_gender_undefined"] = "";
-$lang["common_icon"] = "";
-$lang["common_id"] = "Nomor";
+$lang["common_icon"] = "ikon";
+$lang["common_id"] = "Nomor ID";
 $lang["common_import"] = "Impor";
 $lang["common_import_change_file"] = "Ubah";
 $lang["common_import_csv"] = "Impor dari CSV";
@@ -47,8 +46,8 @@ $lang["common_last_name_required"] = "Nama belakang harus diisi.";
 $lang["common_last_page"] = "Akhir";
 $lang["common_learn_about_project"] = "Untuk mempelajari informasi terbaru tentang proyek ini.";
 $lang["common_list_of"] = "Daftar";
-$lang["common_logo"] = "";
-$lang["common_logo_mark"] = "";
+$lang["common_logo"] = "Logo";
+$lang["common_logo_mark"] = "Tanda";
 $lang["common_logout"] = "Keluar";
 $lang["common_manager"] = "";
 $lang["common_migration_needed"] = "Migrasi data ke %1 akan dimulai setelah masuk.";
@@ -72,8 +71,8 @@ $lang["common_return_policy"] = "Kebijakan Retur";
 $lang["common_search"] = "Cari";
 $lang["common_search_options"] = "Pilihan pencarian";
 $lang["common_searched_for"] = "Mencari untuk";
-$lang["common_software_short"] = "";
-$lang["common_software_title"] = "";
+$lang["common_software_short"] = "OSPOS";
+$lang["common_software_title"] = "Sumber Terbuka Titik Penjualan";
 $lang["common_state"] = "Provinsi";
 $lang["common_submit"] = "Kirim";
 $lang["common_total_spent"] = "Total";

application/language/id/config_lang.php

@@ -1,5 +1,4 @@
-<?php 
-
+<?php
 $lang["config_address"] = "Alamat Perusahaan";
 $lang["config_address_required"] = "Alamat Perusahaan wajib diisi.";
 $lang["config_all_set"] = "Semua perizinan file diatur dengan benar!";
@@ -144,7 +143,7 @@ $lang["config_financial_year_may"] = "1 Mei";
 $lang["config_financial_year_nov"] = "1 November";
 $lang["config_financial_year_oct"] = "1 Oktober";
 $lang["config_financial_year_sep"] = "1 September";
-$lang["config_floating_labels"] = "";
+$lang["config_floating_labels"] = "Label mengambang";
 $lang["config_gcaptcha_enable"] = "Halaman login reCHAPTCHA";
 $lang["config_gcaptcha_secret_key"] = "Kunci Rahasia reCHAPTCHA";
 $lang["config_gcaptcha_secret_key_required"] = "Kunci Rahasia reCHAPTCHA adalah bidang yang harus diisi";
@@ -164,7 +163,7 @@ $lang["config_image_restrictions"] = "Pembatasan Pengunggahan Gambar";
 $lang["config_include_hsn"] = "Termasuk dukungan kode HSN";
 $lang["config_info"] = "Informasi";
 $lang["config_info_configuration"] = "Informasi Toko";
-$lang["config_input_groups"] = "";
+$lang["config_input_groups"] = "Grup masukan";
 $lang["config_integrations"] = "Integrasi";
 $lang["config_integrations_configuration"] = "Integrasi pihak ketiga";
 $lang["config_invoice"] = "Faktur";
@@ -195,7 +194,7 @@ $lang["config_locale_info"] = "Informasi Konfigurasi Terjemahan";
 $lang["config_location"] = "Lokasi Stock";
 $lang["config_location_configuration"] = "Lokasi Stock";
 $lang["config_location_info"] = "Informasi konfigurasi lokasi stock";
-$lang["config_login_form"] = "";
+$lang["config_login_form"] = "Gaya Formulir Log Masuk";
 $lang["config_logout"] = "Apakah Anda akan membuat cadangan sebelum anda keluar? Klik [OK] untuk pencadangan, [Batal] untuk keluar.";
 $lang["config_mailchimp"] = "MailChimp";
 $lang["config_mailchimp_api_key"] = "Kunci API MailChimp";
@@ -316,7 +315,7 @@ $lang["config_tax_decimals"] = "Pajak Decimals";
 $lang["config_tax_id"] = "Id Pajak";
 $lang["config_tax_included"] = "Dikenakan Pajak";
 $lang["config_theme"] = "Tema";
-$lang["config_theme_preview"] = "";
+$lang["config_theme_preview"] = "Pratinjau Tema:";
 $lang["config_thousands_separator"] = "Pemisah Ribuan";
 $lang["config_timezone"] = "Zona Waktu";
 $lang["config_timezone_error"] = "Zona Waktu OSPOS berbeda dari Zona Waktu Anda.";

application/language/id/customers_lang.php

@@ -1,8 +1,7 @@
-<?php 
-
+<?php
 $lang["customers_account_number"] = "No Pelanggan";
 $lang["customers_account_number_duplicate"] = "Nomor akun ini telah tersimpan di basis data.";
-$lang["customers_available_points"] = "Poin yg tersedia";
+$lang["customers_available_points"] = "Poin yang tersedia";
 $lang["customers_available_points_value"] = "";
 $lang["customers_average"] = "Rata-rata yang dihabiskan";
 $lang["customers_avg_discount"] = "Rata-rata diskon";
@@ -33,7 +32,7 @@ $lang["customers_mailchimp_activity_open"] = "Buka email";
 $lang["customers_mailchimp_activity_total"] = "Email terkirim";
 $lang["customers_mailchimp_activity_unopen"] = "Email belum dibuka";
 $lang["customers_mailchimp_email_client"] = "Klien email";
-$lang["customers_mailchimp_info"] = "Mailchimp";
+$lang["customers_mailchimp_info"] = "MailChimp";
 $lang["customers_mailchimp_member_rating"] = "Peringkat";
 $lang["customers_mailchimp_status"] = "Status";
 $lang["customers_mailchimp_vip"] = "VIP";

application/language/id/employees_lang.php

@@ -1,5 +1,4 @@
-<?php 
-
+<?php
 $lang["employees_administrator"] = "";
 $lang["employees_basic_information"] = "Informasi Karyawan";
 $lang["employees_cannot_be_deleted"] = "Karyawan terpilih tidak bisa dihapus satu atau lebih dari para pekerja telah memproses penjualan atau Anda mencoba untuk menghapus diri Anda sendiri.";
@@ -38,6 +37,6 @@ $lang["employees_system_language"] = "Bahasa Sistem";
 $lang["employees_unsuccessful_change_password"] = "Gagal mengubah kata sandi.";
 $lang["employees_update"] = "Ubah Karyawan";
 $lang["employees_username"] = "Nama Pengguna";
-$lang["employees_username_duplicate"] = "";
+$lang["employees_username_duplicate"] = "Nama pengguna karyawan sudah digunakan. Silakan pilih yang lain.";
 $lang["employees_username_minlength"] = "Nama Pengguna minimal 5 huruf.";
 $lang["employees_username_required"] = "Nama Pengguna wajib diisi.";

application/language/id/items_lang.php

@@ -1,5 +1,4 @@
-<?php 
-
+<?php
 $lang["items_add_minus"] = "Menambah atau mengurangi Inventori.";
 $lang["items_allow_alt_description"] = "Deskripsi Alternatif dimungkinkan";
 $lang["items_amount_entry"] = "Jumlah entri";
@@ -20,7 +19,7 @@ $lang["items_confirm_bulk_edit"] = "Apakah Anda yakin ingin merubah semua item y
 $lang["items_confirm_bulk_edit_wipe_taxes"] = "Semua item informasi pajak akan diganti.";
 $lang["items_confirm_delete"] = "Apakah Anda yakin ingin menghapus item yang dipilih?";
 $lang["items_confirm_restore"] = "Anda yakin ingin mengembalikan item terpilih?";
-$lang["items_cost_price"] = "Harga Pokok";
+$lang["items_cost_price"] = "Harga Beli";
 $lang["items_cost_price_number"] = "Harga beli harus berupa angka.";
 $lang["items_cost_price_required"] = "Harga beli harus diisi.";
 $lang["items_count"] = "Mutasi/Penyesuaian Inventori";
@@ -89,7 +88,7 @@ $lang["items_reorder_level_required"] = "Batas pesan ulang wajib diisi.";
 $lang["items_retrive_item_info"] = "Dapatkan Info Barang";
 $lang["items_sales_tax_1"] = "Pajak Penjualan1";
 $lang["items_sales_tax_2"] = "Pajak Penjualan2";
-$lang["items_search_attributes"] = "Cari secara manual";
+$lang["items_search_attributes"] = "Cari Atribut";
 $lang["items_select_image"] = "Pilih Gambar";
 $lang["items_serialized_items"] = "Serial Item";
 $lang["items_standard"] = "Standar";

application/language/id/login_lang.php

@@ -1,13 +1,12 @@
-<?php 
-
+<?php
 $lang["login_gcaptcha"] = "Saya bukan robot.";
 $lang["login_go"] = "Lanjutkan";
-$lang["login_invalid_gcaptcha"] = "Silahkan verifikasi bahwa anda bukan robot.";
+$lang["login_invalid_gcaptcha"] = "Tolong buktikan bahwa anda bukan robot.";
 $lang["login_invalid_installation"] = "Instalasi tidak benar, periksa file php.ini Anda.";
-$lang["login_invalid_username_and_password"] = "Nama Pengguna/Kata Kunci Salah.";
+$lang["login_invalid_username_and_password"] = "Nama Pengguna Atau Sandi Salah.";
 $lang["login_login"] = "Masuk";
-$lang["login_logout"] = "";
-$lang["login_migration_needed"] = "";
+$lang["login_logout"] = "Keluar";
+$lang["login_migration_needed"] = "Migrasi basis data untuk %1 akan di mulai setelah masuk.";
 $lang["login_password"] = "Kata kunci";
 $lang["login_username"] = "Nama Anda";
-$lang["login_welcome"] = "";
+$lang["login_welcome"] = "Selamat Datang di %1!";

application/language/id/module_lang.php

@@ -1,11 +1,10 @@
-<?php 
-
+<?php
 $lang["module_admin_cashups"] = "";
 $lang["module_admin_cashups_desc"] = "";
 $lang["module_attributes"] = "Atribut";
 $lang["module_attributes_desc"] = "Tambah, Perbaharui, Hapus dan Cari atribut.";
 $lang["module_both"] = "Keduanya";
-$lang["module_cashups"] = "Uang Tunai";
+$lang["module_cashups"] = "Kasir";
 $lang["module_cashups_desc"] = "Tambah, Perbaharui, Hapus dan Cari Uang Tunai.";
 $lang["module_config"] = "Konfigurasi";
 $lang["module_config_desc"] = "Ubah Konfigurasi Toko.";

application/language/id/reports_lang.php

@@ -1,5 +1,4 @@
-<?php 
-
+<?php
 $lang["reports_all"] = "Semua";
 $lang["reports_authority"] = "Otoritas";
 $lang["reports_canceled"] = "Dibatalkan";
@@ -20,7 +19,7 @@ $lang["reports_completed_sales"] = "Penjualan yang Sukses";
 $lang["reports_confirm_delete"] = "Anda yakin ingin menghapus masukan terpilih?";
 $lang["reports_confirm_restore"] = "Anda yakin ingin mengembalikan entri terpilih?";
 $lang["reports_cost"] = "Grosir";
-$lang["reports_cost_price"] = "Harga Pokok";
+$lang["reports_cost_price"] = "Harga Beli";
 $lang["reports_count"] = "Jumlah";
 $lang["reports_customer"] = "Pelanggan";
 $lang["reports_customers"] = "Pelanggan";
@@ -115,14 +114,14 @@ $lang["reports_sold_to"] = "Dijual Kepada";
 $lang["reports_stock_location"] = "Lokasi Stock";
 $lang["reports_sub_total_value"] = "Sub-total";
 $lang["reports_subtotal"] = "SubTotal";
-$lang["reports_summary_reports"] = "Ringkasan Laporan";
+$lang["reports_summary_reports"] = "Laporan Ringkas";
 $lang["reports_supplied_by"] = "Pemasok";
 $lang["reports_supplier"] = "Pemasok";
 $lang["reports_suppliers"] = "Pemasok";
 $lang["reports_suppliers_summary_report"] = "Laporan Ringkasan Pemasok";
 $lang["reports_tax"] = "Pajak";
 $lang["reports_tax_category"] = "Kategori Pajak";
-$lang["reports_tax_name"] = "";
+$lang["reports_tax_name"] = "Nama Pajak";
 $lang["reports_tax_percent"] = "Persentase Pajak";
 $lang["reports_tax_rate"] = "Tarif Pajak";
 $lang["reports_taxes"] = "Pajak";

application/language/id/sales_lang.php

@@ -1,6 +1,5 @@
-<?php 
-
-$lang["customers_available_points"] = "Poin yg tersedia";
+<?php
+$lang["customers_available_points"] = "Poin yang tersedia";
 $lang["rewards_package"] = "Penghargaan";
 $lang["rewards_remaining_balance"] = "Poin penghargaan tersisa ";
 $lang["sales_account_number"] = "Akun #";
@@ -40,7 +39,7 @@ $lang["sales_customer_address"] = "Alamat";
 $lang["sales_customer_discount"] = "Diskon";
 $lang["sales_customer_email"] = "Email";
 $lang["sales_customer_location"] = "Lokasi";
-$lang["sales_customer_mailchimp_status"] = "Status Mailchimp";
+$lang["sales_customer_mailchimp_status"] = "Status MailChimp";
 $lang["sales_customer_optional"] = "(Diperlukan untuk Pembayaran Jatuh Tempo)";
 $lang["sales_customer_required"] = "(Dibutuhkan)";
 $lang["sales_customer_total"] = "Total";
@@ -101,28 +100,28 @@ $lang["sales_invoice_update"] = "Menghitung ulang";
 $lang["sales_item_insufficient_of_stock"] = "Stok Item tidak mencukupi.";
 $lang["sales_item_name"] = "Nama Barang";
 $lang["sales_item_number"] = "Barang #";
-$lang["sales_item_out_of_stock"] = "Stok habis.";
-$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_item_out_of_stock"] = "Barang habis.";
+$lang["sales_key_browser"] = "Pintasan bermanfaat";
+$lang["sales_key_cancel"] = "Membatalkan Penawaran/Faktur/Penjualan saat ini";
+$lang["sales_key_customer_search"] = "Pencarian Pelanggan";
+$lang["sales_key_finish_quote"] = "Selesaikan Struk/Faktur tanpa pembayaran";
+$lang["sales_key_finish_sale"] = "Tambahkan Pembayaran dan Lengkapi Faktur/Penjualan";
+$lang["sales_key_full"] = "Buka dalam Mode Layar Penuh";
+$lang["sales_key_function"] = "Fungsi";
+$lang["sales_key_help"] = "Pintasan";
+$lang["sales_key_help_modal"] = "Buka Jendela Pintasan";
+$lang["sales_key_in"] = "Perbesar";
+$lang["sales_key_item_search"] = "Pencarian Barang";
+$lang["sales_key_out"] = "Perkecil";
+$lang["sales_key_payment"] = "Tambahkan Pembayaran";
+$lang["sales_key_print"] = "Cetak Halaman sekarang";
+$lang["sales_key_restore"] = "Reset tampilan zum";
+$lang["sales_key_search"] = "Cari Tabel Laporan";
+$lang["sales_key_suspend"] = "Tangguhkan Penjualan saat ini";
+$lang["sales_key_suspended"] = "Tampilkan Penjualan yang Ditangguhkan";
+$lang["sales_key_system"] = "Pemintas Sistem";
+$lang["sales_key_tendered"] = "Edit jumlah yang dibayarkan";
+$lang["sales_key_title"] = "Pintasan Papan Ketik Penjualan";
 $lang["sales_mc"] = "";
 $lang["sales_mode"] = "Jenis Transaksi";
 $lang["sales_must_enter_numeric"] = "Nilai yang dimasukkan harus berupa angka.";

application/language/it/attributes_lang.php

@@ -1,31 +1,30 @@
-<?php 
-
-$lang["attributes_attribute_value_invalid_chars"] = "";
-$lang["attributes_confirm_delete"] = "";
-$lang["attributes_confirm_restore"] = "";
-$lang["attributes_definition_cannot_be_deleted"] = "";
-$lang["attributes_definition_error_adding_updating"] = "";
-$lang["attributes_definition_flags"] = "";
-$lang["attributes_definition_group"] = "";
-$lang["attributes_definition_id"] = "";
-$lang["attributes_definition_name"] = "";
-$lang["attributes_definition_name_required"] = "";
-$lang["attributes_definition_one_or_multiple"] = "";
-$lang["attributes_definition_successful_adding"] = "";
-$lang["attributes_definition_successful_deleted"] = "";
-$lang["attributes_definition_successful_updating"] = "";
-$lang["attributes_definition_type"] = "";
-$lang["attributes_definition_type_required"] = "";
-$lang["attributes_definition_unit"] = "";
-$lang["attributes_definition_values"] = "";
-$lang["attributes_new"] = "";
-$lang["attributes_no_attributes_to_display"] = "";
-$lang["attributes_receipt_visibility"] = "";
-$lang["attributes_show_in_items"] = "";
-$lang["attributes_show_in_items_visibility"] = "";
-$lang["attributes_show_in_receipt"] = "";
-$lang["attributes_show_in_receivings"] = "";
-$lang["attributes_show_in_receivings_visibility"] = "";
-$lang["attributes_show_in_sales"] = "";
-$lang["attributes_show_in_sales_visibility"] = "";
-$lang["attributes_update"] = "";
+<?php
+$lang["attributes_attribute_value_invalid_chars"] = "Il valore dell'attributo non può contenere '_' o '|'";
+$lang["attributes_confirm_delete"] = "Sei sicuro di voler eliminare gli attributi selezionati?";
+$lang["attributes_confirm_restore"] = "Sei sicuro di voler ripristinare l'attributo selezionato?";
+$lang["attributes_definition_cannot_be_deleted"] = "Non riesco a cancellare l'attributo selezionato";
+$lang["attributes_definition_error_adding_updating"] = "Impossibile aggiungere o aggiornare l'attributo %1. Si prega di controllare il registro degli errori.";
+$lang["attributes_definition_flags"] = "Visibilità attributo";
+$lang["attributes_definition_group"] = "Gruppo";
+$lang["attributes_definition_id"] = "Id";
+$lang["attributes_definition_name"] = "Aggiungi attributo";
+$lang["attributes_definition_name_required"] = "Nome attributo è richiesto";
+$lang["attributes_definition_one_or_multiple"] = "attributo(i)";
+$lang["attributes_definition_successful_adding"] = "Hai aggiunto il prodotto con successo";
+$lang["attributes_definition_successful_deleted"] = "Cancellato con successo";
+$lang["attributes_definition_successful_updating"] = "Hai aggiornato correttamente l'attributo";
+$lang["attributes_definition_type"] = "Tipo di attributo";
+$lang["attributes_definition_type_required"] = "Il tipo di attribuito è richiesto";
+$lang["attributes_definition_unit"] = "Unità di misura";
+$lang["attributes_definition_values"] = "Valore attributo";
+$lang["attributes_new"] = "Nuovo attributo";
+$lang["attributes_no_attributes_to_display"] = "Nessun elemento da visualizzare";
+$lang["attributes_receipt_visibility"] = "Scontrino";
+$lang["attributes_show_in_items"] = "Visualizza in articoli";
+$lang["attributes_show_in_items_visibility"] = "Articoli";
+$lang["attributes_show_in_receipt"] = "Mostra in ricevuta";
+$lang["attributes_show_in_receivings"] = "Mostra negli incassi";
+$lang["attributes_show_in_receivings_visibility"] = "Ricezione";
+$lang["attributes_show_in_sales"] = "Visualizza in vendite";
+$lang["attributes_show_in_sales_visibility"] = "Vendite";
+$lang["attributes_update"] = "Aggiorna attributo";

application/language/it/bootstrap_tables_lang.php

@@ -1,6 +1,5 @@
-<?php 
-
-$lang["tables_all"] = "Tutti/e";
+<?php
+$lang["tables_all"] = "Tutte";
 $lang["tables_columns"] = "Colonne";
 $lang["tables_hide_show_pagination"] = "Nascondi/mostra paginazione";
 $lang["tables_loading"] = "Caricamento, attendere prego...";

application/language/it/cashups_lang.php

@@ -1,48 +1,47 @@
-<?php 
-
-$lang["cashups_amount"] = "";
-$lang["cashups_amount_number"] = "";
-$lang["cashups_amount_required"] = "";
+<?php
+$lang["cashups_amount"] = "Importo";
+$lang["cashups_amount_number"] = "Quantità deve essere un numero";
+$lang["cashups_amount_required"] = "Quantità è un campo richiesto.";
 $lang["cashups_cancel_cashups"] = "";
 $lang["cashups_cancel_cashups_enter"] = "";
-$lang["cashups_cannot_be_deleted"] = "";
+$lang["cashups_cannot_be_deleted"] = "Non posso cancellare incasso";
 $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_close_date"] = "Data chiusura";
+$lang["cashups_close_employee"] = "Chiuso da";
+$lang["cashups_closed_amount_card"] = "Carte";
+$lang["cashups_closed_amount_cash"] = "Cassa chiusa";
+$lang["cashups_closed_amount_check"] = "Assegni";
+$lang["cashups_closed_amount_due"] = "Contributi";
 $lang["cashups_closed_amount_giftcard"] = "";
-$lang["cashups_closed_amount_total"] = "";
-$lang["cashups_closed_date"] = "";
-$lang["cashups_confirm_delete"] = "";
-$lang["cashups_confirm_restore"] = "";
+$lang["cashups_closed_amount_total"] = "Totale";
+$lang["cashups_closed_date"] = "Data di chiusura";
+$lang["cashups_confirm_delete"] = "Sicuro di voler cancellare l'incasso selezionato?";
+$lang["cashups_confirm_restore"] = "Sei sicuro di voler ripristinare incasso selezionato?";
 $lang["cashups_confirm_submit"] = "";
-$lang["cashups_date_number"] = "";
-$lang["cashups_date_required"] = "";
-$lang["cashups_description"] = "";
+$lang["cashups_date_number"] = "La data deve essere un numero";
+$lang["cashups_date_required"] = "Data è un campo richiesto";
+$lang["cashups_description"] = "Descrizione";
 $lang["cashups_enable_expected"] = "";
-$lang["cashups_error_adding_updating"] = "";
+$lang["cashups_error_adding_updating"] = "Errore durante l'aggiunta/aggiornamento incasso";
 $lang["cashups_giftcard"] = "";
-$lang["cashups_id"] = "";
-$lang["cashups_info"] = "";
+$lang["cashups_id"] = "Id";
+$lang["cashups_info"] = "Info incassi";
 $lang["cashups_info_employee"] = "";
-$lang["cashups_is_deleted"] = "";
-$lang["cashups_new"] = "";
-$lang["cashups_no_cashups_to_display"] = "";
-$lang["cashups_none_selected"] = "";
-$lang["cashups_note"] = "";
-$lang["cashups_one_or_multiple"] = "";
-$lang["cashups_open_amount_cash"] = "";
-$lang["cashups_open_date"] = "";
-$lang["cashups_open_employee"] = "";
-$lang["cashups_opened_date"] = "";
-$lang["cashups_successful_adding"] = "";
-$lang["cashups_successful_deleted"] = "";
-$lang["cashups_successful_updating"] = "";
-$lang["cashups_total"] = "";
-$lang["cashups_transfer_amount_cash"] = "";
+$lang["cashups_is_deleted"] = "Cancellato";
+$lang["cashups_new"] = "Nuovo incasso";
+$lang["cashups_no_cashups_to_display"] = "Non ci sono incassi da visualizzare";
+$lang["cashups_none_selected"] = "Non hai selezionato alcun incasso";
+$lang["cashups_note"] = "Note";
+$lang["cashups_one_or_multiple"] = "Incassi";
+$lang["cashups_open_amount_cash"] = "Contanti";
+$lang["cashups_open_date"] = "Data di apertura";
+$lang["cashups_open_employee"] = "Aperto da";
+$lang["cashups_opened_date"] = "Data di apertura";
+$lang["cashups_successful_adding"] = "Aggiunta di contanti riuscita";
+$lang["cashups_successful_deleted"] = "Eliminazione di contanti riuscita";
+$lang["cashups_successful_updating"] = "Aggiornamento del pagamento riuscito";
+$lang["cashups_total"] = "Totale";
+$lang["cashups_transfer_amount_cash"] = "Entrate/uscite contanti";
 $lang["cashups_transfer_amount_cash_minus"] = "";
-$lang["cashups_update"] = "";
+$lang["cashups_update"] = "Aggiorna contanti";
 $lang["cashups_warning"] = "";

application/language/it/common_lang.php

@@ -1,5 +1,4 @@
-<?php 
-
+<?php
 $lang["common_address_1"] = "Indirizzo 1";
 $lang["common_address_2"] = "Indirizzo 2";
 $lang["common_admin"] = "";
@@ -11,7 +10,7 @@ $lang["common_comments"] = "Commenti";
 $lang["common_common"] = "comune";
 $lang["common_confirm_search"] = "Hai selezionato una o più righe, queste non saranno più selezionate dopo la tua ricerca. Sei sicuro di voler procedere alla ricerca?";
 $lang["common_copyrights"] = "© 2010 - %1";
-$lang["common_correct_errors"] = "";
+$lang["common_correct_errors"] = "Correggi gli errori identificati prima di salvare";
 $lang["common_country"] = "Paese";
 $lang["common_dashboard"] = "";
 $lang["common_date"] = "Data";
@@ -33,12 +32,12 @@ $lang["common_gender"] = "Sesso";
 $lang["common_gender_female"] = "F";
 $lang["common_gender_male"] = "M";
 $lang["common_gender_undefined"] = "";
-$lang["common_icon"] = "";
-$lang["common_id"] = "Id";
+$lang["common_icon"] = "Icona";
+$lang["common_id"] = "ID";
 $lang["common_import"] = "Importa";
 $lang["common_import_change_file"] = "Sostituisci";
 $lang["common_import_csv"] = "Importa CSV";
-$lang["common_import_full_path"] = "E' richiesto il percorso completo";
+$lang["common_import_full_path"] = "È richiesto il percorso completo del file CSV";
 $lang["common_import_remove_file"] = "Rimuovi";
 $lang["common_import_select_file"] = "Seleziona file";
 $lang["common_inv"] = "fatt";
@@ -47,15 +46,15 @@ $lang["common_last_name_required"] = "Il campo Cognome è richiesto.";
 $lang["common_last_page"] = "Ultimo";
 $lang["common_learn_about_project"] = "per imparare le ultime informazioni riguardanti il progetto.";
 $lang["common_list_of"] = "Lista di";
-$lang["common_logo"] = "";
-$lang["common_logo_mark"] = "";
+$lang["common_logo"] = "Logo";
+$lang["common_logo_mark"] = "Marchio";
 $lang["common_logout"] = "Esci";
 $lang["common_manager"] = "";
 $lang["common_migration_needed"] = "";
 $lang["common_new"] = "Nuovo";
 $lang["common_no"] = "";
 $lang["common_no_persons_to_display"] = "Non ci sono persone da mostrare.";
-$lang["common_none_selected_text"] = "Nessuna selezione.";
+$lang["common_none_selected_text"] = "[Selezionare]";
 $lang["common_or"] = "OR";
 $lang["common_people"] = "";
 $lang["common_phone_number"] = "Numero di Telefono";
@@ -72,8 +71,8 @@ $lang["common_return_policy"] = "Politica di restituzione";
 $lang["common_search"] = "Cerca";
 $lang["common_search_options"] = "Opzioni di ricerca";
 $lang["common_searched_for"] = "Cercato per";
-$lang["common_software_short"] = "";
-$lang["common_software_title"] = "";
+$lang["common_software_short"] = "OSPOS";
+$lang["common_software_title"] = "Punto vendita Open Source";
 $lang["common_state"] = "Provincia";
 $lang["common_submit"] = "Invia";
 $lang["common_total_spent"] = "Totale spesa";
@@ -81,7 +80,7 @@ $lang["common_unknown"] = "Sconosciuto";
 $lang["common_view_recent_sales"] = "Mostra Vendite Recenti";
 $lang["common_website"] = "Sito web";
 $lang["common_welcome"] = "Benvenuto";
-$lang["common_welcome_message"] = "Benvenuto in OSPOS, clicca su un modulo sottostante per incominciare.";
+$lang["common_welcome_message"] = "Benvenuto in OSPOS, clicca un modulo sottostante per incominciare.";
 $lang["common_yes"] = "";
 $lang["common_you_are_using_ospos"] = "Stai usando la versione Open Source Point Of Sale (Punto di vendita)";
 $lang["common_zip"] = "CAP";

application/language/it/config_lang.php

@@ -1,5 +1,4 @@
-<?php 
-
+<?php
 $lang["config_address"] = "Indirizzo Azienda";
 $lang["config_address_required"] = "Il campo Indirizzo Azienda è obbligatorio.";
 $lang["config_all_set"] = "All file permissions are set correctly!";
@@ -27,7 +26,7 @@ $lang["config_barcode_page_width"] = "Mostra larghezza pagina";
 $lang["config_barcode_price"] = "Prezzo";
 $lang["config_barcode_second_row"] = "Riga 2";
 $lang["config_barcode_third_row"] = "Riga 3";
-$lang["config_barcode_tooltip"] = "Attenzione: Questa funzionalità può causare la duplicazione dei prodotti da essere importati o creati.  Non usarla se non vuoi codi a barra duplicati.";
+$lang["config_barcode_tooltip"] = "Attenzione: Questa funzionalità può causare la duplicazione dei prodotti da essere importati o creati.  Non usarla se non vuoi codici a barre duplicati.";
 $lang["config_barcode_type"] = "Tipo Codice a Barre";
 $lang["config_barcode_width"] = "Larghezza (px)";
 $lang["config_bottom"] = "Parte inferiore";
@@ -41,7 +40,7 @@ $lang["config_cash_button_6"] = "";
 $lang["config_cash_decimals"] = "Decimali Contanti";
 $lang["config_cash_decimals_tooltip"] = "Se Decimali Contanti e Decimali Valuta sono le stesse non verrà effettuato un arrotondamento.";
 $lang["config_cash_rounding"] = "Arrotondamento Contanti";
-$lang["config_category_dropdown"] = "";
+$lang["config_category_dropdown"] = "Mostra categoria come menu a discesa";
 $lang["config_center"] = "Centro";
 $lang["config_change_apperance_tooltip"] = "";
 $lang["config_comma"] = "virgola";
@@ -55,7 +54,7 @@ $lang["config_company_select_image"] = "Seleziona Immagine";
 $lang["config_company_website_url"] = "Il sito dell'azienda non è un URL valido (http://...).";
 $lang["config_country_codes"] = "Codice Postale";
 $lang["config_country_codes_tooltip"] = "La lista di Codici Postali separate da virgole sono usate per la ricerca per indirizzo.";
-$lang["config_currency_code"] = "";
+$lang["config_currency_code"] = "Codice valuta";
 $lang["config_currency_decimals"] = "Decimali Valuta";
 $lang["config_currency_symbol"] = "Simbolo Valuta";
 $lang["config_current_employee_only"] = "";
@@ -80,17 +79,17 @@ $lang["config_default_barcode_page_width_number"] = "Larghezza Codice a Barre di
 $lang["config_default_barcode_page_width_required"] = "Larghezza Codice a Barre di Default è un campo obbligatorio.";
 $lang["config_default_barcode_width_number"] = "Larghezza Codice a Barre di Default deve essere un numero.";
 $lang["config_default_barcode_width_required"] = "Larghezza Codice a Barre di Default è un campo obbligatorio.";
-$lang["config_default_item_columns"] = "";
+$lang["config_default_item_columns"] = "Colonne degli elementi visibili di default";
 $lang["config_default_origin_tax_code"] = "Codice Imposta di Origine Default";
-$lang["config_default_receivings_discount"] = "";
-$lang["config_default_receivings_discount_number"] = "";
-$lang["config_default_receivings_discount_required"] = "";
+$lang["config_default_receivings_discount"] = "Sconto sugli incassi predefiniti";
+$lang["config_default_receivings_discount_number"] = "Lo sconto sugli incassi predefinito deve essere un numero.";
+$lang["config_default_receivings_discount_required"] = "Lo sconto di ricezione predefinito è un campo obbligatorio.";
 $lang["config_default_sales_discount"] = "Sconto Vendita Default %";
 $lang["config_default_sales_discount_number"] = "Sconto Vendita Default deve essere un numero.";
 $lang["config_default_sales_discount_required"] = "Sconto Vendita Default è un campo obbligatorio.";
-$lang["config_default_tax_category"] = "";
-$lang["config_default_tax_code"] = "";
-$lang["config_default_tax_jurisdiction"] = "";
+$lang["config_default_tax_category"] = "Categoria di imposta predefinita";
+$lang["config_default_tax_code"] = "Codice Fiscale predefinito";
+$lang["config_default_tax_jurisdiction"] = "Giurisdizione fiscale predefinita";
 $lang["config_default_tax_name_number"] = "Nome Tassazione Default deve essere una stringa.";
 $lang["config_default_tax_name_required"] = "Nome Tassazione Default è un campo richiesto.";
 $lang["config_default_tax_rate"] = "Percent. Imposta Default %";
@@ -144,7 +143,7 @@ $lang["config_financial_year_may"] = "1mo di Maggio";
 $lang["config_financial_year_nov"] = "1mo di Novembre";
 $lang["config_financial_year_oct"] = "1mo di Ottobre";
 $lang["config_financial_year_sep"] = "1mo di Settembre";
-$lang["config_floating_labels"] = "";
+$lang["config_floating_labels"] = "Etichette mobili";
 $lang["config_gcaptcha_enable"] = "Login Page reCAPTCHA";
 $lang["config_gcaptcha_secret_key"] = "reCAPTCHA Secret Key";
 $lang["config_gcaptcha_secret_key_required"] = "reCAPTCHA Secret Key è un campo obbligatorio";
@@ -156,26 +155,26 @@ $lang["config_general_configuration"] = "Configurazione Generale";
 $lang["config_giftcard_number"] = "Numero Carta Regalo";
 $lang["config_giftcard_random"] = "Genera Casualmente";
 $lang["config_giftcard_series"] = "Genera in Serie";
-$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_image_allowed_file_types"] = "Tipi di file consentiti";
+$lang["config_image_max_height_tooltip"] = "Altezza massima consentita per i caricamenti di immagini in pixel (px).";
+$lang["config_image_max_size_tooltip"] = "Dimensione file massima consentita per il caricamento di immagini in kilobyte (kb).";
+$lang["config_image_max_width_tooltip"] = "Larghezza massima consentita per i caricamenti di immagini in pixel (px).";
+$lang["config_image_restrictions"] = "Restrizioni al caricamento delle immagini";
+$lang["config_include_hsn"] = "Includere il supporto per i codici HSN";
 $lang["config_info"] = "Informazioni";
 $lang["config_info_configuration"] = "Informazioni Negozio";
-$lang["config_input_groups"] = "";
-$lang["config_integrations"] = "";
-$lang["config_integrations_configuration"] = "";
+$lang["config_input_groups"] = "Gruppi di Ingresso";
+$lang["config_integrations"] = "Integrazioni";
+$lang["config_integrations_configuration"] = "Integrazioni di terze parti";
 $lang["config_invoice"] = "Fattura";
 $lang["config_invoice_configuration"] = "Impostazioni di Stampa Fattura";
 $lang["config_invoice_default_comments"] = "Commenti Fattura di Default";
 $lang["config_invoice_email_message"] = "Template Email di Fattura";
 $lang["config_invoice_enable"] = "Abilita Fatturazione";
 $lang["config_invoice_printer"] = "Stampante per Fattura";
-$lang["config_invoice_type"] = "";
-$lang["config_is_readable"] = "";
-$lang["config_is_writable"] = "is writable, but the permissions are higher than 750.";
+$lang["config_invoice_type"] = "Tipo fattura";
+$lang["config_is_readable"] = "è leggibile, ma le autorizzazioni sono impostate in modo errato. Impostalo su 640 o 660 e aggiorna.";
+$lang["config_is_writable"] = "è scrivibile, ma i permessi sono impostati in modo errato. Si prega di impostarlo su 750 e aggiornare.";
 $lang["config_item_markup"] = "";
 $lang["config_jsprintsetup_required"] = "Attenzione: Questa funzionalità funzionerà solo se è installato l'addon di FifeFox jsPrintSetup. Salvare ugualmente ?";
 $lang["config_language"] = "Lingua";
@@ -195,7 +194,7 @@ $lang["config_locale_info"] = "Informazioni di Configurazione Localizzazione";
 $lang["config_location"] = "Magazzino";
 $lang["config_location_configuration"] = "Locazione Magazzino";
 $lang["config_location_info"] = "Informazioni di Configurazione Posizione";
-$lang["config_login_form"] = "";
+$lang["config_login_form"] = "Stile modulo di accesso";
 $lang["config_logout"] = "Vuoi fare il backup prima di effettuare il logout? Premere [OK] per eseguirlo o [Cancella] per il logout.";
 $lang["config_mailchimp"] = "Mailchimp";
 $lang["config_mailchimp_api_key"] = "Mailchimp API Key";
@@ -214,7 +213,7 @@ $lang["config_msg_src"] = "SMS-API Sender ID";
 $lang["config_msg_src_required"] = "SMS-API Sender ID è un campo obbligatorio";
 $lang["config_msg_uid"] = "SMS-API Username";
 $lang["config_msg_uid_required"] = "SMS-API Username è un campo obbligatorio";
-$lang["config_multi_pack_enabled"] = "";
+$lang["config_multi_pack_enabled"] = "Pacchetti multipli per articolo";
 $lang["config_no_risk"] = "No security/vulnerability risks.";
 $lang["config_none"] = "nessuno";
 $lang["config_notify_alignment"] = "Posizione Popup di Notifica";
@@ -223,10 +222,10 @@ $lang["config_number_locale"] = "Localizzazione";
 $lang["config_number_locale_invalid"] = "La località inserita non è valida. Controlla il link nel tooltip per cercare una località valida.";
 $lang["config_number_locale_required"] = "Numero Località è un campo obbligatorio.";
 $lang["config_number_locale_tooltip"] = "Cerca una Località adatta con questo link.";
-$lang["config_os_timezone"] = "";
-$lang["config_ospos_info"] = "";
+$lang["config_os_timezone"] = "OSPOS fuso orario:";
+$lang["config_ospos_info"] = "Informazioni sull'installazione di OSPOS";
 $lang["config_payment_options_order"] = "Opzioni di Pagamento Ordine";
-$lang["config_perm_risk"] = "Permissions higher than 750 leaves this software at risk.";
+$lang["config_perm_risk"] = "Le autorizzazioni errate lasciano questo software a rischio.";
 $lang["config_phone"] = "Telefono Azienda";
 $lang["config_phone_required"] = "Telefono Aziena è un campo obbligatorio.";
 $lang["config_print_bottom_margin"] = "Margine Inferiore";
@@ -267,14 +266,14 @@ $lang["config_receipt_short"] = "Corto";
 $lang["config_receipt_show_company_name"] = "Mostra Nome Compagnia";
 $lang["config_receipt_show_description"] = "Mostra Descrizione";
 $lang["config_receipt_show_serialnumber"] = "Mostra Numero Seriale";
-$lang["config_receipt_show_tax_ind"] = "";
+$lang["config_receipt_show_tax_ind"] = "Mostra indicatore fiscale";
 $lang["config_receipt_show_taxes"] = "Mostra Imposte";
 $lang["config_receipt_show_total_discount"] = "Mostra Sconto Totale";
 $lang["config_receipt_template"] = "Template Scontrino";
-$lang["config_receiving_calculate_average_price"] = "Calc Prezzo medio (Ricezione)";
+$lang["config_receiving_calculate_average_price"] = "Calcola Prezzo medio (Ricezione)";
 $lang["config_recv_invoice_format"] = "Formato Fattura Acquisto";
 $lang["config_register_mode_default"] = "Modalità Registro Automatico/Default";
-$lang["config_report_an_issue"] = "";
+$lang["config_report_an_issue"] = "Segnala un problema";
 $lang["config_return_policy_required"] = "Politica di Reso è un campo obbligatorio.";
 $lang["config_reward"] = "Raccolta Punti";
 $lang["config_reward_configuration"] = "Configurazione Raccolta Punti";
@@ -313,16 +312,16 @@ $lang["config_tax_category_required"] = "Categoria tassa richiesta.";
 $lang["config_tax_category_used"] = "Categoria Imposta non può essere eliminata perchè è in utilizzo.";
 $lang["config_tax_configuration"] = "Configurazione Imposte";
 $lang["config_tax_decimals"] = "Decimali Imposta";
-$lang["config_tax_id"] = "";
+$lang["config_tax_id"] = "Codice Fiscale";
 $lang["config_tax_included"] = "Imposte incluse";
 $lang["config_theme"] = "Tema";
-$lang["config_theme_preview"] = "";
+$lang["config_theme_preview"] = "Anteprima tema:";
 $lang["config_thousands_separator"] = "Separatore centinaia";
 $lang["config_timezone"] = "Timezone";
-$lang["config_timezone_error"] = "";
+$lang["config_timezone_error"] = "Il fuso orario OSPOS è diverso dal fuso orario locale.";
 $lang["config_top"] = "Sopra";
-$lang["config_use_destination_based_tax"] = "";
-$lang["config_user_timezone"] = "";
+$lang["config_use_destination_based_tax"] = "Usa l'imposta basata sulla destinazione";
+$lang["config_user_timezone"] = "Fuso orario locale:";
 $lang["config_website"] = "Sitoweb";
 $lang["config_wholesale_markup"] = "";
 $lang["config_work_order_enable"] = "Supporto all'ordine (Work Order Support)";

application/language/it/customers_lang.php

@@ -1,8 +1,7 @@
-<?php 
-
+<?php
 $lang["customers_account_number"] = "Codice Fiscale";
 $lang["customers_account_number_duplicate"] = "Il numero dell'account è già presente nel database.";
-$lang["customers_available_points"] = "Punti Disponibili";
+$lang["customers_available_points"] = "Punti Dispnibili";
 $lang["customers_available_points_value"] = "";
 $lang["customers_average"] = "Spesa media";
 $lang["customers_avg_discount"] = "Sconto medio";

application/language/it/enum_lang.php

@@ -1,6 +1,5 @@
-<?php 
-
-$lang["enum_half_down"] = "Half Down";
+<?php
+$lang["enum_half_down"] = "Arrotondamento difetto";
 $lang["enum_half_even"] = "Half Even";
 $lang["enum_half_five"] = "Half Five";
 $lang["enum_half_odd"] = "Half Odd";

application/language/it/error_lang.php

@@ -1,4 +1,3 @@
-<?php 
-
-$lang["error_no_permission_module"] = "Non disponi dei permessi per accedere al seguente modulo";
+<?php
+$lang["error_no_permission_module"] = "Non hai l'autorizzazione per accedere al modulo denominato";
 $lang["error_unknown"] = "Errore sconosciuto";

application/language/it/expenses_categories_lang.php

@@ -1,11 +1,10 @@
-<?php 
-
+<?php
 $lang["category_name_required"] = "E' richiesto il nome per la Categoria Spesa";
 $lang["expenses_categories_add_item"] = "Aggiungi categoria";
 $lang["expenses_categories_cannot_be_deleted"] = "Non puoi eliminare la Categoria Spese";
 $lang["expenses_categories_category_id"] = "Id";
 $lang["expenses_categories_confirm_delete"] = "Sei sicuro di voler eliminare la Categoria Spesa selezionata?";
-$lang["expenses_categories_confirm_restore"] = "";
+$lang["expenses_categories_confirm_restore"] = "Sei sicuro di voler ripristinare la categoria di spesa selezionata?";
 $lang["expenses_categories_description"] = "Descrizione Categoria";
 $lang["expenses_categories_error_adding_updating"] = "Errore aggiungi/aggiorna Categoria Spesa";
 $lang["expenses_categories_info"] = "Info Categoria Spesa";

application/language/it/expenses_lang.php

@@ -1,5 +1,4 @@
-<?php 
-
+<?php
 $lang["expenses_add_item"] = "Aggiungi Spesa";
 $lang["expenses_amount"] = "Importo";
 $lang["expenses_amount_number"] = "Importo deve essere un numero";
@@ -12,8 +11,8 @@ $lang["expenses_categories_name"] = "Categoria";
 $lang["expenses_category_required"] = "Categoria è un campo obbligatorio";
 $lang["expenses_check"] = "Controlla";
 $lang["expenses_check_filter"] = "Controlla";
-$lang["expenses_confirm_delete"] = "Sei sicuro di voler eliminare la Spesa Selezionata?";
-$lang["expenses_confirm_restore"] = "Sei sicuro di voler ripristinare le Spese selezionate?";
+$lang["expenses_confirm_delete"] = "Sei sicuro di voler eliminare le spese selezionate?";
+$lang["expenses_confirm_restore"] = "Sei sicuro di voler ripristinare le spese selezionate?";
 $lang["expenses_credit"] = "Carta di Credito";
 $lang["expenses_credit_filter"] = "Carta di Credito";
 $lang["expenses_date"] = "Data";
@@ -38,7 +37,7 @@ $lang["expenses_no_expenses_to_display"] = "Non ci sono Spese da mostrare";
 $lang["expenses_none_selected"] = "Non hai selezionato alcuna Spesa";
 $lang["expenses_one_or_multiple"] = "Spesa/e";
 $lang["expenses_payment"] = "Tipo di Pagamento";
-$lang["expenses_start_typing_supplier_name"] = "";
+$lang["expenses_start_typing_supplier_name"] = "Inizia a digitare il nome del fornitore...";
 $lang["expenses_successful_adding"] = "Spesa aggiunta correttamente";
 $lang["expenses_successful_deleted"] = "Spesa eliminata correttamente";
 $lang["expenses_successful_updating"] = "Spesa aggiornata correttamente";

application/language/it/item_kits_lang.php

@@ -1,21 +1,20 @@
-<?php 
-
+<?php
 $lang["item_kits_add_item"] = "Aggiungi Articolo";
 $lang["item_kits_all"] = "Tutti";
 $lang["item_kits_cannot_be_deleted"] = "Eliminazione Kit Articolo fallita.";
 $lang["item_kits_confirm_delete"] = "Sei sicuro di voler eliminare i seguenti Kit di Articoli?";
 $lang["item_kits_confirm_restore"] = "Sei sicuro di voler ripristinare i Kit Articolo selezionati?";
 $lang["item_kits_description"] = "Descrizione Kit Articoli";
-$lang["item_kits_discount"] = "";
-$lang["item_kits_discount_fixed"] = "";
+$lang["item_kits_discount"] = "Sconto";
+$lang["item_kits_discount_fixed"] = "Sconto fisso";
 $lang["item_kits_discount_percent"] = "Percentuale Sconto";
-$lang["item_kits_discount_type"] = "";
+$lang["item_kits_discount_type"] = "Tipo sconto";
 $lang["item_kits_error_adding_updating"] = "Aggiunta o modifica Kit Articoli fallita.";
 $lang["item_kits_find_kit_item"] = "Kit Articoli";
 $lang["item_kits_info"] = "Informazioni Kit";
 $lang["item_kits_item"] = "Articolo";
-$lang["item_kits_item_kit_number"] = "";
-$lang["item_kits_item_kit_number_duplicate"] = "";
+$lang["item_kits_item_kit_number"] = "Codice a Barre";
+$lang["item_kits_item_kit_number_duplicate"] = "Il numero del kit dell'articolo è già presente nel database.";
 $lang["item_kits_item_number"] = "";
 $lang["item_kits_item_number_duplicate"] = "";
 $lang["item_kits_items"] = "Articoli";

application/language/it/items_lang.php

@@ -1,5 +1,4 @@
-<?php 
-
+<?php
 $lang["items_add_minus"] = "Inventario da aggiungere o sottrarre.";
 $lang["items_allow_alt_description"] = "Permetti Descrizione alternativa";
 $lang["items_amount_entry"] = "Importo Inserito";
@@ -26,10 +25,10 @@ $lang["items_cost_price_required"] = "Prezzo all'ingrosso è un campo obbligator
 $lang["items_count"] = "Aggiorna Inventario";
 $lang["items_csv_import_failed"] = "Importazione CSV fallita";
 $lang["items_csv_import_nodata_wrongformat"] = "L'upload del file non ha dati o non è formattato correttamente.";
-$lang["items_csv_import_partially_failed"] = "L'importazione di articoli è avvenuta con successo con alcuni fallimenti:";
-$lang["items_csv_import_success"] = "Importazione degli Articoli riuscita.";
+$lang["items_csv_import_partially_failed"] = "Si sono verificati %1 errori di importazione degli elementi nelle righe: %2. Nessuna riga è stata importata.";
+$lang["items_csv_import_success"] = "Importazione CSV dell'articolo riuscita.";
 $lang["items_current_quantity"] = "Quantità Corrente";
-$lang["items_default_pack_name"] = "";
+$lang["items_default_pack_name"] = "Ogni";
 $lang["items_description"] = "Descrizione";
 $lang["items_details_count"] = "Dettagli Conteggio Inventario";
 $lang["items_do_nothing"] = "Nessuna azione";
@@ -40,18 +39,18 @@ $lang["items_empty_upc_items"] = "Svuota Codice a Barre Articoli";
 $lang["items_error_adding_updating"] = "Errore aggiunta/aggiornamento Articoli";
 $lang["items_error_updating_multiple"] = "Errore aggiornamento Articoli";
 $lang["items_generate_barcodes"] = "Genera Codice a Barre";
-$lang["items_hsn_code"] = "";
+$lang["items_hsn_code"] = "Nomenclatura del sistema armonizzato";
 $lang["items_image"] = "Avatar";
 $lang["items_import_items_csv"] = "Importazione Articoli da CSV";
 $lang["items_info_provided_by"] = "Informazioni fornite da";
 $lang["items_inventory"] = "Inventario";
-$lang["items_inventory_CSV_import_quantity"] = "";
+$lang["items_inventory_CSV_import_quantity"] = "Quantità importata da CSV";
 $lang["items_inventory_comments"] = "Commenti";
 $lang["items_inventory_data_tracking"] = "Tracking dei Dati Inventario";
 $lang["items_inventory_date"] = "Data";
 $lang["items_inventory_employee"] = "Impiegato";
 $lang["items_inventory_in_out_quantity"] = "Quantità In/Out";
-$lang["items_inventory_remarks"] = "Remarks";
+$lang["items_inventory_remarks"] = "Osservazioni";
 $lang["items_is_deleted"] = "Eliminato";
 $lang["items_is_printed"] = "";
 $lang["items_is_serialized"] = "L'Articolo ha un Numero Seriale";
@@ -62,7 +61,7 @@ $lang["items_item_number_duplicate"] = "Numero Articolo è già presente nel dat
 $lang["items_kit"] = "Kit";
 $lang["items_location"] = "Posizione";
 $lang["items_low_inventory_items"] = "Articoli Fuori Stock";
-$lang["items_low_sell_item"] = "";
+$lang["items_low_sell_item"] = "Articolo di vendita bassa";
 $lang["items_manually_editing_of_quantity"] = "Modifica manualmente la Quantità";
 $lang["items_markup"] = "";
 $lang["items_name"] = "Nome Articolo";
@@ -74,10 +73,10 @@ $lang["items_none"] = "Nessuno";
 $lang["items_none_selected"] = "Non hai selezionato alcun articolo da modificare";
 $lang["items_nonstock"] = "Non-stockato";
 $lang["items_number_information"] = "Numero Articolo";
-$lang["items_number_required"] = "Il Codice a Barre è un campo obbligatorio.";
+$lang["items_number_required"] = "Il Codice a barre è un campo obbligatorio.";
 $lang["items_one_or_multiple"] = "articolo/i";
-$lang["items_pack_name"] = "";
-$lang["items_qty_per_pack"] = "";
+$lang["items_pack_name"] = "Nome confezione";
+$lang["items_qty_per_pack"] = "Quantità per confezione";
 $lang["items_quantity"] = "Quantità";
 $lang["items_quantity_number"] = "Quantità deve essere un numero.";
 $lang["items_quantity_required"] = "Quantità è un campo richiesto.";
@@ -86,7 +85,7 @@ $lang["items_remove_image"] = "Rimuovi Immagine";
 $lang["items_reorder_level"] = "Livello di Riordino";
 $lang["items_reorder_level_number"] = "Livello di Riordino deve essere un numero.";
 $lang["items_reorder_level_required"] = "Livello di Riordino è un campo richiesto.";
-$lang["items_retrive_item_info"] = "Ottieni Info Articolo";
+$lang["items_retrive_item_info"] = "Recupera le informazioni sull'articolo";
 $lang["items_sales_tax_1"] = "Imposte di vendita";
 $lang["items_sales_tax_2"] = "Imposta di Vendita 2";
 $lang["items_search_attributes"] = "Attributi di ricerca";
@@ -104,12 +103,12 @@ $lang["items_supplier"] = "Fornitore";
 $lang["items_tax_1"] = "Imposta 1";
 $lang["items_tax_2"] = "Imposta 2";
 $lang["items_tax_3"] = "";
-$lang["items_tax_category"] = "";
+$lang["items_tax_category"] = "Categoria fiscale";
 $lang["items_tax_percent"] = "Percentuale Imposta";
 $lang["items_tax_percent_number"] = "Percentuale Imposta deve essere un numero";
 $lang["items_tax_percent_required"] = "Percentuale Imposta è un campo richiesto.";
 $lang["items_tax_percents"] = "Percentuale Imposta(e)";
-$lang["items_temp"] = "";
+$lang["items_temp"] = "Temporanea";
 $lang["items_type"] = "Tipo Articoli";
 $lang["items_unit_price"] = "Prezzo al dettaglio";
 $lang["items_unit_price_number"] = "Prezzo unitario deve essere un numero.";

application/language/it/login_lang.php

@@ -1,13 +1,12 @@
-<?php 
-
+<?php
 $lang["login_gcaptcha"] = "Non sono un robot.";
 $lang["login_go"] = "Go";
-$lang["login_invalid_gcaptcha"] = "Non valido Non sono un robot.";
+$lang["login_invalid_gcaptcha"] = "Verifica di non essere un robot.";
 $lang["login_invalid_installation"] = "L'installazione non è corretta, controlla il tuo file php.ini.";
-$lang["login_invalid_username_and_password"] = "Username or Password non validi.";
+$lang["login_invalid_username_and_password"] = "Username o Password non validi.";
 $lang["login_login"] = "Login";
-$lang["login_logout"] = "";
-$lang["login_migration_needed"] = "";
+$lang["login_logout"] = "Uscita";
+$lang["login_migration_needed"] = "Dopo l'accesso verrà avviata una migrazione del database a %1.";
 $lang["login_password"] = "Password";
 $lang["login_username"] = "Username";
-$lang["login_welcome"] = "";
+$lang["login_welcome"] = "Benvenuto in %1!";

application/language/it/module_lang.php

@@ -1,12 +1,11 @@
-<?php 
-
+<?php
 $lang["module_admin_cashups"] = "";
 $lang["module_admin_cashups_desc"] = "";
-$lang["module_attributes"] = "";
-$lang["module_attributes_desc"] = "";
+$lang["module_attributes"] = "Attributi";
+$lang["module_attributes_desc"] = "Aggiungi, aggiorna, cancella e ricerca attributi.";
 $lang["module_both"] = "Entrambi";
-$lang["module_cashups"] = "";
-$lang["module_cashups_desc"] = "";
+$lang["module_cashups"] = "Incassi";
+$lang["module_cashups_desc"] = "Aggiungi, aggiorna, elimina e cerca incassi.";
 $lang["module_config"] = "Configurazione";
 $lang["module_config_desc"] = "Modifica Configurazione OSPOS.";
 $lang["module_customers"] = "Clienti";

application/language/it/receivings_lang.php

@@ -1,5 +1,4 @@
-<?php 
-
+<?php
 $lang["receivings_amount_due"] = "";
 $lang["receivings_cancel_receiving"] = "Cancella";
 $lang["receivings_cannot_be_deleted"] = "Eliminazione Ricezione(i) fallita.";
@@ -38,9 +37,9 @@ $lang["receivings_register"] = "Articoli Ricevuti";
 $lang["receivings_requisition"] = "Requisizione";
 $lang["receivings_return"] = "Reso";
 $lang["receivings_select_supplier"] = "Seleziona Fornitore (Opzionale)";
-$lang["receivings_ship_pack"] = "";
+$lang["receivings_ship_pack"] = "Imballo";
 $lang["receivings_start_typing_supplier_name"] = "Incomincia a digitare il nome del Fornitore...";
-$lang["receivings_stock"] = "Stock";
+$lang["receivings_stock"] = "Scorta";
 $lang["receivings_stock_destination"] = "Destinazione Stock";
 $lang["receivings_stock_locaiton"] = "Luogo di Stock";
 $lang["receivings_stock_source"] = "Provenienza Stock";

application/language/it/reports_lang.php

@@ -1,7 +1,6 @@
-<?php 
-
+<?php
 $lang["reports_all"] = "Tutti";
-$lang["reports_authority"] = "";
+$lang["reports_authority"] = "Autorità";
 $lang["reports_canceled"] = "Cancellato";
 $lang["reports_categories"] = "Categorie";
 $lang["reports_categories_summary_report"] = "Resoconto riassuntivo Categorie";
@@ -19,7 +18,7 @@ $lang["reports_complete"] = "Vendite completate e Resi";
 $lang["reports_completed_sales"] = "Vendite Completate";
 $lang["reports_confirm_delete"] = "Sei sicuro di voler eliminare la voce(i) selezionata?";
 $lang["reports_confirm_restore"] = "Sei sicuro di voler ripristinare la voce(i) selezionata?";
-$lang["reports_cost"] = "Ingrosso";
+$lang["reports_cost"] = "Vendita all'ingrosso";
 $lang["reports_cost_price"] = "Prezzo Ingrosso";
 $lang["reports_count"] = "Conteggio";
 $lang["reports_customer"] = "Cliente";
@@ -34,9 +33,9 @@ $lang["reports_detailed_reports"] = "Incasso dettagliato";
 $lang["reports_detailed_requisition_report"] = "";
 $lang["reports_detailed_sales_report"] = "Resoconto dettagliato Transazioni";
 $lang["reports_discount"] = "Sconto";
-$lang["reports_discount_fixed"] = "";
+$lang["reports_discount_fixed"] = "Sconto fisso";
 $lang["reports_discount_percent"] = "Percentuale Sconto";
-$lang["reports_discount_type"] = "";
+$lang["reports_discount_type"] = "Tipo di sconto";
 $lang["reports_discounts"] = "Sconti";
 $lang["reports_discounts_summary_report"] = "Resoconto riassuntivo Sconti";
 $lang["reports_earned"] = "Punti Acquisiti";
@@ -67,10 +66,10 @@ $lang["reports_items"] = "Articoli";
 $lang["reports_items_purchased"] = "Articoli acquistati";
 $lang["reports_items_received"] = "Articoli ricevuti";
 $lang["reports_items_summary_report"] = "Resoconto riassuntivo Articoli";
-$lang["reports_jurisdiction"] = "";
+$lang["reports_jurisdiction"] = "Giurisdizione";
 $lang["reports_low_inventory"] = "";
 $lang["reports_low_inventory_report"] = "";
-$lang["reports_low_sell_quantity"] = "";
+$lang["reports_low_sell_quantity"] = "Quantità di vendita minima";
 $lang["reports_more_than_zero"] = "Più di zero";
 $lang["reports_name"] = "Nome";
 $lang["reports_no_reports_to_display"] = "Nessun Articolo da mostrare.";
@@ -105,8 +104,8 @@ $lang["reports_sale_type"] = "Tipo Transazione";
 $lang["reports_sales"] = "Transazioni";
 $lang["reports_sales_amount"] = "Importo Transazioni";
 $lang["reports_sales_summary_report"] = "Resoconto riassuntivo Transazioni";
-$lang["reports_sales_taxes"] = "";
-$lang["reports_sales_taxes_summary_report"] = "";
+$lang["reports_sales_taxes"] = "Imposte di vendita";
+$lang["reports_sales_taxes_summary_report"] = "Riepilogo delle imposte sulle vendite";
 $lang["reports_serial_number"] = "Numero Seriale";
 $lang["reports_service_charge"] = "";
 $lang["reports_sold_by"] = "Venduto da";
@@ -121,25 +120,25 @@ $lang["reports_supplier"] = "Fornitore";
 $lang["reports_suppliers"] = "Fornitori";
 $lang["reports_suppliers_summary_report"] = "Resoconto Riassuntivo Fornitori";
 $lang["reports_tax"] = "Imposte";
-$lang["reports_tax_category"] = "";
-$lang["reports_tax_name"] = "";
+$lang["reports_tax_category"] = "Categoria fiscale";
+$lang["reports_tax_name"] = "Nome Fiscale";
 $lang["reports_tax_percent"] = "Percentuale Imposte";
-$lang["reports_tax_rate"] = "";
+$lang["reports_tax_rate"] = "Aliquota fiscale";
 $lang["reports_taxes"] = "Imposte";
 $lang["reports_taxes_summary_report"] = "Resoconto Riassuntivo Imposte";
 $lang["reports_total"] = "Totale";
 $lang["reports_total_inventory_value"] = "Valore Inventario Totale";
-$lang["reports_total_low_sell_quantity"] = "";
+$lang["reports_total_low_sell_quantity"] = "Quantità totale di vendita bassa";
 $lang["reports_total_quantity"] = "Quantità totale";
 $lang["reports_total_retail"] = "Totale Valore Vendita Inv.";
-$lang["reports_trans_amount"] = "";
-$lang["reports_trans_due"] = "";
-$lang["reports_trans_group"] = "";
-$lang["reports_trans_nopay_sales"] = "";
-$lang["reports_trans_payments"] = "";
-$lang["reports_trans_refunded"] = "";
-$lang["reports_trans_sales"] = "";
-$lang["reports_trans_type"] = "";
+$lang["reports_trans_amount"] = "totale della transazione";
+$lang["reports_trans_due"] = "Dovuto";
+$lang["reports_trans_group"] = "Gruppo di transazione";
+$lang["reports_trans_nopay_sales"] = "Vendite senza pagamento";
+$lang["reports_trans_payments"] = "Pagamenti";
+$lang["reports_trans_refunded"] = "Rimborsato";
+$lang["reports_trans_sales"] = "Saldi";
+$lang["reports_trans_type"] = "Tipo di transazione";
 $lang["reports_type"] = "Tipo";
 $lang["reports_unit_price"] = "Prezzo al dettaglio";
 $lang["reports_used"] = "Punti Usati";

application/language/it/sales_lang.php

@@ -1,6 +1,5 @@
-<?php 
-
-$lang["customers_available_points"] = "Punti Disponibili";
+<?php
+$lang["customers_available_points"] = "Punti Dispnibili";
 $lang["rewards_package"] = "Punti Fedeltà";
 $lang["rewards_remaining_balance"] = "Valore Punti Rimanenti è ";
 $lang["sales_account_number"] = "Account #";
@@ -14,11 +13,11 @@ $lang["sales_cash_1"] = "";
 $lang["sales_cash_2"] = "";
 $lang["sales_cash_3"] = "";
 $lang["sales_cash_4"] = "";
-$lang["sales_cash_adjustment"] = "";
+$lang["sales_cash_adjustment"] = "Adeguamento in contanti";
 $lang["sales_cash_deposit"] = "Deposito Contanti";
 $lang["sales_cash_filter"] = "Contanti";
 $lang["sales_change_due"] = "Resto Dovuto";
-$lang["sales_change_price"] = "";
+$lang["sales_change_price"] = "Cambio prezzo di vendita";
 $lang["sales_check"] = "Assegno";
 $lang["sales_check_balance"] = "Promemoria Assegno";
 $lang["sales_check_filter"] = "Assegno";
@@ -33,7 +32,7 @@ $lang["sales_confirm_delete"] = "Sei sicuro di voler eliminare la vendita selezi
 $lang["sales_confirm_restore"] = "Sei sicuro di voler ripristinare la vendita selezionata?";
 $lang["sales_credit"] = "Carta di Credito";
 $lang["sales_credit_deposit"] = "Deposito Credito";
-$lang["sales_credit_filter"] = "";
+$lang["sales_credit_filter"] = "Carta di credito";
 $lang["sales_current_table"] = "";
 $lang["sales_customer"] = "Nome";
 $lang["sales_customer_address"] = "Indirizzo";
@@ -80,7 +79,7 @@ $lang["sales_giftcard_filter"] = "";
 $lang["sales_giftcard_number"] = "Numero Carta Regalo";
 $lang["sales_group_by_category"] = "Raggruppa per Categoria";
 $lang["sales_group_by_type"] = "Raggruppa per Tipo";
-$lang["sales_hsn"] = "";
+$lang["sales_hsn"] = "HSN";
 $lang["sales_id"] = "ID vendita";
 $lang["sales_include_prices"] = "Includi i prezzi?";
 $lang["sales_invoice"] = "Fattura";
@@ -102,25 +101,25 @@ $lang["sales_item_insufficient_of_stock"] = "L'articolo non ha un magazzino suff
 $lang["sales_item_name"] = "Nome Articolo";
 $lang["sales_item_number"] = "Articolo #";
 $lang["sales_item_out_of_stock"] = "Articolo fuori stock.";
-$lang["sales_key_browser"] = "";
+$lang["sales_key_browser"] = "Scorciatoie utili";
 $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_quote"] = "Termina Preventivo/Fattura senza pagamento";
 $lang["sales_key_finish_sale"] = "Add Payment and Complete Invoice/Sale";
-$lang["sales_key_full"] = "";
+$lang["sales_key_full"] = "Apri in modalità a schermo intero";
 $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_in"] = "Ingrandire";
 $lang["sales_key_item_search"] = "Item Search";
-$lang["sales_key_out"] = "";
+$lang["sales_key_out"] = "Rimpicciolisci";
 $lang["sales_key_payment"] = "Add Payment";
-$lang["sales_key_print"] = "";
-$lang["sales_key_restore"] = "";
-$lang["sales_key_search"] = "";
+$lang["sales_key_print"] = "Stampa pagina corrente";
+$lang["sales_key_restore"] = "Ripristina visualizzazione/zoom originale";
+$lang["sales_key_search"] = "Tabelle dei rapporti di ricerca";
 $lang["sales_key_suspend"] = "Suspend Current Sale";
 $lang["sales_key_suspended"] = "Show Suspended Sales";
-$lang["sales_key_system"] = "";
+$lang["sales_key_system"] = "Scorciatoie di sistema";
 $lang["sales_key_tendered"] = "Edit Amount Tendered";
 $lang["sales_key_title"] = "Sales Keyboard Shortcuts";
 $lang["sales_mc"] = "";
@@ -134,7 +133,7 @@ $lang["sales_no_filter"] = "Tutti";
 $lang["sales_no_items_in_cart"] = "Non ci sono Articoli nel carrello.";
 $lang["sales_no_sales_to_display"] = "Nessuna Vendita da mostrare.";
 $lang["sales_none_selected"] = "Non hai selezionato alcuna vendita da cancellare.";
-$lang["sales_nontaxed_ind"] = "";
+$lang["sales_nontaxed_ind"] = " vendita non tassata ";
 $lang["sales_not_authorized"] = "Questa azione non può essere autorizzata.";
 $lang["sales_one_or_multiple"] = "Vendita/e";
 $lang["sales_payment"] = "Tipo di pagamento";
@@ -159,7 +158,7 @@ $lang["sales_receipt_no_email"] = "Questo cliente non ha un'email valida.";
 $lang["sales_receipt_number"] = "Vendita #";
 $lang["sales_receipt_sent"] = "Scontrino inviato a";
 $lang["sales_receipt_unsent"] = "Scontrino fallito da inviare a";
-$lang["sales_refund"] = "";
+$lang["sales_refund"] = "Tipo di rimborso";
 $lang["sales_register"] = "Registrazione Vendita";
 $lang["sales_remove_customer"] = "Rimuovi Cliente";
 $lang["sales_remove_discount"] = "";
@@ -201,11 +200,11 @@ $lang["sales_tax"] = "Imposte";
 $lang["sales_tax_id"] = "ID Imposta";
 $lang["sales_tax_invoice"] = "Fattura d'Imposta";
 $lang["sales_tax_percent"] = "Imposte %";
-$lang["sales_taxed_ind"] = "";
+$lang["sales_taxed_ind"] = "T";
 $lang["sales_total"] = "Totale";
 $lang["sales_total_tax_exclusive"] = "Imposte escluse";
 $lang["sales_transaction_failed"] = "Transazione di Vendita fallita.";
-$lang["sales_unable_to_add_item"] = "Aggiunta Articoli alla vendita fallita";
+$lang["sales_unable_to_add_item"] = "Aggiunta articolo alla vendita non riuscita";
 $lang["sales_unsuccessfully_deleted"] = "Eliminazione Vendita/e fallita.";
 $lang["sales_unsuccessfully_restored"] = "Ripristino Vendita/e fallita.";
 $lang["sales_unsuccessfully_suspended_sale"] = "Vendita sospesa fallita.";
@@ -213,7 +212,7 @@ $lang["sales_unsuccessfully_updated"] = "Aggiornamento Vendita fallito.";
 $lang["sales_unsuspend"] = "Non-sospeso";
 $lang["sales_unsuspend_and_delete"] = "Azione";
 $lang["sales_update"] = "Aggiorna";
-$lang["sales_upi"] = "";
+$lang["sales_upi"] = "UPI";
 $lang["sales_visa"] = "";
 $lang["sales_wholesale"] = "";
 $lang["sales_work_order"] = "Ordine di Lavoro";

application/language/it/taxes_lang.php

@@ -1,22 +1,21 @@
-<?php 
-
+<?php
 $lang["taxes_add_exception"] = "Aggiungi Eccezione";
-$lang["taxes_cascade"] = "";
-$lang["taxes_cascade_sequence"] = "";
-$lang["taxes_city"] = "";
-$lang["taxes_code"] = "";
-$lang["taxes_confirm_delete"] = "Sei sicuro che vuoi eliminare questo Codice Imposta? Questa operazione non può essere annullata.";
+$lang["taxes_cascade"] = "Cascata";
+$lang["taxes_cascade_sequence"] = "Sequenza a cascata (Verificare corretta dicitura)";
+$lang["taxes_city"] = "Città";
+$lang["taxes_code"] = "Codice";
+$lang["taxes_confirm_delete"] = "Sei sicuro di voler eliminare questo Codice Fiscale? Questa azione non può essere annullata";
 $lang["taxes_confirm_restore"] = "Sei sicuro di voler ripristinare i Codice Tassa selezionati?";
 $lang["taxes_default_tax_category"] = "Categoria Imposta Default";
-$lang["taxes_default_tax_rate"] = "";
-$lang["taxes_error_adding_updating"] = "Codice Imposta aggiunto o aggiornamento Fallito.";
-$lang["taxes_group_seq"] = "";
-$lang["taxes_jurisdiction_name"] = "";
-$lang["taxes_name"] = "";
+$lang["taxes_default_tax_rate"] = "Tassazione predefinita";
+$lang["taxes_error_adding_updating"] = "Aggiunta o modifica Codice Fiscale Fallito";
+$lang["taxes_group_seq"] = "Gruppo Seq";
+$lang["taxes_jurisdiction_name"] = "Nome giurisdizione";
+$lang["taxes_name"] = "Nome";
 $lang["taxes_new"] = "Nuovo Codice Imposta";
 $lang["taxes_no_taxes"] = "";
-$lang["taxes_no_taxes_to_display"] = "Nessun Codice Imposta disponibile da mostrare.";
-$lang["taxes_reporting_authority"] = "";
+$lang["taxes_no_taxes_to_display"] = "Nessun codice fiscale disponibile da visualizzare";
+$lang["taxes_reporting_authority"] = "Autorità di segnalazione";
 $lang["taxes_round_half_down"] = "Arrotonda in difetto";
 $lang["taxes_round_half_even"] = "Arrotonda Half Even";
 $lang["taxes_round_half_odd"] = "Arrotonda Half Odd";
@@ -24,58 +23,58 @@ $lang["taxes_round_half_up"] = "Arrotonda in eccesso";
 $lang["taxes_rounding_code"] = "Codice arrotondamento";
 $lang["taxes_sales_tax"] = "Imposte di vendita";
 $lang["taxes_sales_tax_by_invoice"] = "Imposte Fattura";
-$lang["taxes_sequence"] = "";
-$lang["taxes_state"] = "";
+$lang["taxes_sequence"] = "Seq. tasse";
+$lang["taxes_state"] = "Stato";
 $lang["taxes_successful_deleted"] = "Eliminato correttamente";
-$lang["taxes_tax_categories"] = "";
-$lang["taxes_tax_categories_configuration"] = "";
-$lang["taxes_tax_categories_saved_successfully"] = "";
-$lang["taxes_tax_categories_saved_unsuccessfully"] = "";
+$lang["taxes_tax_categories"] = "Categoria tassa";
+$lang["taxes_tax_categories_configuration"] = "Configurazione categoria tassa";
+$lang["taxes_tax_categories_saved_successfully"] = "Modifiche alle categorie fiscali salvate";
+$lang["taxes_tax_categories_saved_unsuccessfully"] = "Modifiche alle categorie fiscali non salvate";
 $lang["taxes_tax_category"] = "Categoria Imposta";
-$lang["taxes_tax_category_code"] = "";
-$lang["taxes_tax_category_duplicate"] = "";
-$lang["taxes_tax_category_invalid_chars"] = "";
-$lang["taxes_tax_category_name"] = "";
-$lang["taxes_tax_category_new"] = "";
-$lang["taxes_tax_category_required"] = "";
+$lang["taxes_tax_category_code"] = "Codice categoria fiscale";
+$lang["taxes_tax_category_duplicate"] = "Duplica categoria fiscale";
+$lang["taxes_tax_category_invalid_chars"] = "Caratteri non validi nel nome della categoria fiscale";
+$lang["taxes_tax_category_name"] = "Nome della categoria fiscale";
+$lang["taxes_tax_category_new"] = "Nuova imposta fiscale";
+$lang["taxes_tax_category_required"] = "Categoria fiscale richiesta";
 $lang["taxes_tax_code"] = "Codice Imposta";
-$lang["taxes_tax_code_cannot_be_deleted"] = "Eliminazione Codice Imposta Fallito.";
-$lang["taxes_tax_code_duplicate"] = "";
-$lang["taxes_tax_code_invalid_chars"] = "";
+$lang["taxes_tax_code_cannot_be_deleted"] = "Eliminazione codice fiscale non riuscita";
+$lang["taxes_tax_code_duplicate"] = "Codice fiscale duplicato";
+$lang["taxes_tax_code_invalid_chars"] = "Caratteri non validi nel codice fiscale";
 $lang["taxes_tax_code_name"] = "Nome Codice Imposta";
-$lang["taxes_tax_code_required"] = "Campo Codice Imposta richiesto.";
+$lang["taxes_tax_code_required"] = "Codice Fiscale è un campo obbligatorio";
 $lang["taxes_tax_code_successful_deleted"] = "Hai eliminato con successo Codice Imposta";
 $lang["taxes_tax_code_successful_updated"] = "Aggiornato correttamente";
 $lang["taxes_tax_code_successful_updating"] = "Codice Imposta aggiornato correttamente";
 $lang["taxes_tax_code_successfully_added"] = "Aggiunto correttamente";
 $lang["taxes_tax_code_type"] = "Tipo Codice Imposta";
-$lang["taxes_tax_codes"] = "";
-$lang["taxes_tax_codes_configuration"] = "";
-$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"] = "";
-$lang["taxes_tax_jurisdiction_duplicate"] = "";
-$lang["taxes_tax_jurisdiction_invalid_chars"] = "";
-$lang["taxes_tax_jurisdiction_required"] = "";
-$lang["taxes_tax_jurisdictions"] = "";
-$lang["taxes_tax_jurisdictions_configuration"] = "";
-$lang["taxes_tax_jurisdictions_saved_successfully"] = "";
-$lang["taxes_tax_jurisdictions_saved_unsuccessfully"] = "";
+$lang["taxes_tax_codes"] = "Codici Fiscale";
+$lang["taxes_tax_codes_configuration"] = "Configurazione Codici Fiscale";
+$lang["taxes_tax_codes_saved_successfully"] = "Modifiche al codice fiscale salvate";
+$lang["taxes_tax_codes_saved_unsuccessfully"] = "Modifiche al codice fiscale non salvate";
+$lang["taxes_tax_excluded"] = "Tasse escluse";
+$lang["taxes_tax_group"] = "Gruppo fiscale";
+$lang["taxes_tax_group_not_unique"] = "Il gruppo fiscale %1 non è univoco";
+$lang["taxes_tax_group_sequence"] = "Sequenza gruppo fiscale";
+$lang["taxes_tax_included"] = "Tasse incluse";
+$lang["taxes_tax_jurisdiction"] = "Giurisdizione tributaria";
+$lang["taxes_tax_jurisdiction_duplicate"] = "Doppia giurisdizione fiscale";
+$lang["taxes_tax_jurisdiction_invalid_chars"] = "Caratteri non validi nel nome della giurisdizione";
+$lang["taxes_tax_jurisdiction_required"] = "È richiesta la giurisdizione fiscale";
+$lang["taxes_tax_jurisdictions"] = "Giurisdizioni fiscali";
+$lang["taxes_tax_jurisdictions_configuration"] = "Configurazione delle giurisdizioni fiscali";
+$lang["taxes_tax_jurisdictions_saved_successfully"] = "Modifiche alla giurisdizione fiscale salvate";
+$lang["taxes_tax_jurisdictions_saved_unsuccessfully"] = "Modifiche alla giurisdizione fiscale non salvate";
 $lang["taxes_tax_rate"] = "Tasso di Imposta";
-$lang["taxes_tax_rate_configuration"] = "";
-$lang["taxes_tax_rate_error_adding_updating"] = "";
-$lang["taxes_tax_rate_numeric"] = "Tasso di Imposta deve essere numerico.";
-$lang["taxes_tax_rate_required"] = "Il campo Imposta di Rata è richiesto.";
-$lang["taxes_tax_rate_successful_updated"] = "";
-$lang["taxes_tax_rate_successfully_added"] = "";
-$lang["taxes_tax_rates"] = "";
-$lang["taxes_tax_rates_configuration"] = "";
-$lang["taxes_tax_rounding"] = "";
-$lang["taxes_tax_type"] = "";
+$lang["taxes_tax_rate_configuration"] = "Configurazione dell'aliquota fiscale";
+$lang["taxes_tax_rate_error_adding_updating"] = "Aggiunta o aggiornamento dell'aliquota fiscale non riuscita";
+$lang["taxes_tax_rate_numeric"] = "L'aliquota fiscale deve essere un numero";
+$lang["taxes_tax_rate_required"] = "L'aliquota fiscale è un campo obbligatorio";
+$lang["taxes_tax_rate_successful_updated"] = "Hai aggiornato con successo";
+$lang["taxes_tax_rate_successfully_added"] = "Hai aggiunto con successo";
+$lang["taxes_tax_rates"] = "Aliquote fiscali";
+$lang["taxes_tax_rates_configuration"] = "Configurazione delle aliquote fiscali";
+$lang["taxes_tax_rounding"] = "Arrotondamento delle tasse";
+$lang["taxes_tax_type"] = "Tipo Imposta";
 $lang["taxes_update"] = "Aggiorna Imposta Categoria";
 $lang["taxes_vat_tax"] = "IVA";

application/language/nl/common_lang.php

@@ -1,5 +1,4 @@
-<?php 
-
+<?php
 $lang["common_address_1"] = "Adres 1";
 $lang["common_address_2"] = "Adres 2";
 $lang["common_admin"] = "";
@@ -33,7 +32,7 @@ $lang["common_gender"] = "Geslacht";
 $lang["common_gender_female"] = "V";
 $lang["common_gender_male"] = "M";
 $lang["common_gender_undefined"] = "";
-$lang["common_icon"] = "Icoon";
+$lang["common_icon"] = "Pictogram";
 $lang["common_id"] = "ID";
 $lang["common_import"] = "Importeren";
 $lang["common_import_change_file"] = "Wijzigen";

application/language/pl/attributes_lang.php

@@ -1,31 +1,30 @@
-<?php 
-
+<?php
 $lang["attributes_attribute_value_invalid_chars"] = "Wartość atrybutu nie może zawierać'_' lub '|'";
-$lang["attributes_confirm_delete"] = "";
-$lang["attributes_confirm_restore"] = "";
-$lang["attributes_definition_cannot_be_deleted"] = "";
-$lang["attributes_definition_error_adding_updating"] = "";
-$lang["attributes_definition_flags"] = "";
-$lang["attributes_definition_group"] = "";
-$lang["attributes_definition_id"] = "";
-$lang["attributes_definition_name"] = "";
-$lang["attributes_definition_name_required"] = "";
-$lang["attributes_definition_one_or_multiple"] = "";
-$lang["attributes_definition_successful_adding"] = "";
-$lang["attributes_definition_successful_deleted"] = "";
-$lang["attributes_definition_successful_updating"] = "";
-$lang["attributes_definition_type"] = "";
-$lang["attributes_definition_type_required"] = "";
-$lang["attributes_definition_unit"] = "";
-$lang["attributes_definition_values"] = "";
-$lang["attributes_new"] = "";
-$lang["attributes_no_attributes_to_display"] = "";
-$lang["attributes_receipt_visibility"] = "";
-$lang["attributes_show_in_items"] = "";
-$lang["attributes_show_in_items_visibility"] = "";
-$lang["attributes_show_in_receipt"] = "";
-$lang["attributes_show_in_receivings"] = "";
-$lang["attributes_show_in_receivings_visibility"] = "";
-$lang["attributes_show_in_sales"] = "";
-$lang["attributes_show_in_sales_visibility"] = "";
-$lang["attributes_update"] = "";
+$lang["attributes_confirm_delete"] = "Czy jesteś pewny, że chcesz usunąć wybrane atrybuty?";
+$lang["attributes_confirm_restore"] = "Czy jesteś pewien, że chcesz przywrócić zaznaczone atrybuty?";
+$lang["attributes_definition_cannot_be_deleted"] = "Nie można usunąć wybranych atrybutów";
+$lang["attributes_definition_error_adding_updating"] = "Atrybut 51 nie może zostać dodany lub zaktualizowany. Sprawdź dziennik błędów.";
+$lang["attributes_definition_flags"] = "Widoczność atrybutu";
+$lang["attributes_definition_group"] = "Grupa";
+$lang["attributes_definition_id"] = "Id";
+$lang["attributes_definition_name"] = "Dodaj atrybut";
+$lang["attributes_definition_name_required"] = "Nazwa atrybutu jest wymagana";
+$lang["attributes_definition_one_or_multiple"] = "atrybut(y)";
+$lang["attributes_definition_successful_adding"] = "Pomyślnie dodano element";
+$lang["attributes_definition_successful_deleted"] = "Pomyślnie usunięto";
+$lang["attributes_definition_successful_updating"] = "Pomyślnie zaktualizowano atrybut";
+$lang["attributes_definition_type"] = "Typ atrybutu";
+$lang["attributes_definition_type_required"] = "Typ atrybutu jest wymagany";
+$lang["attributes_definition_unit"] = "Jednostka miary";
+$lang["attributes_definition_values"] = "Wartość atrybutu";
+$lang["attributes_new"] = "Nowy atrybut";
+$lang["attributes_no_attributes_to_display"] = "Brak elementów do wyświetlenia";
+$lang["attributes_receipt_visibility"] = "Paragon";
+$lang["attributes_show_in_items"] = "Pokaż w produktach";
+$lang["attributes_show_in_items_visibility"] = "Produkty";
+$lang["attributes_show_in_receipt"] = "Pokaż w paragonie";
+$lang["attributes_show_in_receivings"] = "Pokaż w dostawach";
+$lang["attributes_show_in_receivings_visibility"] = "Dostawy";
+$lang["attributes_show_in_sales"] = "Pokaż w sprzedażach";
+$lang["attributes_show_in_sales_visibility"] = "Sprzedaże";
+$lang["attributes_update"] = "Zaktualizuj atrybut";

application/language/pl/bootstrap_tables_lang.php

@@ -1,10 +1,9 @@
-<?php 
-
+<?php
 $lang["tables_all"] = "wszystko";
-$lang["tables_columns"] = "";
-$lang["tables_hide_show_pagination"] = "";
-$lang["tables_loading"] = "";
-$lang["tables_page_from_to"] = "";
-$lang["tables_refresh"] = "";
-$lang["tables_rows_per_page"] = "";
-$lang["tables_toggle"] = "";
+$lang["tables_columns"] = "Kolumny";
+$lang["tables_hide_show_pagination"] = "Ukryj/pokaż paginację";
+$lang["tables_loading"] = "Ładowanie, proszę czekać...";
+$lang["tables_page_from_to"] = "Pokazuję od {0} do {1} z {2} wierszy";
+$lang["tables_refresh"] = "Odśwież";
+$lang["tables_rows_per_page"] = "{0} wierszy na stronę";
+$lang["tables_toggle"] = "Włącz";

application/language/pl/common_lang.php

@@ -1,87 +1,86 @@
-<?php 
-
-$lang["common_address_1"] = "Address 1";
-$lang["common_address_2"] = "Address 2";
+<?php
+$lang["common_address_1"] = "Adres 1";
+$lang["common_address_2"] = "Adres 2";
 $lang["common_admin"] = "";
-$lang["common_city"] = "City";
+$lang["common_city"] = "Miasto";
 $lang["common_clerk"] = "";
-$lang["common_close"] = "Close";
+$lang["common_close"] = "Zamknij";
 $lang["common_color"] = "";
-$lang["common_comments"] = "Comments";
+$lang["common_comments"] = "Komentarze";
 $lang["common_common"] = "common";
-$lang["common_confirm_search"] = "You have selected one or more rows, these will no longer be selected after your search. Are you sure you want to submit this search?";
+$lang["common_confirm_search"] = "Zaznaczyłeś jeden lub więcej wierszy, nie będą dalej zaznaczone po wyszukaniu. Czy jesteś pewien, że chcesz zatwierdzić to wyszukiwanie?";
 $lang["common_copyrights"] = "© 2010 - %1";
-$lang["common_correct_errors"] = "";
-$lang["common_country"] = "Country";
+$lang["common_correct_errors"] = "Proszę poprawić zidentyfikowane błędy przed zapisaniem";
+$lang["common_country"] = "Kraj";
 $lang["common_dashboard"] = "";
-$lang["common_date"] = "Date";
-$lang["common_delete"] = "Delete";
-$lang["common_det"] = "details";
-$lang["common_download_import_template"] = "Download Import CSV Template (CSV)";
-$lang["common_edit"] = "edit";
+$lang["common_date"] = "Data";
+$lang["common_delete"] = "Usuń";
+$lang["common_det"] = "szczegóły";
+$lang["common_download_import_template"] = "Pobierz szablon importu pliku CSV (.CSV)";
+$lang["common_edit"] = "edytuj";
 $lang["common_email"] = "Email";
-$lang["common_email_invalid_format"] = "The email address is not in the correct format.";
-$lang["common_export_csv"] = "CSV Export";
-$lang["common_export_csv_no"] = "No";
-$lang["common_export_csv_yes"] = "Yes";
-$lang["common_fields_required_message"] = "Fields in red are required";
+$lang["common_email_invalid_format"] = "Adres email nie jest w poprawnym formacie.";
+$lang["common_export_csv"] = "Eksportuj plik CSV";
+$lang["common_export_csv_no"] = "Nie";
+$lang["common_export_csv_yes"] = "Tak";
+$lang["common_fields_required_message"] = "Czerwone pola są wymagane";
 $lang["common_fields_required_message_unique"] = "";
-$lang["common_first_name"] = "First Name";
-$lang["common_first_name_required"] = "First Name is a required field.";
-$lang["common_first_page"] = "First";
-$lang["common_gender"] = "Gender";
-$lang["common_gender_female"] = "F";
-$lang["common_gender_male"] = "M";
+$lang["common_first_name"] = "Imię";
+$lang["common_first_name_required"] = "Imię jest wymagane.";
+$lang["common_first_page"] = "Pierwszy";
+$lang["common_gender"] = "Płeć";
+$lang["common_gender_female"] = "Kobieta";
+$lang["common_gender_male"] = "Mężczyzna";
 $lang["common_gender_undefined"] = "";
-$lang["common_icon"] = "";
-$lang["common_id"] = "Id";
-$lang["common_import"] = "Import";
-$lang["common_import_change_file"] = "Change";
-$lang["common_import_csv"] = "CSV Import";
-$lang["common_import_full_path"] = "Full path to csv file required";
-$lang["common_import_remove_file"] = "Remove";
-$lang["common_import_select_file"] = "Select file";
-$lang["common_inv"] = "inv";
-$lang["common_last_name"] = "Last Name";
-$lang["common_last_name_required"] = "Last Name is a required field.";
-$lang["common_last_page"] = "Last";
-$lang["common_learn_about_project"] = "to learn the latest information about the project.";
-$lang["common_list_of"] = "List of";
-$lang["common_logo"] = "";
-$lang["common_logo_mark"] = "";
+$lang["common_icon"] = "Ikona";
+$lang["common_id"] = "ID";
+$lang["common_import"] = "Importuj";
+$lang["common_import_change_file"] = "Zmień";
+$lang["common_import_csv"] = "Importuj plik CSV";
+$lang["common_import_full_path"] = "Wymagana jest pełna ścieżka do pliku CSV";
+$lang["common_import_remove_file"] = "Usuń";
+$lang["common_import_select_file"] = "Wybierz plik";
+$lang["common_inv"] = "faktura";
+$lang["common_last_name"] = "Nazwisko";
+$lang["common_last_name_required"] = "Nazwisko jest wymaganym polem.";
+$lang["common_last_page"] = "Ostatni";
+$lang["common_learn_about_project"] = "aby dowiedzieć się najważniejszych informacji o projekcie.";
+$lang["common_list_of"] = "Lista";
+$lang["common_logo"] = "Logo";
+$lang["common_logo_mark"] = "Znak";
 $lang["common_logout"] = "Logout";
 $lang["common_manager"] = "";
 $lang["common_migration_needed"] = "A database migration to %1 will start after login.";
-$lang["common_new"] = "New";
+$lang["common_new"] = "Nowy";
 $lang["common_no"] = "";
-$lang["common_no_persons_to_display"] = "There are no people to display.";
-$lang["common_none_selected_text"] = "[Select]";
-$lang["common_or"] = "OR";
+$lang["common_no_persons_to_display"] = "Nie ma osób do wyświetlenia.";
+$lang["common_none_selected_text"] = "[Wybierz]";
+$lang["common_or"] = "LUB";
 $lang["common_people"] = "";
-$lang["common_phone_number"] = "Phone Number";
+$lang["common_phone_number"] = "Numer telefonu";
 $lang["common_phone_number_required"] = "";
-$lang["common_please_visit_my"] = "Please visit the";
+$lang["common_please_visit_my"] = "Proszę odwiedzić";
 $lang["common_position"] = "";
-$lang["common_powered_by"] = "Powered by";
-$lang["common_price"] = "Price";
-$lang["common_print"] = "Print";
-$lang["common_remove"] = "Remove";
-$lang["common_required"] = "Required";
-$lang["common_restore"] = "Restore";
-$lang["common_return_policy"] = "Return Policy";
-$lang["common_search"] = "Search";
-$lang["common_search_options"] = "Search options";
-$lang["common_searched_for"] = "Searched for";
-$lang["common_software_short"] = "";
-$lang["common_software_title"] = "";
-$lang["common_state"] = "State";
-$lang["common_submit"] = "Submit";
-$lang["common_total_spent"] = "Total Spent";
-$lang["common_unknown"] = "Unknown";
-$lang["common_view_recent_sales"] = "View Recent Sales";
-$lang["common_website"] = "website";
-$lang["common_welcome"] = "Welcome";
-$lang["common_welcome_message"] = "Welcome to OSPOS, click a module below to get started.";
+$lang["common_powered_by"] = "Wspierane przez";
+$lang["common_price"] = "Cena";
+$lang["common_print"] = "Wydrukuj";
+$lang["common_remove"] = "Usuń";
+$lang["common_required"] = "Wymagane";
+$lang["common_restore"] = "Przywróć";
+$lang["common_return_policy"] = "Polityka zwrotów";
+$lang["common_search"] = "Szukaj";
+$lang["common_search_options"] = "Opcje wyszukiwania";
+$lang["common_searched_for"] = "Szukano";
+$lang["common_software_short"] = "OSPOS";
+$lang["common_software_title"] = "Otwarto źródłowy punkt sprzedaży";
+$lang["common_state"] = "Status";
+$lang["common_submit"] = "Wyślij";
+$lang["common_total_spent"] = "Całkowite wydatki";
+$lang["common_unknown"] = "Nieznany";
+$lang["common_view_recent_sales"] = "Wyświetl ostatnie sprzedaże";
+$lang["common_website"] = "opensourcepos.org";
+$lang["common_welcome"] = "Witamy";
+$lang["common_welcome_message"] = "Witamy w OSPOS, kliknij moduł, aby rozpocząć.";
 $lang["common_yes"] = "";
 $lang["common_you_are_using_ospos"] = "You are using Open Source Point Of Sale version";
-$lang["common_zip"] = "Postal Code";
+$lang["common_zip"] = "Kod pocztowy";

application/language/pl/datepicker_lang.php

@@ -1,5 +1,4 @@
-<?php 
-
+<?php
 $lang["datepicker_all_time"] = "Cały czas";
 $lang["datepicker_apply"] = "Zastosuj";
 $lang["datepicker_cancel"] = "Anuluj";
@@ -11,12 +10,12 @@ $lang["datepicker_last_financial_year"] = "Ostatni rok fiskalny";
 $lang["datepicker_last_month"] = "Ostatni miesiąc";
 $lang["datepicker_last_year"] = "Ostatni rok";
 $lang["datepicker_same_month_last_year"] = "Ten sam miesiąc w zeszłym roku";
-$lang["datepicker_same_month_to_same_day_last_year"] = "";
-$lang["datepicker_this_financial_year"] = "";
-$lang["datepicker_this_month"] = "";
-$lang["datepicker_this_year"] = "";
-$lang["datepicker_to"] = "";
-$lang["datepicker_today"] = "";
-$lang["datepicker_today_last_year"] = "";
-$lang["datepicker_weekstart"] = "";
-$lang["datepicker_yesterday"] = "";
+$lang["datepicker_same_month_to_same_day_last_year"] = "Ten sam dzień w tym samym miesiącu rok temu";
+$lang["datepicker_this_financial_year"] = "Obecny rok fiskalny";
+$lang["datepicker_this_month"] = "Obecny miesiąc";
+$lang["datepicker_this_year"] = "Obecny rok";
+$lang["datepicker_to"] = "Do";
+$lang["datepicker_today"] = "Dzisiaj";
+$lang["datepicker_today_last_year"] = "Dzisiaj rok temu";
+$lang["datepicker_weekstart"] = "0";
+$lang["datepicker_yesterday"] = "Wczoraj";

application/language/pl/error_lang.php

@@ -1,4 +1,3 @@
-<?php 
-
-$lang["error_no_permission_module"] = "";
-$lang["error_unknown"] = "";
+<?php
+$lang["error_no_permission_module"] = "Nie masz dostępu do modułu";
+$lang["error_unknown"] = "Niespodziewany błąd";

application/language/pl/giftcards_lang.php

@@ -1,8 +1,7 @@
-<?php 
-
+<?php
 $lang["giftcards_add_minus"] = "";
-$lang["giftcards_allow_alt_description"] = "";
-$lang["giftcards_bulk_edit"] = "";
+$lang["giftcards_allow_alt_description"] = "Zezwól na alternatywny opis";
+$lang["giftcards_bulk_edit"] = "Edycja zbiorcza";
 $lang["giftcards_cannot_be_deleted"] = "";
 $lang["giftcards_cannot_find_giftcard"] = "";
 $lang["giftcards_cannot_use"] = "";

application/language/pl/login_lang.php

@@ -1,13 +1,12 @@
-<?php 
-
+<?php
 $lang["login_gcaptcha"] = "Nie jestem robotem.";
-$lang["login_go"] = "";
-$lang["login_invalid_gcaptcha"] = "";
-$lang["login_invalid_installation"] = "";
-$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"] = "";
+$lang["login_go"] = "Idź";
+$lang["login_invalid_gcaptcha"] = "Udowodnij, że nie jesteś robotem.";
+$lang["login_invalid_installation"] = "Instalacja nie jest poprawna, sprawdź swój plik php.ini.";
+$lang["login_invalid_username_and_password"] = "Niepoprawna nazwa użytkownika i/lub hasło.";
+$lang["login_login"] = "Zaloguj";
+$lang["login_logout"] = "Wyloguj";
+$lang["login_migration_needed"] = "Migracja bazy danych do %1 zacznie się po zalogowaniu.";
+$lang["login_password"] = "Hasło";
+$lang["login_username"] = "Nazwa użytkownika";
+$lang["login_welcome"] = "Witaj w %1!";

application/language/pl/messages_lang.php

@@ -1,14 +1,13 @@
-<?php 
-
+<?php
 $lang["messages_first_name"] = "Pierwsze imię";
-$lang["messages_last_name"] = "";
-$lang["messages_message"] = "";
-$lang["messages_message_placeholder"] = "";
-$lang["messages_message_required"] = "";
-$lang["messages_multiple_phones"] = "";
-$lang["messages_phone"] = "";
-$lang["messages_phone_number_required"] = "";
-$lang["messages_phone_placeholder"] = "";
-$lang["messages_sms_send"] = "";
-$lang["messages_successfully_sent"] = "";
-$lang["messages_unsuccessfully_sent"] = "";
+$lang["messages_last_name"] = "Nazwisko";
+$lang["messages_message"] = "Wiadomość";
+$lang["messages_message_placeholder"] = "Twoja wiadomość tutaj...";
+$lang["messages_message_required"] = "Wiadomość wymagana";
+$lang["messages_multiple_phones"] = "(W przypadku wielu odbiorców, wpisz numery telefonów oddzielone przecinkami)";
+$lang["messages_phone"] = "Numer telefonu";
+$lang["messages_phone_number_required"] = "Numer telefonu wymagany";
+$lang["messages_phone_placeholder"] = "Numer(y) telefonu tutaj...";
+$lang["messages_sms_send"] = "Wyślij SMS";
+$lang["messages_successfully_sent"] = "Wiadomość pomyślnie wysłana do: ";
+$lang["messages_unsuccessfully_sent"] = "Wiadomość nie została wysłana z powodzeniem do: ";

application/language/ru/common_lang.php

@@ -1,5 +1,4 @@
-<?php 
-
+<?php
 $lang["common_address_1"] = "Адрес 1";
 $lang["common_address_2"] = "Адрес 2";
 $lang["common_admin"] = "";
@@ -21,7 +20,7 @@ $lang["common_download_import_template"] = "Скачать шаблон Импо
 $lang["common_edit"] = "редактировать";
 $lang["common_email"] = "Электронная почта";
 $lang["common_email_invalid_format"] = "Это электронная почта не в нужный формат.";
-$lang["common_export_csv"] = "Экзель Экспорт";
+$lang["common_export_csv"] = "Экспорт в CSV";
 $lang["common_export_csv_no"] = "Нет";
 $lang["common_export_csv_yes"] = "Да";
 $lang["common_fields_required_message"] = "Красные поля обязательны для заполнения";
@@ -30,11 +29,11 @@ $lang["common_first_name"] = "Имя";
 $lang["common_first_name_required"] = "Имя - обязательное поле для заполнения.";
 $lang["common_first_page"] = "Первый";
 $lang["common_gender"] = "Пол";
-$lang["common_gender_female"] = "V";
-$lang["common_gender_male"] = "M";
+$lang["common_gender_female"] = "Ж";
+$lang["common_gender_male"] = "М";
 $lang["common_gender_undefined"] = "";
-$lang["common_icon"] = "";
-$lang["common_id"] = "ид";
+$lang["common_icon"] = "Иконка";
+$lang["common_id"] = "ID";
 $lang["common_import"] = "Импорт";
 $lang["common_import_change_file"] = "Изменить";
 $lang["common_import_csv"] = "Импорт Экзель";
@@ -47,7 +46,7 @@ $lang["common_last_name_required"] = "Фамилия обязательный п
 $lang["common_last_page"] = "последний";
 $lang["common_learn_about_project"] = ", чтобы узнать самую последнюю информацию о проекте.";
 $lang["common_list_of"] = "Список";
-$lang["common_logo"] = "";
+$lang["common_logo"] = "Логотип";
 $lang["common_logo_mark"] = "";
 $lang["common_logout"] = "Выход";
 $lang["common_manager"] = "";
@@ -69,7 +68,7 @@ $lang["common_remove"] = "Снимать";
 $lang["common_required"] = "потребовал";
 $lang["common_restore"] = "Восстановить";
 $lang["common_return_policy"] = "Правила возврата";
-$lang["common_search"] = "Пойск";
+$lang["common_search"] = "Поиск";
 $lang["common_search_options"] = "Параметры поиска";
 $lang["common_searched_for"] = "Найдено";
 $lang["common_software_short"] = "";
@@ -77,7 +76,7 @@ $lang["common_software_title"] = "";
 $lang["common_state"] = "Штат";
 $lang["common_submit"] = "Сохранить";
 $lang["common_total_spent"] = "Всего потрачено";
-$lang["common_unknown"] = "неизвестный";
+$lang["common_unknown"] = "Неизветсно";
 $lang["common_view_recent_sales"] = "Посмотреть Недавние Продажи";
 $lang["common_website"] = "веб-сайт";
 $lang["common_welcome"] = "Добро пожаловать";

application/language/ru/customers_lang.php

@@ -1,6 +1,5 @@
-<?php 
-
-$lang["customers_account_number"] = "Номер счота";
+<?php
+$lang["customers_account_number"] = "Номер счета";
 $lang["customers_account_number_duplicate"] = "Номер счета уже присутствует в базе данных.";
 $lang["customers_available_points"] = "Доступные баллы";
 $lang["customers_available_points_value"] = "";

application/language/ru/giftcards_lang.php

@@ -1,12 +1,11 @@
-<?php 
-
+<?php
 $lang["giftcards_add_minus"] = "Инвентарь сложения/вычитания.";
 $lang["giftcards_allow_alt_description"] = "Разрешить альтернативные Описание";
 $lang["giftcards_bulk_edit"] = "Массовое изменение";
 $lang["giftcards_cannot_be_deleted"] = "Не удалось удалить выбранные подарочные карты, одну или несколько из выбранных подарочные карты имеет продаж.";
 $lang["giftcards_cannot_find_giftcard"] = "Не можете найти любую информацию о Подарочную карту.";
 $lang["giftcards_cannot_use"] = "Подарочная карта %1 не может быть использована для этой продажи. Неверный Клиент.";
-$lang["giftcards_card_value"] = "стоимость";
+$lang["giftcards_card_value"] = "Стоимость";
 $lang["giftcards_category"] = "категория";
 $lang["giftcards_change_all_to_allow_alt_desc"] = "Разрешить альтернативные Описание Для всех.";
 $lang["giftcards_change_all_to_not_allow_allow_desc"] = "Не позволяйте Альтернативные Описание Для всех.";
@@ -66,5 +65,5 @@ $lang["giftcards_unit_price"] = "Розничная Цена";
 $lang["giftcards_upc_database"] = "UPC база данных";
 $lang["giftcards_update"] = "Обновлять Подарочная карта";
 $lang["giftcards_use_inventory_menu"] = "Используйте меню инвентаря";
-$lang["giftcards_value"] = "стоимость Подарочную карту должна быть цифрая.";
-$lang["giftcards_value_required"] = "стоимость Подарочную карту обязательный пробел.";
+$lang["giftcards_value"] = "Стоимость подарочной карты должна быть числом.";
+$lang["giftcards_value_required"] = "Стоимость подарочной карты обязательна для заполнения.";

application/language/ru/item_kits_lang.php

@@ -1,25 +1,24 @@
-<?php 
-
+<?php
 $lang["item_kits_add_item"] = "Добавить товар";
 $lang["item_kits_all"] = "Все";
 $lang["item_kits_cannot_be_deleted"] = "Не могу удалить Товара комплект (ы).";
 $lang["item_kits_confirm_delete"] = "Вы уверены, что хотите удалить выбранные товар комплекты?";
 $lang["item_kits_confirm_restore"] = "Вы уверены, что хотите восстановить выбранные комплекты?";
 $lang["item_kits_description"] = "Описание товара Комплект";
-$lang["item_kits_discount"] = "";
-$lang["item_kits_discount_fixed"] = "";
+$lang["item_kits_discount"] = "Скидка";
+$lang["item_kits_discount_fixed"] = "Фиксированная скидка";
 $lang["item_kits_discount_percent"] = "Процент Скидки";
-$lang["item_kits_discount_type"] = "";
+$lang["item_kits_discount_type"] = "Тип скидки";
 $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"] = "Штрихкод";
 $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"] = "Kit Id";
+$lang["item_kits_items"] = "Товары";
+$lang["item_kits_kit"] = "ID Набора";
 $lang["item_kits_kit_and_components"] = "Комплект и компоненты";
 $lang["item_kits_kit_and_stock"] = "Набор и запас";
 $lang["item_kits_kit_only"] = "Только Комплект";
@@ -31,10 +30,10 @@ $lang["item_kits_one_or_multiple"] = "Товара комплект (ы)";
 $lang["item_kits_price_option"] = "Цена Опциона";
 $lang["item_kits_priced_only"] = "Только По Цене";
 $lang["item_kits_print_option"] = "параметр печати";
-$lang["item_kits_quantity"] = "количество";
+$lang["item_kits_quantity"] = "Количество";
 $lang["item_kits_sequence"] = "Последовательность";
-$lang["item_kits_successful_adding"] = "Вы успешно добавлен товар комплекта";
-$lang["item_kits_successful_deleted"] = "Вы успешно удален";
-$lang["item_kits_successful_updating"] = "Вы успешно обновленного товар комплекта";
+$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/ru/messages_lang.php

@@ -1,14 +1,13 @@
-<?php 
-
+<?php
 $lang["messages_first_name"] = "";
 $lang["messages_last_name"] = "";
-$lang["messages_message"] = "";
+$lang["messages_message"] = "Сообщение";
 $lang["messages_message_placeholder"] = "";
 $lang["messages_message_required"] = "";
 $lang["messages_multiple_phones"] = "";
-$lang["messages_phone"] = "";
+$lang["messages_phone"] = "Номер телефона";
 $lang["messages_phone_number_required"] = "";
 $lang["messages_phone_placeholder"] = "";
-$lang["messages_sms_send"] = "";
+$lang["messages_sms_send"] = "Отправить SMS";
 $lang["messages_successfully_sent"] = "";
 $lang["messages_unsuccessfully_sent"] = "";

application/language/ru/receivings_lang.php

@@ -1,5 +1,4 @@
-<?php 
-
+<?php
 $lang["receivings_amount_due"] = "";
 $lang["receivings_cancel_receiving"] = "Аннулировать";
 $lang["receivings_cannot_be_deleted"] = "Не удалось удалить получатели.";
@@ -25,18 +24,18 @@ $lang["receivings_find_or_scan_item"] = "Найти/Сканировать то
 $lang["receivings_find_or_scan_item_or_receipt"] = "Найти/Сканировать товар ИЛИ квитанция";
 $lang["receivings_id"] = "получение ID";
 $lang["receivings_item_name"] = "Название товара";
-$lang["receivings_mode"] = "получая режим";
+$lang["receivings_mode"] = "Режим";
 $lang["receivings_new_supplier"] = "Новый поставщик";
 $lang["receivings_one_or_multiple"] = "получения(с)";
 $lang["receivings_print_after_sale"] = "Распечатать квитанцию после продажи";
 $lang["receivings_quantity"] = "Кол-во.";
 $lang["receivings_receipt"] = "квитанция о получении";
 $lang["receivings_receipt_number"] = "Приемный #";
-$lang["receivings_receiving"] = "получать";
+$lang["receivings_receiving"] = "Получение";
 $lang["receivings_reference"] = "Ссылка";
 $lang["receivings_register"] = "Получение товаров";
 $lang["receivings_requisition"] = "Реквизиция";
-$lang["receivings_return"] = "возвращать";
+$lang["receivings_return"] = "Возврат";
 $lang["receivings_select_supplier"] = "Выберите поставщика (необязательно)";
 $lang["receivings_ship_pack"] = "";
 $lang["receivings_start_typing_supplier_name"] = "Начните вводить название поставщика...";

application/language/ru/sales_lang.php

@@ -1,5 +1,4 @@
-<?php 
-
+<?php
 $lang["customers_available_points"] = "Доступные баллы";
 $lang["rewards_package"] = "награды";
 $lang["rewards_remaining_balance"] = "Оставшаяся ценность очков вознаграждения ";
@@ -126,7 +125,7 @@ $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_no_description"] = "Никто";
@@ -148,7 +147,7 @@ $lang["sales_print_after_sale"] = "Распечатать после прода
 $lang["sales_quantity"] = "Кол-во";
 $lang["sales_quantity_less_than_reorder_level"] = "Внимание Желаемое количество является недостаточным.";
 $lang["sales_quantity_less_than_zero"] = "Внимание Желаемое количество является недостаточным. Вы все еще можете обрабатывать продажи, но проверить ваш инвентарь.";
-$lang["sales_quantity_of_items"] = "Количество %1  продукт";
+$lang["sales_quantity_of_items"] = "Количество %1 продукт";
 $lang["sales_quote"] = "Цитата";
 $lang["sales_quote_number"] = "Цитата номер";
 $lang["sales_quote_number_duplicate"] = "Номер квоты должен быть уникальным.";
@@ -183,7 +182,7 @@ $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_start_typing_item_name"] = "Начните печатать название товара или сканирование штрих-кода...";
 $lang["sales_stock"] = "инвентарь";
 $lang["sales_stock_location"] = "Местоположение: Запас";
 $lang["sales_sub_total"] = "промежуточный итог";

application/language/sv/common_lang.php

@@ -1,5 +1,4 @@
-<?php 
-
+<?php
 $lang["common_address_1"] = "Adress 1";
 $lang["common_address_2"] = "Adress 2";
 $lang["common_admin"] = "";
@@ -33,8 +32,8 @@ $lang["common_gender"] = "Kön";
 $lang["common_gender_female"] = "Kvinna";
 $lang["common_gender_male"] = "Man";
 $lang["common_gender_undefined"] = "";
-$lang["common_icon"] = "";
-$lang["common_id"] = "Id";
+$lang["common_icon"] = "Ikon";
+$lang["common_id"] = "ID";
 $lang["common_import"] = "Import";
 $lang["common_import_change_file"] = "Ändra";
 $lang["common_import_csv"] = "CSV-import";
@@ -47,7 +46,7 @@ $lang["common_last_name_required"] = "Efternamn är ett obligatoriskt fält.";
 $lang["common_last_page"] = "Sista";
 $lang["common_learn_about_project"] = "för att lära sig den senaste informationen om projektet.";
 $lang["common_list_of"] = "Lista av";
-$lang["common_logo"] = "";
+$lang["common_logo"] = "Logga";
 $lang["common_logo_mark"] = "";
 $lang["common_logout"] = "Logga ut";
 $lang["common_manager"] = "";

application/language/th/config_lang.php

@@ -1,5 +1,4 @@
-<?php 
-
+<?php
 $lang["config_address"] = "ที่อยู่";
 $lang["config_address_required"] = "ที่อยู่ต้องกรอก";
 $lang["config_all_set"] = "การตั้งค่าอนุญาตไฟล์ทั้งหมดถูกต้อง!";
@@ -144,7 +143,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"] = "Floating Labels";
+$lang["config_floating_labels"] = "แสดงตัวเลข";
 $lang["config_gcaptcha_enable"] = "ขอรหัสยืนยันใหม่ เพื่อเข้าระบบ";
 $lang["config_gcaptcha_secret_key"] = "รหัสลับ สำหรับรหัสยืนยัน";
 $lang["config_gcaptcha_secret_key_required"] = "จำเป็นต้องระบุ รหัสลับ สำหรับรหัสยืนยัน";
@@ -164,7 +163,7 @@ $lang["config_image_restrictions"] = "ข้อจำกัดของไฟล
 $lang["config_include_hsn"] = "เพิ่มการรองรับ HSN Codes";
 $lang["config_info"] = "ข้อมูลร้านค้า";
 $lang["config_info_configuration"] = "ข้อมูลร้านค้า";
-$lang["config_input_groups"] = "Input Groups";
+$lang["config_input_groups"] = "นำเข้าแบบกลุ่ม";
 $lang["config_integrations"] = "การเข้าร่วม";
 $lang["config_integrations_configuration"] = "การเข้าร่วมกับบุคคลภายนอก";
 $lang["config_invoice"] = "ใบแจ้งหนี้";
@@ -271,7 +270,7 @@ $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_receiving_calculate_average_price"] = "คำนวณราคาเฉลี่ย (ได้รับมา)";
 $lang["config_recv_invoice_format"] = "ใบส่งของ";
 $lang["config_register_mode_default"] = "ค่าปริยายรูปแบบการลงทะเบียน";
 $lang["config_report_an_issue"] = "รายงานปัญหา";

application/language/th/employees_lang.php

@@ -1,5 +1,4 @@
-<?php 
-
+<?php
 $lang["employees_administrator"] = "";
 $lang["employees_basic_information"] = "ข้อมูลพื้นฐานของพนักงาน";
 $lang["employees_cannot_be_deleted"] = "ไม่สามารถลบพนักงานที่เลือกไว้ได้ เนื่องจากมีการทำรายการขายหรือคุณกำลังพยายามที่จะลบบัญชีของคุณเอง";
@@ -38,6 +37,6 @@ $lang["employees_system_language"] = "ภาษาของระบบ";
 $lang["employees_unsuccessful_change_password"] = "เปลี่ยนรหัสผ่านไม่สำเร็จ";
 $lang["employees_update"] = "แก้ไขข้อมูลพนักงาน";
 $lang["employees_username"] = "ชื่อผู้ใช้งาน";
-$lang["employees_username_duplicate"] = "";
+$lang["employees_username_duplicate"] = "ชื่อผู้ใช้งานพนักงานถูกใช้งานแล้ว กรุณาเลือกใช้งานชื่ออื่น";
 $lang["employees_username_minlength"] = "ชื่อผู้ใช้งานต้องยาวอย่างน้อย 5 อักษร";
 $lang["employees_username_required"] = "จำเป็นต้องระบุชื่อผู้ใช้งาน";

application/language/th/items_lang.php

@@ -1,5 +1,4 @@
-<?php 
-
+<?php
 $lang["items_add_minus"] = "เพิ่ม/ลบ จำนวนสินค้าคงคลัง";
 $lang["items_allow_alt_description"] = "แสดงข้อมูลเพิ่มเติม";
 $lang["items_amount_entry"] = "จำนวนเงิน";
@@ -20,9 +19,9 @@ $lang["items_confirm_bulk_edit"] = "แน่ใจหรือไม่ที
 $lang["items_confirm_bulk_edit_wipe_taxes"] = "ข้อมูลภาษีทั้งหมดจะถูกแทนที่";
 $lang["items_confirm_delete"] = "โปรดยืนยันการลบสินค้าที่ถูกเลือก?";
 $lang["items_confirm_restore"] = "คุณแน่ใจหรือไม่ว่าต้องการกู้คืนรายการที่เลือก?";
-$lang["items_cost_price"] = "ราคาทุน";
-$lang["items_cost_price_number"] = "ราคาทุนต้องเป็นตัวเลข";
-$lang["items_cost_price_required"] = "ราคาทุนต้องกรอก";
+$lang["items_cost_price"] = "ราคาขายส่ง";
+$lang["items_cost_price_number"] = "ราคาขายส่งต้องเป็นตัวเลข";
+$lang["items_cost_price_required"] = "ราคาขายส่งจำเป็นต้องระบุ";
 $lang["items_count"] = "แก้ไขจำนวนสินค้าคงคลัง";
 $lang["items_csv_import_failed"] = "นำเข้าข้อมูล CSV ล้มเหลว";
 $lang["items_csv_import_nodata_wrongformat"] = "Your uploaded file has no data or wrong format";
@@ -74,7 +73,7 @@ $lang["items_none"] = "ว่างเปล่า";
 $lang["items_none_selected"] = "กรุณาเลือสินค้าที่ต้องการแก้ไข";
 $lang["items_nonstock"] = "ไม่นับสต็อก";
 $lang["items_number_information"] = "หมายเลขสินค้า";
-$lang["items_number_required"] = "UPC/EAN/ISBN is a required field";
+$lang["items_number_required"] = "จำเป็นต้องระบุบาร์โค้ด";
 $lang["items_one_or_multiple"] = "สินค้า(s)";
 $lang["items_pack_name"] = "ชื่อแพ็ค";
 $lang["items_qty_per_pack"] = "ปริมาณต่อแพ็ค";
@@ -89,7 +88,7 @@ $lang["items_reorder_level_required"] = "ระดับการสั่งไ
 $lang["items_retrive_item_info"] = "ดึงข้อมูลรายการ";
 $lang["items_sales_tax_1"] = "ถาษีขาย";
 $lang["items_sales_tax_2"] = "ภาษีขาย 2";
-$lang["items_search_attributes"] = "ค้นหาในฟิลด์เสริม";
+$lang["items_search_attributes"] = "ค้นหาคุณสมบัติ";
 $lang["items_select_image"] = "เลือกรูปภาพ";
 $lang["items_serialized_items"] = "รหัสสินค้า";
 $lang["items_standard"] = "มาตรฐาน";

application/language/th/login_lang.php

@@ -1,7 +1,6 @@
-<?php 
-
-$lang["login_gcaptcha"] = "ฉันไม่ใช่หุ่นยนต์";
-$lang["login_go"] = "ไป";
+<?php
+$lang["login_gcaptcha"] = "ฉันไม่ใช่หุ่นยนต์นะ";
+$lang["login_go"] = "เข้าสู่ระบบ";
 $lang["login_invalid_gcaptcha"] = "กรุณาแสดงตัวตนว่าคุณไม่ใช่หุ่นยนต์";
 $lang["login_invalid_installation"] = "การติดตั้งไม่ถูกต้องตรวจสอบการตั้งค่าที่ไฟล์ php.ini ของคุณ";
 $lang["login_invalid_username_and_password"] = "ชื่อผู้ใช้งานและ/หรือรหัสผ่านเข้าระบบไม่ถูกต้อง";

application/language/th/module_lang.php

@@ -1,5 +1,4 @@
-<?php 
-
+<?php
 $lang["module_admin_cashups"] = "";
 $lang["module_admin_cashups_desc"] = "";
 $lang["module_attributes"] = "คุณลักษณะ";
@@ -19,14 +18,14 @@ $lang["module_expenses_categories_desc"] = "เพิ่ม, ปรับปร
 $lang["module_expenses_desc"] = "เพิ่ม, ปรับปรุง, ลบ และค้นหาค่าใช้จ่าย";
 $lang["module_giftcards"] = "บัตรกำนัล";
 $lang["module_giftcards_desc"] = "เพิ่ม, อัพเดท, ลบ, และค้นหา บัตรกำนัล";
-$lang["module_home"] = "Home";
+$lang["module_home"] = "หนัาหลัก";
 $lang["module_home_desc"] = "แสดงรายการเมนูหลักของโมดูล";
 $lang["module_item_kits"] = "สินค้าหมู่";
 $lang["module_item_kits_desc"] = "เพิ่ม, อัพเดท, ลบ, และค้นหา สินค้าหมู่";
 $lang["module_items"] = "สินค้า";
 $lang["module_items_desc"] = "เพิ่ม, อัพเดท, ลบ, และค้นหา สินค้า";
 $lang["module_messages"] = "Messages";
-$lang["module_messages_desc"] = "Send Messages to Customers, Suppliers, Employees et al.";
+$lang["module_messages_desc"] = "ส่งข้อความถึง ลูกค้า, คู่ค้า และพนักงาน";
 $lang["module_migrate"] = "โยกย้าย";
 $lang["module_migrate_desc"] = "ปรับปรุงฐานข้อมูล OSPOS";
 $lang["module_office"] = "สำนักงาน";

application/language/th/receivings_lang.php

@@ -1,5 +1,4 @@
-<?php 
-
+<?php
 $lang["receivings_amount_due"] = "";
 $lang["receivings_cancel_receiving"] = "ยกเลิก";
 $lang["receivings_cannot_be_deleted"] = "ไม่สามารถลบใบรับสินค้าได้";
@@ -37,7 +36,7 @@ $lang["receivings_reference"] = "อ้างอิง";
 $lang["receivings_register"] = "รับสินค้า";
 $lang["receivings_requisition"] = "เบิกสินค้า";
 $lang["receivings_return"] = "คืนสินค้า";
-$lang["receivings_select_supplier"] = "เลือกผู้ผลิต (ไม่ระบุก็ได้)";
+$lang["receivings_select_supplier"] = "เลือกคู่ค้า (ไม่ระบุก็ได้)";
 $lang["receivings_ship_pack"] = "แพคการขนส่ง";
 $lang["receivings_start_typing_supplier_name"] = "เริ่มต้นพิมพ์ชื่อผู้ผลิต...";
 $lang["receivings_stock"] = "คลังสินค้า";

application/language/th/reports_lang.php

@@ -1,5 +1,4 @@
-<?php 
-
+<?php
 $lang["reports_all"] = "ทั้งหมด";
 $lang["reports_authority"] = "ผู้ได้รับอนุญาติ";
 $lang["reports_canceled"] = "ถูกยกเลิก";
@@ -20,7 +19,7 @@ $lang["reports_completed_sales"] = "การขายที่สมบูร
 $lang["reports_confirm_delete"] = "คุณแน่ใจหรือว่าต้องการลบรายการที่เลือก ?";
 $lang["reports_confirm_restore"] = "คุณแน่ใจหรือไม่ว่าต้องการกู้คืนรายการที่เลือก?";
 $lang["reports_cost"] = "ขายส่ง";
-$lang["reports_cost_price"] = "ราคาทุน";
+$lang["reports_cost_price"] = "ราคาขายส่ง";
 $lang["reports_count"] = "นับ";
 $lang["reports_customer"] = "ลูกค้า";
 $lang["reports_customers"] = "ลูกค้า";
@@ -122,7 +121,7 @@ $lang["reports_suppliers"] = "ผู้ผลิต";
 $lang["reports_suppliers_summary_report"] = "รายงานสรุปผู้ผลิต";
 $lang["reports_tax"] = "ภาษี";
 $lang["reports_tax_category"] = "หมวดหมู่ภาษี";
-$lang["reports_tax_name"] = "";
+$lang["reports_tax_name"] = "ชื่อผู้เสียภาษี";
 $lang["reports_tax_percent"] = "เปอร์เซ็นภาษี";
 $lang["reports_tax_rate"] = "อัตราภาษี";
 $lang["reports_taxes"] = "ภาษี";

application/language/th/sales_lang.php

@@ -1,5 +1,4 @@
-<?php 
-
+<?php
 $lang["customers_available_points"] = "คะแนนที่มี";
 $lang["rewards_package"] = "คะแนนสะสม";
 $lang["rewards_remaining_balance"] = "คะแนนสะสมคงเหลือ ";
@@ -73,7 +72,7 @@ $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_find_or_scan_item_or_receipt"] = "ค้นหา หรือ แสกนรายการ หรือ ใบเสร็จ";
 $lang["sales_giftcard"] = "บัตรของขวัญ";
 $lang["sales_giftcard_balance"] = "ยอดคงเหลือบัตรของขวัญ";
 $lang["sales_giftcard_filter"] = "";
@@ -102,27 +101,27 @@ $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_key_browser"] = "ความช่วยเหลือ";
+$lang["sales_key_cancel"] = "ยกเลิกใบเสนอราคา/ใบแจ้งหนี้ /ใบการขาย นี้";
+$lang["sales_key_customer_search"] = "ค้นหาลูกค้า";
+$lang["sales_key_finish_quote"] = "จบใบเสนอราคา/ใบแจ้งหนี้โดยไม่ต้องชำระเงิน";
+$lang["sales_key_finish_sale"] = "เพิ่มการชำระเงินและใบแจ้งหนี้ /ใบขาย";
+$lang["sales_key_full"] = "เปิดแบบเต็มหน้าจอ";
+$lang["sales_key_function"] = "ฟังก์ชั่น";
+$lang["sales_key_help"] = "คำสั่งลัดงานขาย";
+$lang["sales_key_help_modal"] = "เปิดหน้าต่างคำสั่งลัดงานขาย";
+$lang["sales_key_in"] = "ขยายเข้า";
+$lang["sales_key_item_search"] = "ค้นหารายการขาย";
+$lang["sales_key_out"] = "ขยายออก";
+$lang["sales_key_payment"] = "เพิ่มการชำระเงิน";
+$lang["sales_key_print"] = "พิมพ์หน้านี้";
+$lang["sales_key_restore"] = "คืนการแสดงผลแบบดั้งเดิม/ขยาย";
+$lang["sales_key_search"] = "ค้นหาตารางรายงาน";
+$lang["sales_key_suspend"] = "พักรายการขายปัจจุบัน";
+$lang["sales_key_suspended"] = "แสดงรายการขายที่พักไว้";
+$lang["sales_key_system"] = "ทางลัดระบบ";
+$lang["sales_key_tendered"] = "แก้ไขจำนวนเงิน Tendered";
+$lang["sales_key_title"] = "ทางลัดคียบอร์ดงานขาย";
 $lang["sales_mc"] = "";
 $lang["sales_mode"] = "รูปแบบการลงทะเบียน";
 $lang["sales_must_enter_numeric"] = "จำนวนที่ถุกประมูลต้องใส่ข้อมุลที่เปนตัวเลข";
@@ -147,9 +146,9 @@ $lang["sales_price"] = "ราคา";
 $lang["sales_print_after_sale"] = "พิมพ์บิลหลังการขาย";
 $lang["sales_quantity"] = "จำนวน";
 $lang["sales_quantity_less_than_reorder_level"] = "คำเตือน ถ้าจำนวนของไม่เพียงพอกับความต้องการหรือไม่ตรงกับยอดในบันชี ก็สามารถทำการขายได้ แต่ต้องเชคปริมานสินค้าคงคลัง";
-$lang["sales_quantity_less_than_zero"] = "คำเตือน ถ้าจำนวนของไม่เพียงพอกับความต้องการหรือไม่ตรงกับยอดในบันชี ก็สามารถทำการขายได้ แต่ต้องเชคปริมานสินค้าคงคลัง";
+$lang["sales_quantity_less_than_zero"] = "คำเตือน: ถ้าจำนวนของไม่เพียงพอกับความต้องการหรือไม่ตรงกับยอดในบัญชี ก็สามารถทำการขายได้ แต่ต้องตรวจสอบปริมาญสินค้าคงคลังก่อน";
 $lang["sales_quantity_of_items"] = "ปริมาณของ %1 รายการ";
-$lang["sales_quote"] = "อ้างอิง";
+$lang["sales_quote"] = "ใบเสนอราคา";
 $lang["sales_quote_number"] = "หมายเลขอ้างอิง";
 $lang["sales_quote_number_duplicate"] = "หมายเลขอ้างอิงต้องไม่ซ้ำกัน";
 $lang["sales_quote_sent"] = "ส่งการอ้างอิงถึง";
@@ -196,7 +195,7 @@ $lang["sales_suspended_doc_id"] = "รหัสเอกสาร";
 $lang["sales_suspended_sale_id"] = "รหัสการขายที่ถูกพัก";
 $lang["sales_suspended_sales"] = "การขายที่พักไว้";
 $lang["sales_table"] = "โต๊ะ";
-$lang["sales_takings"] = "ประวัติ";
+$lang["sales_takings"] = "การขายประจำวัน";
 $lang["sales_tax"] = "ภาษี";
 $lang["sales_tax_id"] = "รหัสภาษี";
 $lang["sales_tax_invoice"] = "ใบกำกับภาษี";
@@ -220,4 +219,4 @@ $lang["sales_work_order"] = "คำสั่งงาน";
 $lang["sales_work_order_number"] = "หมายเลขคำสั่งงาน";
 $lang["sales_work_order_number_duplicate"] = "หมายเลขคำสั่งงานต้องไม่ซ้ำกัน";
 $lang["sales_work_order_sent"] = "คำสั่งงานส่งถึง";
-$lang["sales_work_order_unsent"] = "คำสั่งงานส่งถึงล้มเหลว";
+$lang["sales_work_order_unsent"] = "ส่งคำสั่งงานล้มเหลว";

application/language/zh-Hant/sales_lang.php

@@ -1,5 +1,4 @@
-<?php 
-
+<?php
 $lang["customers_available_points"] = "現有積分";
 $lang["rewards_package"] = "獎賞";
 $lang["rewards_remaining_balance"] = "剩餘獎賞積分 ";
@@ -103,12 +102,12 @@ $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_cancel"] = "取消目前詢價/收據/銷售";
+$lang["sales_key_customer_search"] = "搜尋顧客";
+$lang["sales_key_finish_quote"] = "完成詢價/收據 尚未付款";
+$lang["sales_key_finish_sale"] = "增加付款及完成收據/販售";
 $lang["sales_key_full"] = "";
-$lang["sales_key_function"] = "Function";
+$lang["sales_key_function"] = "功能";
 $lang["sales_key_help"] = "Shortcuts";
 $lang["sales_key_help_modal"] = "Open Shortcuts Window";
 $lang["sales_key_in"] = "";

application/libraries/Sale_lib.php

@@ -203,6 +203,7 @@ class Sale_lib
 		if(!$keep_custom || empty($current_invoice_number))
 		{
 			$this->CI->session->set_userdata('sales_invoice_number', $invoice_number);
+
 		}
 	}
 

application/libraries/Token_lib.php

@@ -20,7 +20,7 @@ class Token_lib
 	/**
 	 * Expands all of the tokens found in a given text string and returns the results.
 	 */
-	public function render($tokened_text, $tokens = array())
+	public function render($tokened_text, $tokens = array(), $save = TRUE)
 	{
 		// Apply the transformation for the "%" tokens if any are used
 		if(strpos($tokened_text, '%') !== FALSE)
@@ -45,7 +45,7 @@ class Token_lib
 
 		$token_values = array();
 		$tokens_to_replace = array();
-		$this->generate($token_tree, $tokens_to_replace, $token_values, $tokens);
+		$this->generate($token_tree, $tokens_to_replace, $token_values, $tokens, $save);
 
 		return str_replace($tokens_to_replace, $token_values, $tokened_text);
 	}
@@ -135,12 +135,12 @@ class Token_lib
 		return $results;
 	}
 
-	public function generate($used_tokens, &$tokens_to_replace, &$token_values, $tokens)
+	public function generate($used_tokens, &$tokens_to_replace, &$token_values, $tokens, $save = TRUE)
 	{
 		foreach($used_tokens as $token_code => $token_info)
 		{
 			// Generate value here based on the key value
-			$token_value = $this->resolve_token($token_code);
+			$token_value = $this->resolve_token($token_code, array(), $save);
 
 			foreach($token_info as $length => $token_spec)
 			{
@@ -159,13 +159,13 @@ class Token_lib
 		return $token_values;
 	}
 
-	private function resolve_token($token_code, $tokens = array())
+	private function resolve_token($token_code, $tokens = array(), $save = TRUE)
 	{
 		foreach(array_merge($tokens, Token::get_tokens()) as $token)
 		{
 			if($token->token_id() == $token_code)
 			{
-				return $token->get_value();
+				return $token->get_value($save);
 			}
 		}
 

application/models/Appconfig.php

@@ -80,24 +80,33 @@ class Appconfig extends CI_Model
 		return $this->db->empty_table('app_config');
 	}
 
-	public function acquire_save_next_invoice_sequence()
+	public function acquire_next_invoice_sequence($save = TRUE)
 	{
 		$last_used = $this->get('last_used_invoice_number') + 1;
-		$this->save('last_used_invoice_number', $last_used);
+		if($save)
+		{
+			$this->save('last_used_invoice_number', $last_used);
+		}
 		return $last_used;
 	}
 
-	public function acquire_save_next_quote_sequence()
+	public function acquire_next_quote_sequence($save = TRUE)
 	{
 		$last_used = $this->get('last_used_quote_number') + 1;
-		$this->save('last_used_quote_number', $last_used);
+		if($save)
+		{
+			$this->save('last_used_quote_number', $last_used);
+		}
 		return $last_used;
 	}
 
-	public function acquire_save_next_work_order_sequence()
+	public function acquire_next_work_order_sequence($save = TRUE)
 	{
 		$last_used = $this->get('last_used_work_order_number') + 1;
-		$this->save('last_used_work_order_number', $last_used);
+		if($save)
+		{
+			$this->save('last_used_work_order_number', $last_used);
+		}
 		return $last_used;
 	}
 }

application/models/reports/Detailed_sales.php

@@ -169,7 +169,7 @@ class Detailed_sales extends Report
 				$this->db->join('attribute_links', 'attribute_links.item_id = sales_items_temp.item_id AND attribute_links.sale_id = sales_items_temp.sale_id AND definition_id IN (' . implode(',', $inputs['definition_ids']) . ')', 'left');
 				$this->db->join('attribute_values', 'attribute_values.attribute_id = attribute_links.attribute_id', 'left');
 			}
-			$this->db->group_by('sales_items_temp.sale_id, sales_items_temp.item_id');
+			$this->db->group_by('sales_items_temp.sale_id, sales_items_temp.item_id, sales_items_temp.line');
 			$this->db->where('sales_items_temp.sale_id', $value['sale_id']);
 			$data['details'][$key] = $this->db->get()->result_array();
 

application/models/reports/Summary_items.php

@@ -9,6 +9,7 @@ class Summary_items extends Summary_report
 		return array(
 			array('item_name' => $this->lang->line('reports_item')),
 			array('category' => $this->lang->line('reports_category')),
+			array('cost_price' => $this->lang->line('reports_cost_price'), 'sorter' => 'number_sorter'),
 			array('unit_price' => $this->lang->line('reports_unit_price'), 'sorter' => 'number_sorter'),
 			array('quantity' => $this->lang->line('reports_quantity'), 'sorter' => 'number_sorter'),
 			array('subtotal' => $this->lang->line('reports_subtotal'), 'sorter' => 'number_sorter'),
@@ -25,6 +26,7 @@ class Summary_items extends Summary_report
 		$this->db->select('
 				MAX(items.name) AS name,
 				MAX(items.category) AS category,
+				MAX(items.cost_price) AS cost_price,
 				MAX(items.unit_price) AS unit_price,
 				SUM(sales_items.quantity_purchased) AS quantity_purchased
 		');

application/models/tokens/Token_invoice_sequence.php

@@ -17,9 +17,9 @@ class Token_invoice_sequence extends Token
 		return 'ISEQ';
 	}
 
-	public function get_value()
+	public function get_value($save = TRUE)
 	{
-		return $this->CI->Appconfig->acquire_save_next_invoice_sequence();
+		return $this->CI->Appconfig->acquire_next_invoice_sequence($save);
 	}
 }
 ?>